Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/types/src/__tests__/message.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// pnpm --filter @roo-code/types test src/__tests__/message.test.ts

import { clineAsks, isIdleAsk, isInteractiveAsk, isResumableAsk, isNonBlockingAsk } from "../message.js"

describe("ask messages", () => {
test("all ask messages are classified", () => {
for (const ask of clineAsks) {
expect(
isIdleAsk(ask) || isInteractiveAsk(ask) || isResumableAsk(ask) || isNonBlockingAsk(ask),
`${ask} is not classified`,
).toBe(true)
}
})
})
34 changes: 15 additions & 19 deletions packages/types/src/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,6 @@ export const clineAsks = [
export const clineAskSchema = z.enum(clineAsks)

export type ClineAsk = z.infer<typeof clineAskSchema>

// Needs classification:
// - `followup`

/**
* NonBlockingAsk
*
* Asks that should not block task execution. These are informational or optional
* asks where the task can proceed even without an immediate user response.
*/

export const nonBlockingAsks = ["command_output"] as const satisfies readonly ClineAsk[]

export type NonBlockingAsk = (typeof nonBlockingAsks)[number]

export function isNonBlockingAsk(ask: ClineAsk): ask is NonBlockingAsk {
return (nonBlockingAsks as readonly ClineAsk[]).includes(ask)
}

/**
* IdleAsk
*
Expand Down Expand Up @@ -116,6 +97,21 @@ export function isInteractiveAsk(ask: ClineAsk): ask is InteractiveAsk {
return (interactiveAsks as readonly ClineAsk[]).includes(ask)
}

/**
* NonBlockingAsk
*
* Asks that are not associated with an actual approval, and are only used
* to update chat messages.
*/

export const nonBlockingAsks = ["command_output"] as const satisfies readonly ClineAsk[]

export type NonBlockingAsk = (typeof nonBlockingAsks)[number]

export function isNonBlockingAsk(ask: ClineAsk): ask is NonBlockingAsk {
return (nonBlockingAsks as readonly ClineAsk[]).includes(ask)
}

/**
* ClineSay
*/
Expand Down
29 changes: 10 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { GlobalState, ClineMessage, ClineAsk } from "@roo-code/types"

import { getApiMetrics } from "../../shared/getApiMetrics"
import { ClineAskResponse } from "../../shared/WebviewMessage"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { GlobalState, ClineMessage } from "@roo-code/types"

import { AutoApprovalHandler } from "../AutoApprovalHandler"

// Mock getApiMetrics
vi.mock("../../../shared/getApiMetrics", () => ({
getApiMetrics: vi.fn(),
}))
Expand Down
Loading