@cuongtran001/kanna 1.63.2 → 1.63.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -9
- package/dist/client/assets/{BoardsPage-BJalB-bc.js → BoardsPage-AckCuswi.js} +1 -1
- package/dist/client/assets/BoardsRoutePage-DzKwKy3f.js +1 -0
- package/dist/client/assets/ChatPage-DsaH8CTz.js +93 -0
- package/dist/client/assets/{CronJobRow-CPbO_jwU.js → CronJobRow-Bx9gRqKW.js} +1 -1
- package/dist/client/assets/{CronJobsPage-Ck3SNgGi.js → CronJobsPage-v0-2X1oX.js} +1 -1
- package/dist/client/assets/{FilePreviewSheet-XEuUtDPn.js → FilePreviewSheet-B6SDxSD0.js} +2 -2
- package/dist/client/assets/{FlowSurface-BCbeMTJe.js → FlowSurface-CLC-ZFar.js} +1 -1
- package/dist/client/assets/{GenUIBlock-BJy_dfs-.js → GenUIBlock-CC79Ujro.js} +2 -2
- package/dist/client/assets/{KannaSocketProvider-D7Lzlt35.js → KannaSocketProvider-B2sHsWP5.js} +1 -1
- package/dist/client/assets/{LocalProjectsPage-9LJkQjhT.js → LocalProjectsPage-DYBkcEAm.js} +1 -1
- package/dist/client/assets/SettingsPage-CZqMkMRW.js +9 -0
- package/dist/client/assets/{StackBoardsRoutePage-t_EaFNG4.js → StackBoardsRoutePage-Clviz0hX.js} +1 -1
- package/dist/client/assets/{ToolCallMessage-RbF9XT2B.js → ToolCallMessage-BfNbWGmc.js} +1 -1
- package/dist/client/assets/{VChartSurface-CKuPelsn.js → VChartSurface-CUbxyBo3.js} +1 -1
- package/dist/client/assets/{WorkflowsPage-B6qUmQA3.js → WorkflowsPage-rengzb97.js} +1 -1
- package/dist/client/assets/{WorkflowsSection-DxO0S4An.js → WorkflowsSection-DuXdLsMO.js} +1 -1
- package/dist/client/assets/{chart-renderer-DjYZvNxh.js → chart-renderer-D7ukB2wg.js} +1 -1
- package/dist/client/assets/{chatSounds-FD2DQzF6.js → chatSounds-BLg2xPDZ.js} +1 -1
- package/dist/client/assets/chevron-left-RbFvmeyK.js +1 -0
- package/dist/client/assets/{clipboard.adapter-GN9nnYak.js → clipboard.adapter-CgdNwn-1.js} +1 -1
- package/dist/client/assets/{columnStyle-DjA7hA9k.js → columnStyle-CMCF0ds6.js} +1 -1
- package/dist/client/assets/{createScopedStore-BoLB9Rhc.js → createScopedStore-BrD5NHWx.js} +1 -1
- package/dist/client/assets/{dist-CimtOoGK.js → dist-DNSTHlSo.js} +1 -1
- package/dist/client/assets/editor-icons-DY4uKeEY.js +1 -0
- package/dist/client/assets/{ellipsis-Cd7sO0LO.js → ellipsis-OHg0x_x1.js} +1 -1
- package/dist/client/assets/{flow-kinds-CW2TU_83.js → flow-kinds-Ki2DP9nP.js} +1 -1
- package/dist/client/assets/{folder-C7sXCaHj.js → folder-CnWzWIG5.js} +1 -1
- package/dist/client/assets/{formatters-wSVyvDFZ.js → formatters-BGORekd-.js} +1 -1
- package/dist/client/assets/{genui-EzBIAYFE.js → genui-C9i6j0XZ.js} +1 -1
- package/dist/client/assets/{globe-xmRpmpma.js → globe-BjR1tyE4.js} +1 -1
- package/dist/client/assets/{host-DCaA9W-Z.js → host-D9tJwZXl.js} +1 -1
- package/dist/client/assets/{index-CDqjh7nt.js → index-CesRxZ0X.js} +7 -7
- package/dist/client/assets/index-CxDE9VOy.css +1 -0
- package/dist/client/assets/{info-D4MMvZFe.js → info-DNYekoE-.js} +1 -1
- package/dist/client/assets/{input-C4fvDiQ4.js → input-DgW9uRZN.js} +1 -1
- package/dist/client/assets/{lexicalToReact-sPUyOWk6.js → lexicalToReact-CZvp9Pgz.js} +3 -3
- package/dist/client/assets/{log-aTaDVF_e.js → log-DnEvbp3E.js} +1 -1
- package/dist/client/assets/{monitor-_CRKcV1h.js → monitor-qbWfUdBG.js} +1 -1
- package/dist/client/assets/{pencil-fNBeUUCf.js → pencil-C965rrpd.js} +1 -1
- package/dist/client/assets/{pendingActionsStore-COTh4Ztq.js → pendingActionsStore-CxhI19V9.js} +1 -1
- package/dist/client/assets/{play-BAmkJfn6.js → play-uofLR7yT.js} +1 -1
- package/dist/client/assets/{plus-c75CkNEO.js → plus-D4CI6rj1.js} +1 -1
- package/dist/client/assets/{popover-CHM4skzh.js → popover-Bc646hKn.js} +1 -1
- package/dist/client/assets/{pushClient-BJH_ITRB.js → pushClient-CxnHu9h4.js} +1 -1
- package/dist/client/assets/runDetached-DfQXHAaY.js +1 -0
- package/dist/client/assets/{segmented-control-DNOwRupT.js → segmented-control-CKGX29Kl.js} +1 -1
- package/dist/client/assets/{select-dLHiAls6.js → select-BjeajpVt.js} +1 -1
- package/dist/client/assets/{settings-header-button-CGKCzFyk.js → settings-header-button-BYvHR6Xl.js} +1 -1
- package/dist/client/assets/{sidebarPendingActions-Dyp80Lv_.js → sidebarPendingActions-xgMTnfRY.js} +1 -1
- package/dist/client/assets/{square-pen-B1IxmScM.js → square-pen-DmppQdTd.js} +1 -1
- package/dist/client/assets/{state-mark-BhTZfcYe.js → state-mark-C3kEL1hX.js} +1 -1
- package/dist/client/assets/{status-pill-CwhJhaMy.js → status-pill-Bo1Nb6HX.js} +1 -1
- package/dist/client/assets/{terminal-Bnj7qFGw.js → terminal-DfCF-J4p.js} +1 -1
- package/dist/client/assets/{timer.adapter-DHt2zwsL.js → timer.adapter-C2RhP4d6.js} +1 -1
- package/dist/client/assets/{tools-3gJcj3hK.js → tools-t5T_3UBg.js} +1 -1
- package/dist/client/assets/{triangle-alert-CWrc0CIO.js → triangle-alert-CYQhobyY.js} +1 -1
- package/dist/client/assets/useAppGlobalState-DUa3pkCF.js +1 -0
- package/dist/client/assets/useKannaState-FcieR5qb.js +5 -0
- package/dist/client/assets/useTheme-D9sKDPEm.js +1 -0
- package/dist/client/index.html +35 -35
- package/package.json +2 -2
- package/src/server/agent-coordinator-types.ts +0 -6
- package/src/server/agent-coordinator.ts +6 -45
- package/src/server/agent.compaction.test.ts +1 -13
- package/src/server/agent.oauth-account-info.test.ts +0 -3
- package/src/server/agent.oauth-release.test.ts +0 -2
- package/src/server/agent.oauth-rotation.test.ts +0 -9
- package/src/server/agent.oauth-token-share-cap.test.ts +0 -1
- package/src/server/agent.openrouter-model.test.ts +0 -2
- package/src/server/agent.openrouter-watchdog.test.ts +0 -3
- package/src/server/agent.sdk-workflow-register.test.ts +2 -64
- package/src/server/agent.test.ts +1 -319
- package/src/server/app-settings.test.ts +14 -17
- package/src/server/app-settings.ts +22 -37
- package/src/server/auto-continue/e2e.test.ts +0 -1
- package/src/server/background-task-output-registry.test.ts +1 -1
- package/src/server/background-task-output-registry.ts +1 -1
- package/src/server/claude-cancel-handler.test.ts +0 -58
- package/src/server/claude-cancel-handler.ts +1 -17
- package/src/server/claude-harness-stream.test.ts +134 -0
- package/src/server/{claude-pty/jsonl-path.test.ts → claude-projects-path.adapter.test.ts} +1 -19
- package/src/server/{claude-pty/jsonl-path.adapter.ts → claude-projects-path.adapter.ts} +0 -11
- package/src/server/claude-send-command.test.ts +0 -1
- package/src/server/claude-session-config-helpers.test.ts +1 -90
- package/src/server/claude-session-config-helpers.ts +1 -38
- package/src/server/claude-session-error-handler.test.ts +0 -1
- package/src/server/claude-session-lifecycle.test.ts +2 -36
- package/src/server/claude-session-lifecycle.ts +2 -8
- package/src/server/claude-session-runner.test.ts +8 -36
- package/src/server/claude-session-runner.ts +1 -26
- package/src/server/claude-session-spawner.test.ts +5 -64
- package/src/server/claude-session-spawner.ts +49 -115
- package/src/server/claude-session-start.test.ts +1 -14
- package/src/server/claude-session-start.ts +0 -8
- package/src/server/claude-session-state-queries.test.ts +1 -2
- package/src/server/claude-session-state.test.ts +0 -1
- package/src/server/claude-session-state.ts +0 -4
- package/src/server/claude-subagent-wiring.test.ts +2 -68
- package/src/server/claude-subagent-wiring.ts +3 -50
- package/src/server/claude-turn-starter-types.ts +0 -3
- package/src/server/claude-turn-starter.test.ts +0 -28
- package/src/server/claude-turn-starter.ts +0 -5
- package/src/server/event-store.test.ts +0 -2
- package/src/server/events.ts +1 -2
- package/src/server/harness-types.ts +1 -2
- package/src/server/import-subagent-drill.e2e.test.ts +1 -1
- package/src/server/imported-subagents-dir.test.ts +1 -1
- package/src/server/imported-subagents-dir.ts +1 -1
- package/src/server/kanna-mcp.test.ts +0 -75
- package/src/server/kanna-mcp.ts +1 -47
- package/src/server/server.test.ts +5 -7
- package/src/server/server.ts +2 -18
- package/src/server/subagent-orchestrator.test.ts +0 -1
- package/src/server/subagent-provider-run.test.ts +48 -10
- package/src/server/subagent-provider-run.ts +12 -3
- package/src/server/tool-callback.test.ts +1 -1
- package/src/server/ws-router-agent-ctrl.test.ts +0 -45
- package/src/server/ws-router-agent-ctrl.ts +1 -31
- package/src/server/ws-router-broadcast.ts +0 -27
- package/src/server/ws-router-defaults.test.ts +2 -3
- package/src/server/ws-router-defaults.ts +2 -3
- package/src/server/ws-router-envelope.ts +0 -15
- package/src/server/ws-router-observability.test.ts +1 -1
- package/src/server/ws-router-settings.test.ts +2 -2
- package/src/server/ws-router.test.ts +2 -2
- package/src/server/ws-router.ts +0 -8
- package/src/shared/app-settings-types.ts +9 -20
- package/src/shared/claude-api-error-classification.ts +1 -1
- package/src/shared/protocol.ts +1 -11
- package/dist/client/assets/BoardsRoutePage-BTTjJX-Y.js +0 -1
- package/dist/client/assets/ChatPage-DH8wtQyD.js +0 -93
- package/dist/client/assets/SettingsPage-CKrZ6dGQ.js +0 -9
- package/dist/client/assets/chevron-left-CJ0qv9kF.js +0 -1
- package/dist/client/assets/editor-icons-CONDQZof.js +0 -1
- package/dist/client/assets/index-C-UYaDk6.css +0 -1
- package/dist/client/assets/runDetached-DqQ3k2ji.js +0 -1
- package/dist/client/assets/useAppGlobalState-DKOGrO5l.js +0 -1
- package/dist/client/assets/useKannaState-D7R_-dM6.js +0 -5
- package/dist/client/assets/useTheme-B57LIKyx.js +0 -1
- package/src/server/agent.pty-rotation.test.ts +0 -322
- package/src/server/claude-pty/auth.test.ts +0 -38
- package/src/server/claude-pty/auth.ts +0 -17
- package/src/server/claude-pty/claude-session-registry.adapter.ts +0 -68
- package/src/server/claude-pty/claude-session-registry.test.ts +0 -149
- package/src/server/claude-pty/driver.test.ts +0 -1153
- package/src/server/claude-pty/driver.ts +0 -829
- package/src/server/claude-pty/env.test.ts +0 -79
- package/src/server/claude-pty/env.ts +0 -20
- package/src/server/claude-pty/jsonl-to-event.test.ts +0 -882
- package/src/server/claude-pty/jsonl-to-event.ts +0 -357
- package/src/server/claude-pty/parity-matrix.test.ts +0 -437
- package/src/server/claude-pty/pid-registry.adapter.ts +0 -164
- package/src/server/claude-pty/pid-registry.test.ts +0 -178
- package/src/server/claude-pty/preflight/binary-fingerprint.adapter.ts +0 -20
- package/src/server/claude-pty/preflight/binary-fingerprint.test.ts +0 -32
- package/src/server/claude-pty/pty-instance-registry.test.ts +0 -208
- package/src/server/claude-pty/pty-instance-registry.ts +0 -172
- package/src/server/claude-pty/pty-memory-sampler.adapter.test.ts +0 -103
- package/src/server/claude-pty/pty-memory-sampler.adapter.ts +0 -86
- package/src/server/claude-pty/pty-process.adapter.ts +0 -60
- package/src/server/claude-pty/pty-process.test.ts +0 -49
- package/src/server/claude-pty/resolve-binary.adapter.ts +0 -106
- package/src/server/claude-pty/resolve-binary.test.ts +0 -118
- package/src/server/claude-pty/runtime-dir.adapter.ts +0 -19
- package/src/server/claude-pty/sandbox/detect.adapter.ts +0 -17
- package/src/server/claude-pty/sandbox/detect.test.ts +0 -17
- package/src/server/claude-pty/sandbox/platform.test.ts +0 -35
- package/src/server/claude-pty/sandbox/platform.ts +0 -27
- package/src/server/claude-pty/sandbox/preflight-io.adapter.ts +0 -14
- package/src/server/claude-pty/sandbox/preflight.test.ts +0 -69
- package/src/server/claude-pty/sandbox/preflight.ts +0 -44
- package/src/server/claude-pty/sandbox/profile-linux.adapter.ts +0 -63
- package/src/server/claude-pty/sandbox/profile-linux.test.ts +0 -90
- package/src/server/claude-pty/sandbox/profile-macos.adapter.ts +0 -72
- package/src/server/claude-pty/sandbox/profile-macos.test.ts +0 -68
- package/src/server/claude-pty/sandbox/wrap.adapter.ts +0 -58
- package/src/server/claude-pty/sandbox/wrap.test.ts +0 -82
- package/src/server/claude-pty/settings-writer.adapter.ts +0 -23
- package/src/server/claude-pty/settings-writer.test.ts +0 -22
- package/src/server/claude-pty/smoke-test-io.adapter.ts +0 -28
- package/src/server/claude-pty/smoke-test.test.ts +0 -199
- package/src/server/claude-pty/smoke-test.ts +0 -182
- package/src/server/claude-pty/tui-control.test.ts +0 -300
- package/src/server/claude-pty/tui-control.ts +0 -174
- package/src/server/claude-pty/tui-source.adapter.test.ts +0 -374
- package/src/server/claude-pty/tui-source.adapter.ts +0 -294
- package/src/server/http-server.adapter.test.ts +0 -18
- package/src/server/http-server.adapter.ts +0 -39
- package/src/server/kanna-mcp-http.test.ts +0 -274
- package/src/server/kanna-mcp-http.ts +0 -194
- package/src/server/kanna-mcp-tools/ask-user-question.test.ts +0 -108
- package/src/server/kanna-mcp-tools/ask-user-question.ts +0 -55
- package/src/server/kanna-mcp-tools/exit-plan-mode.test.ts +0 -61
- package/src/server/kanna-mcp-tools/exit-plan-mode.ts +0 -49
- package/src/server/mcp-zod-compat.adapter.ts +0 -20
- package/src/shared/pty-instance.ts +0 -43
- /package/src/server/{claude-pty/output-ring.test.ts → output-ring.test.ts} +0 -0
- /package/src/server/{claude-pty/output-ring.ts → output-ring.ts} +0 -0
|
@@ -3,7 +3,6 @@ import type { ChatTaskStorePort } from "./kanna-mcp"
|
|
|
3
3
|
import type { JsonValue } from "../shared/json"
|
|
4
4
|
import type {
|
|
5
5
|
AgentProvider,
|
|
6
|
-
ClaudeDriverPreference,
|
|
7
6
|
LlmProviderSnapshot,
|
|
8
7
|
McpServerConfig,
|
|
9
8
|
OpenRouterModel,
|
|
@@ -25,14 +24,9 @@ import type { BoardRegistry } from "./board-registry"
|
|
|
25
24
|
import type { LoopState } from "./auto-continue/read-model"
|
|
26
25
|
import { toArmedLoopInfo } from "./claude-loop-commands"
|
|
27
26
|
import type { ChatPermissionPolicy } from "../shared/permission-policy"
|
|
28
|
-
import type { StartClaudeSessionPtyArgs } from "./claude-pty/driver"
|
|
29
27
|
import type { SubagentOrchestrator } from "./subagent-orchestrator"
|
|
30
28
|
import type { TunnelGateway } from "./cloudflare-tunnel/gateway"
|
|
31
29
|
import type { ToolCallbackService } from "./tool-callback"
|
|
32
|
-
import type { ClaudePtyRegistry } from "./claude-pty/pid-registry.adapter"
|
|
33
|
-
import type { PtyInstanceRegistry } from "./claude-pty/pty-instance-registry"
|
|
34
|
-
import type { WorkflowRegistry } from "./workflow-registry"
|
|
35
|
-
import type { SubagentTranscriptRegistry } from "./subagent-transcript-registry"
|
|
36
30
|
import type { startClaudeSession as StartClaudeSessionFn, CompactionEvent } from "./claude-session-start"
|
|
37
31
|
import type { OAuthBearers } from "./claude-session-config-helpers"
|
|
38
32
|
import { isGenUIEnabled } from "./genui/genui-config"
|
|
@@ -71,17 +65,11 @@ export interface SpawnClaudeTurnDeps {
|
|
|
71
65
|
oauthPool: SpawnOAuthPool | null
|
|
72
66
|
|
|
73
67
|
startClaudeSessionFn: typeof StartClaudeSessionFn
|
|
74
|
-
startClaudeSessionPTYFn: (args: StartClaudeSessionPtyArgs) => Promise<ClaudeSessionHandle>
|
|
75
68
|
|
|
76
69
|
subagentOrchestrator: SubagentOrchestrator
|
|
77
70
|
toolCallback: ToolCallbackService | null
|
|
78
71
|
tunnelGateway: TunnelGateway | null
|
|
79
|
-
claudePtyRegistry: ClaudePtyRegistry | null
|
|
80
|
-
ptyInstanceRegistry: PtyInstanceRegistry | null
|
|
81
|
-
workflowRegistry: WorkflowRegistry | null
|
|
82
|
-
subagentTranscriptRegistry: SubagentTranscriptRegistry | null
|
|
83
72
|
|
|
84
|
-
resolveClaudeDriverPreference: () => ClaudeDriverPreference
|
|
85
73
|
isLoopArmed: (chatId: string) => LoopState | null
|
|
86
74
|
isRunAlive: (chatId: string, runId: string) => boolean
|
|
87
75
|
chatTaskStore?: ChatTaskStorePort
|
|
@@ -114,8 +102,6 @@ export async function spawnClaudeTurn(
|
|
|
114
102
|
): Promise<HarnessTurn> {
|
|
115
103
|
let session = deps.claudeSessions.get(args.chatId)
|
|
116
104
|
|
|
117
|
-
const driverIsPty = args.provider !== "openrouter"
|
|
118
|
-
&& deps.resolveClaudeDriverPreference() === "pty"
|
|
119
105
|
const loopArmedNow = deps.isLoopArmed(args.chatId) !== null
|
|
120
106
|
|
|
121
107
|
if (
|
|
@@ -156,7 +142,6 @@ export async function spawnClaudeTurn(
|
|
|
156
142
|
}
|
|
157
143
|
}
|
|
158
144
|
|
|
159
|
-
const usePty = driverIsPty
|
|
160
145
|
const systemPromptAppend = buildKannaSystemPromptAppend(deps.getSubagents(), {
|
|
161
146
|
globalPromptAppend: deps.getAppSettingsSnapshot().globalPromptAppend,
|
|
162
147
|
...args.instructions,
|
|
@@ -177,106 +162,55 @@ export async function spawnClaudeTurn(
|
|
|
177
162
|
await deps.buildOAuthBearers(enabledMcpServers)
|
|
178
163
|
let started: ClaudeSessionHandle
|
|
179
164
|
try {
|
|
180
|
-
started =
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
oauthBearers,
|
|
230
|
-
})
|
|
231
|
-
: await deps.startClaudeSessionFn({
|
|
232
|
-
projectId: args.projectId,
|
|
233
|
-
localPath: args.localPath,
|
|
234
|
-
model: args.model,
|
|
235
|
-
effort: args.effort,
|
|
236
|
-
planMode: args.planMode,
|
|
237
|
-
sessionToken: args.sessionToken,
|
|
238
|
-
forkSession: args.forkSession,
|
|
239
|
-
oauthToken: picked?.token ?? null,
|
|
240
|
-
oauthBaseUrl: picked?.baseUrl ?? null,
|
|
241
|
-
openrouterApiKey,
|
|
242
|
-
additionalDirectories: args.additionalDirectories,
|
|
243
|
-
chatId: args.chatId,
|
|
244
|
-
tunnelGateway: deps.tunnelGateway,
|
|
245
|
-
onToolRequest: args.onToolRequest,
|
|
246
|
-
systemPromptAppend,
|
|
247
|
-
subagentOrchestrator: deps.subagentOrchestrator,
|
|
248
|
-
delegationContext,
|
|
249
|
-
setupLoop: delegationContext.depth === 0
|
|
250
|
-
? (input) => deps.setupLoop(chatIdForCtx, input)
|
|
251
|
-
: undefined,
|
|
252
|
-
armCron: delegationContext.depth === 0
|
|
253
|
-
? (command: string) => deps.armCron(chatIdForCtx, command)
|
|
254
|
-
: undefined,
|
|
255
|
-
updateCron: delegationContext.depth === 0 && deps.updateCron
|
|
256
|
-
? (jobId, patch) => deps.updateCron!(chatIdForCtx, jobId, patch)
|
|
257
|
-
: undefined,
|
|
258
|
-
stopLoop: delegationContext.depth === 0
|
|
259
|
-
? () => deps.stopLoop(chatIdForCtx, "goal_met")
|
|
260
|
-
: undefined,
|
|
261
|
-
resumeLoop: delegationContext.depth === 0
|
|
262
|
-
? () => deps.resumeLoop(chatIdForCtx)
|
|
263
|
-
: undefined,
|
|
264
|
-
isLoopArmed: delegationContext.depth === 0
|
|
265
|
-
? () => deps.isLoopArmed(chatIdForCtx) !== null
|
|
266
|
-
: undefined,
|
|
267
|
-
getArmedLoop: (id) => toArmedLoopInfo(deps.isLoopArmed(id)),
|
|
268
|
-
isRunAlive: deps.isRunAlive,
|
|
269
|
-
chatTaskStore: deps.chatTaskStore,
|
|
270
|
-
boardRegistry: deps.boardRegistry,
|
|
271
|
-
toolCallback: deps.toolCallback ?? undefined,
|
|
272
|
-
chatPolicy: deps.resolveChatPolicy(args.chatId),
|
|
273
|
-
customMcpServers: enabledMcpServers,
|
|
274
|
-
oauthBearers,
|
|
275
|
-
turnPrice: openrouterTurnPrice,
|
|
276
|
-
costBaselineUsd: args.sessionToken ? deps.getCostBaselineUsd(args.chatId) : undefined,
|
|
277
|
-
contextWindowOverride: openrouterContextWindow,
|
|
278
|
-
onCompaction: delegationContext.depth === 0 ? deps.onCompaction : undefined,
|
|
279
|
-
})
|
|
165
|
+
started = await deps.startClaudeSessionFn({
|
|
166
|
+
projectId: args.projectId,
|
|
167
|
+
localPath: args.localPath,
|
|
168
|
+
model: args.model,
|
|
169
|
+
effort: args.effort,
|
|
170
|
+
planMode: args.planMode,
|
|
171
|
+
sessionToken: args.sessionToken,
|
|
172
|
+
forkSession: args.forkSession,
|
|
173
|
+
oauthToken: picked?.token ?? null,
|
|
174
|
+
oauthBaseUrl: picked?.baseUrl ?? null,
|
|
175
|
+
openrouterApiKey,
|
|
176
|
+
additionalDirectories: args.additionalDirectories,
|
|
177
|
+
chatId: args.chatId,
|
|
178
|
+
tunnelGateway: deps.tunnelGateway,
|
|
179
|
+
onToolRequest: args.onToolRequest,
|
|
180
|
+
systemPromptAppend,
|
|
181
|
+
subagentOrchestrator: deps.subagentOrchestrator,
|
|
182
|
+
delegationContext,
|
|
183
|
+
setupLoop: delegationContext.depth === 0
|
|
184
|
+
? (input) => deps.setupLoop(chatIdForCtx, input)
|
|
185
|
+
: undefined,
|
|
186
|
+
armCron: delegationContext.depth === 0
|
|
187
|
+
? (command: string) => deps.armCron(chatIdForCtx, command)
|
|
188
|
+
: undefined,
|
|
189
|
+
updateCron: delegationContext.depth === 0 && deps.updateCron
|
|
190
|
+
? (jobId, patch) => deps.updateCron!(chatIdForCtx, jobId, patch)
|
|
191
|
+
: undefined,
|
|
192
|
+
stopLoop: delegationContext.depth === 0
|
|
193
|
+
? () => deps.stopLoop(chatIdForCtx, "goal_met")
|
|
194
|
+
: undefined,
|
|
195
|
+
resumeLoop: delegationContext.depth === 0
|
|
196
|
+
? () => deps.resumeLoop(chatIdForCtx)
|
|
197
|
+
: undefined,
|
|
198
|
+
isLoopArmed: delegationContext.depth === 0
|
|
199
|
+
? () => deps.isLoopArmed(chatIdForCtx) !== null
|
|
200
|
+
: undefined,
|
|
201
|
+
getArmedLoop: (id) => toArmedLoopInfo(deps.isLoopArmed(id)),
|
|
202
|
+
isRunAlive: deps.isRunAlive,
|
|
203
|
+
chatTaskStore: deps.chatTaskStore,
|
|
204
|
+
boardRegistry: deps.boardRegistry,
|
|
205
|
+
toolCallback: deps.toolCallback ?? undefined,
|
|
206
|
+
chatPolicy: deps.resolveChatPolicy(args.chatId),
|
|
207
|
+
customMcpServers: enabledMcpServers,
|
|
208
|
+
oauthBearers,
|
|
209
|
+
turnPrice: openrouterTurnPrice,
|
|
210
|
+
costBaselineUsd: args.sessionToken ? deps.getCostBaselineUsd(args.chatId) : undefined,
|
|
211
|
+
contextWindowOverride: openrouterContextWindow,
|
|
212
|
+
onCompaction: delegationContext.depth === 0 ? deps.onCompaction : undefined,
|
|
213
|
+
})
|
|
280
214
|
} catch (err) {
|
|
281
215
|
if (picked) deps.oauthPool?.release(args.chatId)
|
|
282
216
|
throw err
|
|
@@ -7,7 +7,6 @@ type FakeQuery = {
|
|
|
7
7
|
close: () => void
|
|
8
8
|
setModel: (m: string) => Promise<void>
|
|
9
9
|
setPermissionMode: (m: string) => Promise<void>
|
|
10
|
-
supportedCommands: () => Promise<unknown[]>
|
|
11
10
|
}
|
|
12
11
|
|
|
13
12
|
let mockQueryFn: (args: unknown) => FakeQuery
|
|
@@ -19,7 +18,6 @@ const defaultFakeQ = (): FakeQuery => ({
|
|
|
19
18
|
close: () => {},
|
|
20
19
|
setModel: async () => {},
|
|
21
20
|
setPermissionMode: async () => {},
|
|
22
|
-
supportedCommands: async () => [],
|
|
23
21
|
})
|
|
24
22
|
|
|
25
23
|
mock.module("@anthropic-ai/claude-agent-sdk", () => ({
|
|
@@ -107,12 +105,11 @@ describe("startClaudeSession", () => {
|
|
|
107
105
|
expect(typeof handle.stream[Symbol.asyncIterator]).toBe("function")
|
|
108
106
|
})
|
|
109
107
|
|
|
110
|
-
test("returned handle exposes sendPrompt, setModel, setPermissionMode,
|
|
108
|
+
test("returned handle exposes sendPrompt, setModel, setPermissionMode, interrupt, close", async () => {
|
|
111
109
|
const handle = await startClaudeSession(BASE_ARGS, makeFakeDeps())
|
|
112
110
|
expect(typeof handle.sendPrompt).toBe("function")
|
|
113
111
|
expect(typeof handle.setModel).toBe("function")
|
|
114
112
|
expect(typeof handle.setPermissionMode).toBe("function")
|
|
115
|
-
expect(typeof handle.getSupportedCommands).toBe("function")
|
|
116
113
|
expect(typeof handle.interrupt).toBe("function")
|
|
117
114
|
expect(typeof handle.close).toBe("function")
|
|
118
115
|
})
|
|
@@ -142,16 +139,6 @@ describe("startClaudeSession", () => {
|
|
|
142
139
|
expect(info).toBeNull()
|
|
143
140
|
})
|
|
144
141
|
|
|
145
|
-
test("getSupportedCommands returns [] when supportedCommands() throws", async () => {
|
|
146
|
-
mockQueryFn = () => ({
|
|
147
|
-
...defaultFakeQ(),
|
|
148
|
-
supportedCommands: async () => { throw new Error("not ready") },
|
|
149
|
-
})
|
|
150
|
-
const handle = await startClaudeSession(BASE_ARGS, makeFakeDeps())
|
|
151
|
-
const cmds = await handle.getSupportedCommands()
|
|
152
|
-
expect(cmds).toEqual([])
|
|
153
|
-
})
|
|
154
|
-
|
|
155
142
|
test("SDK options include the model passed to startClaudeSession", async () => {
|
|
156
143
|
await startClaudeSession({ ...BASE_ARGS, model: "claude-sonnet-4-5" }, makeFakeDeps())
|
|
157
144
|
const args = capturedQueryArgs as { options: { model: string } }
|
|
@@ -316,14 +316,6 @@ export async function startClaudeSession(args: {
|
|
|
316
316
|
setPermissionMode: async (planMode: boolean) => {
|
|
317
317
|
await q.setPermissionMode(planMode ? "plan" : "acceptEdits")
|
|
318
318
|
},
|
|
319
|
-
getSupportedCommands: async () => {
|
|
320
|
-
try {
|
|
321
|
-
return await q.supportedCommands()
|
|
322
|
-
} catch (error) {
|
|
323
|
-
log.warn("[kanna/claude] supportedCommands failed", String(error))
|
|
324
|
-
return []
|
|
325
|
-
}
|
|
326
|
-
},
|
|
327
319
|
...(args.keepAlive ? {
|
|
328
320
|
pushChannelPrompt: async (content: string) => {
|
|
329
321
|
enqueueUserPrompt(content)
|
|
@@ -28,7 +28,6 @@ const STUB_HANDLE = {
|
|
|
28
28
|
sendPrompt: async () => {},
|
|
29
29
|
setModel: async () => {},
|
|
30
30
|
setPermissionMode: async () => {},
|
|
31
|
-
getSupportedCommands: async () => [],
|
|
32
31
|
}
|
|
33
32
|
|
|
34
33
|
function makeSession(overrides?: Partial<ConstructorParameters<typeof ClaudeSessionState>[0]>): ClaudeSessionState {
|
|
@@ -565,7 +564,7 @@ describe("sweepIdleClaudeSessions background-task escalation", () => {
|
|
|
565
564
|
expect(session.backgroundTaskWakeCount).toBe(0)
|
|
566
565
|
})
|
|
567
566
|
|
|
568
|
-
it("still wakes a session that never saw a level snapshot
|
|
567
|
+
it("still wakes a session that never saw a level snapshot", () => {
|
|
569
568
|
const session = makeExpiredSession({ backgroundTasksLevelSourced: false })
|
|
570
569
|
const wakeFn = mock<SessionStateQueryDeps["wakeBackgroundTaskSession"]>(() => undefined)
|
|
571
570
|
const deps = makeDeps({
|
|
@@ -17,10 +17,6 @@ export interface StartingTurn {
|
|
|
17
17
|
|
|
18
18
|
export type CompactionTurnKind = "proactive" | "user" | "codex_summary"
|
|
19
19
|
|
|
20
|
-
export function isCliCompactTurn(turn: Pick<ActiveTurn, "compactionTurn"> | undefined): boolean {
|
|
21
|
-
return turn?.compactionTurn === "proactive" || turn?.compactionTurn === "user"
|
|
22
|
-
}
|
|
23
|
-
|
|
24
20
|
export function isProactiveCompactTurn(turn: Pick<ActiveTurn, "compactionTurn"> | undefined): boolean {
|
|
25
21
|
return turn?.compactionTurn === "proactive"
|
|
26
22
|
}
|
|
@@ -18,7 +18,7 @@ function makeDeps(overrides: Partial<SubagentWiringDeps> = {}): SubagentWiringDe
|
|
|
18
18
|
{ resolve: (v: unknown) => void; reject: (e: Error) => void }
|
|
19
19
|
>()
|
|
20
20
|
|
|
21
|
-
const fakeSession = { interrupt: () => {}, getAccountInfo: async () => null, close: () => {}, closed: Promise.resolve(),
|
|
21
|
+
const fakeSession = { interrupt: () => {}, getAccountInfo: async () => null, close: () => {}, closed: Promise.resolve(), setModel: async () => {}, setPermissionMode: async () => {}, sendPrompt: NOOP_PROMISE, pushChannelPrompt: NOOP_PROMISE }
|
|
22
22
|
|
|
23
23
|
return {
|
|
24
24
|
store: {
|
|
@@ -49,12 +49,6 @@ function makeDeps(overrides: Partial<SubagentWiringDeps> = {}): SubagentWiringDe
|
|
|
49
49
|
appendSubagentEvent: async () => {},
|
|
50
50
|
},
|
|
51
51
|
startClaudeSessionFn: async (_a) => fakeSession as never,
|
|
52
|
-
startClaudeSessionPTYFn: async (_a) => fakeSession as never,
|
|
53
|
-
toolCallback: null,
|
|
54
|
-
tunnelGateway: null,
|
|
55
|
-
claudePtyRegistry: null,
|
|
56
|
-
ptyInstanceRegistry: null,
|
|
57
|
-
workflowRegistry: null,
|
|
58
52
|
subagentOrchestrator: {
|
|
59
53
|
notifySubagentToolPending: () => {},
|
|
60
54
|
} as never,
|
|
@@ -62,7 +56,6 @@ function makeDeps(overrides: Partial<SubagentWiringDeps> = {}): SubagentWiringDe
|
|
|
62
56
|
oauthPool: null,
|
|
63
57
|
subagentPendingResolvers: pendingResolvers as never,
|
|
64
58
|
realpath: (p) => p,
|
|
65
|
-
resolveClaudeDriverPreference: () => "sdk",
|
|
66
59
|
getEnabledCustomMcpServers: () => [],
|
|
67
60
|
buildOAuthBearers: async () => ({ byServerId: new Map(), usableUntil: null }),
|
|
68
61
|
resolveChatPolicy: () => ({ mode: "acceptEdits" } as never),
|
|
@@ -111,10 +104,9 @@ describe("buildClaudeSubagentStarter", () => {
|
|
|
111
104
|
expect(typeof starter).toBe("function")
|
|
112
105
|
})
|
|
113
106
|
|
|
114
|
-
test("
|
|
107
|
+
test("calls startClaudeSessionFn with merged mcpServers", async () => {
|
|
115
108
|
let capturedArgs: unknown = null
|
|
116
109
|
const deps = makeDeps({
|
|
117
|
-
resolveClaudeDriverPreference: () => "sdk",
|
|
118
110
|
startClaudeSessionFn: async (a) => {
|
|
119
111
|
capturedArgs = a
|
|
120
112
|
return {} as never
|
|
@@ -141,64 +133,6 @@ describe("buildClaudeSubagentStarter", () => {
|
|
|
141
133
|
expect((args.customMcpServers as unknown[]).length).toBe(1)
|
|
142
134
|
expect(args.oauthBearers).toBeInstanceOf(Map)
|
|
143
135
|
})
|
|
144
|
-
|
|
145
|
-
test("PTY preference — calls startClaudeSessionPTYFn with oneShot: true", async () => {
|
|
146
|
-
let ptyCalled = false
|
|
147
|
-
let capturedPtyArgs: unknown = null
|
|
148
|
-
const deps = makeDeps({
|
|
149
|
-
resolveClaudeDriverPreference: () => "pty",
|
|
150
|
-
startClaudeSessionPTYFn: async (a) => {
|
|
151
|
-
ptyCalled = true
|
|
152
|
-
capturedPtyArgs = a
|
|
153
|
-
return {} as never
|
|
154
|
-
},
|
|
155
|
-
})
|
|
156
|
-
const starter = buildClaudeSubagentStarter(deps)
|
|
157
|
-
await starter({
|
|
158
|
-
chatId: "chat-x",
|
|
159
|
-
projectId: "proj",
|
|
160
|
-
localPath: "/tmp/x",
|
|
161
|
-
model: "claude-opus-4-5",
|
|
162
|
-
effort: undefined,
|
|
163
|
-
planMode: false,
|
|
164
|
-
sessionToken: null,
|
|
165
|
-
forkSession: false,
|
|
166
|
-
oauthToken: null,
|
|
167
|
-
onToolRequest: async () => null,
|
|
168
|
-
} as never)
|
|
169
|
-
|
|
170
|
-
expect(ptyCalled).toBe(true)
|
|
171
|
-
const ptyArgs = capturedPtyArgs as Record<string, unknown>
|
|
172
|
-
expect(ptyArgs.oneShot).toBe(true)
|
|
173
|
-
})
|
|
174
|
-
|
|
175
|
-
test("PTY preference — forwards maxTurns to startClaudeSessionPTYFn", async () => {
|
|
176
|
-
let capturedPtyArgs: unknown = null
|
|
177
|
-
const deps = makeDeps({
|
|
178
|
-
resolveClaudeDriverPreference: () => "pty",
|
|
179
|
-
startClaudeSessionPTYFn: async (a) => {
|
|
180
|
-
capturedPtyArgs = a
|
|
181
|
-
return {} as never
|
|
182
|
-
},
|
|
183
|
-
})
|
|
184
|
-
const starter = buildClaudeSubagentStarter(deps)
|
|
185
|
-
await starter({
|
|
186
|
-
chatId: "chat-x",
|
|
187
|
-
projectId: "proj",
|
|
188
|
-
localPath: "/tmp/x",
|
|
189
|
-
model: "claude-opus-4-5",
|
|
190
|
-
effort: undefined,
|
|
191
|
-
planMode: false,
|
|
192
|
-
sessionToken: null,
|
|
193
|
-
forkSession: false,
|
|
194
|
-
oauthToken: null,
|
|
195
|
-
onToolRequest: async () => null,
|
|
196
|
-
maxTurns: 5,
|
|
197
|
-
} as never)
|
|
198
|
-
|
|
199
|
-
const ptyArgs = capturedPtyArgs as Record<string, unknown>
|
|
200
|
-
expect(ptyArgs.maxTurns).toBe(5)
|
|
201
|
-
})
|
|
202
136
|
})
|
|
203
137
|
|
|
204
138
|
|
|
@@ -1,25 +1,18 @@
|
|
|
1
1
|
|
|
2
2
|
import type { JsonValue } from "../shared/json"
|
|
3
3
|
import type {
|
|
4
|
-
|
|
4
|
+
CustomModelEntry,
|
|
5
5
|
LlmProviderSnapshot,
|
|
6
6
|
McpServerConfig,
|
|
7
7
|
Subagent,
|
|
8
8
|
} from "../shared/types"
|
|
9
9
|
import type { HarnessToolRequest } from "./harness-types"
|
|
10
|
-
import type { ClaudeSessionHandle } from "./harness-types"
|
|
11
10
|
import type { ArmedLoopInfo, ChatTaskStorePort, KannaMcpDelegationContext } from "./kanna-mcp"
|
|
12
11
|
import type { ChatRecord, ProjectRecord, StackRecord, SubagentRunEvent } from "./events"
|
|
13
12
|
import type { ProviderRunStart, SubagentOrchestrator } from "./subagent-orchestrator"
|
|
14
13
|
import type { BuildSubagentProviderRunArgs } from "./subagent-provider-run"
|
|
15
14
|
import { buildSubagentProviderRun } from "./subagent-provider-run"
|
|
16
|
-
import type { StartClaudeSessionPtyArgs } from "./claude-pty/driver"
|
|
17
15
|
import type { ChatPermissionPolicy } from "../shared/permission-policy"
|
|
18
|
-
import type { ToolCallbackService } from "./tool-callback"
|
|
19
|
-
import type { TunnelGateway } from "./cloudflare-tunnel/gateway"
|
|
20
|
-
import type { ClaudePtyRegistry } from "./claude-pty/pid-registry.adapter"
|
|
21
|
-
import type { PtyInstanceRegistry } from "./claude-pty/pty-instance-registry"
|
|
22
|
-
import type { WorkflowRegistry } from "./workflow-registry"
|
|
23
16
|
import type { CodexAppServerManager } from "./codex-app-server"
|
|
24
17
|
import type { RealpathFn } from "./paths"
|
|
25
18
|
import { resolveSubagentRoots } from "./paths"
|
|
@@ -50,13 +43,7 @@ export interface SubagentWiringDeps {
|
|
|
50
43
|
store: SubagentWiringStore
|
|
51
44
|
|
|
52
45
|
startClaudeSessionFn: typeof StartClaudeSessionFn
|
|
53
|
-
startClaudeSessionPTYFn: (args: StartClaudeSessionPtyArgs) => Promise<ClaudeSessionHandle>
|
|
54
46
|
|
|
55
|
-
toolCallback: ToolCallbackService | null
|
|
56
|
-
tunnelGateway: TunnelGateway | null
|
|
57
|
-
claudePtyRegistry: ClaudePtyRegistry | null
|
|
58
|
-
ptyInstanceRegistry: PtyInstanceRegistry | null
|
|
59
|
-
workflowRegistry: WorkflowRegistry | null
|
|
60
47
|
subagentOrchestrator: SubagentOrchestrator
|
|
61
48
|
codexManager: CodexAppServerManager
|
|
62
49
|
oauthPool: SubagentWiringOAuthPool | null
|
|
@@ -65,7 +52,6 @@ export interface SubagentWiringDeps {
|
|
|
65
52
|
|
|
66
53
|
realpath: RealpathFn
|
|
67
54
|
|
|
68
|
-
resolveClaudeDriverPreference: () => ClaudeDriverPreference
|
|
69
55
|
getEnabledCustomMcpServers: () => readonly McpServerConfig[]
|
|
70
56
|
buildOAuthBearers: (servers: readonly McpServerConfig[]) => Promise<OAuthBearers>
|
|
71
57
|
resolveChatPolicy: (chatId: string) => ChatPermissionPolicy
|
|
@@ -73,6 +59,7 @@ export interface SubagentWiringDeps {
|
|
|
73
59
|
buildPoolUnavailableMessage: (reservedFor: string, scopeSuffix: string) => string
|
|
74
60
|
getAppSettingsSnapshot: () => {
|
|
75
61
|
globalPromptAppend?: string
|
|
62
|
+
customModels?: readonly CustomModelEntry[]
|
|
76
63
|
}
|
|
77
64
|
readLlmProvider: () => Promise<LlmProviderSnapshot>
|
|
78
65
|
subagentPendingKey: (chatId: string, runId: string, toolUseId: string) => string
|
|
@@ -100,40 +87,6 @@ export function buildClaudeSubagentStarter(
|
|
|
100
87
|
return async (a) => {
|
|
101
88
|
const enabledMcpServers = deps.getEnabledCustomMcpServers()
|
|
102
89
|
const { byServerId: oauthBearers } = await deps.buildOAuthBearers(enabledMcpServers)
|
|
103
|
-
if (deps.resolveClaudeDriverPreference() === "pty") {
|
|
104
|
-
return deps.startClaudeSessionPTYFn({
|
|
105
|
-
chatId: a.chatId ?? "",
|
|
106
|
-
projectId: a.projectId,
|
|
107
|
-
localPath: a.localPath,
|
|
108
|
-
model: a.model,
|
|
109
|
-
effort: a.effort,
|
|
110
|
-
planMode: a.planMode,
|
|
111
|
-
sessionToken: a.sessionToken,
|
|
112
|
-
forkSession: a.forkSession,
|
|
113
|
-
oauthToken: a.oauthToken,
|
|
114
|
-
oauthBaseUrl: a.oauthBaseUrl,
|
|
115
|
-
additionalDirectories: a.additionalDirectories,
|
|
116
|
-
onToolRequest: a.onToolRequest,
|
|
117
|
-
systemPromptOverride: a.systemPromptOverride,
|
|
118
|
-
initialPrompt: a.initialPrompt,
|
|
119
|
-
subagentOrchestrator: a.subagentOrchestrator,
|
|
120
|
-
delegationContext: a.delegationContext,
|
|
121
|
-
toolCallback: deps.toolCallback ?? undefined,
|
|
122
|
-
tunnelGateway: deps.tunnelGateway,
|
|
123
|
-
chatPolicy: a.chatId ? deps.resolveChatPolicy(a.chatId) : undefined,
|
|
124
|
-
oneShot: true,
|
|
125
|
-
ptyRegistry: deps.claudePtyRegistry ?? undefined,
|
|
126
|
-
ptyInstanceRegistry: deps.ptyInstanceRegistry ?? undefined,
|
|
127
|
-
workflowRegistry: deps.workflowRegistry ?? undefined,
|
|
128
|
-
customMcpServers: enabledMcpServers,
|
|
129
|
-
oauthBearers,
|
|
130
|
-
restrictedAllowedPaths: a.restrictedAllowedPaths,
|
|
131
|
-
maxTurns: a.maxTurns,
|
|
132
|
-
keepAlive: a.keepAlive,
|
|
133
|
-
getArmedLoop: a.getArmedLoop,
|
|
134
|
-
chatTaskStore: deps.chatTaskStore,
|
|
135
|
-
})
|
|
136
|
-
}
|
|
137
90
|
return deps.startClaudeSessionFn({ ...a, customMcpServers: enabledMcpServers, oauthBearers })
|
|
138
91
|
}
|
|
139
92
|
}
|
|
@@ -220,7 +173,6 @@ export function buildSubagentProviderRunForChat(
|
|
|
220
173
|
allowedPaths: restriction?.allowedPaths,
|
|
221
174
|
projectId: project.id,
|
|
222
175
|
startClaudeSession: buildClaudeSubagentStarter(deps),
|
|
223
|
-
claudeDriverIsPty: deps.resolveClaudeDriverPreference() === "pty",
|
|
224
176
|
subagentOrchestrator: deps.subagentOrchestrator,
|
|
225
177
|
delegationContext,
|
|
226
178
|
getArmedLoop: deps.getArmedLoop,
|
|
@@ -228,6 +180,7 @@ export function buildSubagentProviderRunForChat(
|
|
|
228
180
|
codexManager: deps.codexManager,
|
|
229
181
|
onToolRequest,
|
|
230
182
|
globalPromptAppend: deps.getAppSettingsSnapshot().globalPromptAppend,
|
|
183
|
+
customModels: deps.getAppSettingsSnapshot().customModels,
|
|
231
184
|
authReady: async (provider) => {
|
|
232
185
|
if (provider === "openrouter") {
|
|
233
186
|
return openrouterAuthReady(await deps.readLlmProvider())
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type {
|
|
2
2
|
AgentProvider,
|
|
3
3
|
ChatAttachment,
|
|
4
|
-
ClaudeDriverPreference,
|
|
5
4
|
ResolvedStackBinding,
|
|
6
5
|
SlashCommandKind,
|
|
7
6
|
Subagent,
|
|
@@ -52,8 +51,6 @@ export interface StartTurnDeps {
|
|
|
52
51
|
|
|
53
52
|
clearDrainingStream: (chatId: string) => void
|
|
54
53
|
emitStateChange: (chatId: string, options?: { immediate?: boolean }) => void
|
|
55
|
-
resolveClaudeDriverPreference: () => ClaudeDriverPreference
|
|
56
|
-
closeClaudeSession: (chatId: string, session: ClaudeSessionState) => void
|
|
57
54
|
getSubagents: () => Subagent[]
|
|
58
55
|
getAppSettingsSnapshot: () => StartTurnAppSettings
|
|
59
56
|
listSkills: (chatId: string) => SkillRosterEntry[]
|
|
@@ -81,8 +81,6 @@ function makeDeps(overrides: Partial<StartTurnDeps> = {}): StartTurnDeps {
|
|
|
81
81
|
|
|
82
82
|
clearDrainingStream: mock(() => {}),
|
|
83
83
|
emitStateChange: mock(() => {}),
|
|
84
|
-
resolveClaudeDriverPreference: mock(() => "sdk" as const),
|
|
85
|
-
closeClaudeSession: mock(() => {}),
|
|
86
84
|
getSubagents: mock(() => []),
|
|
87
85
|
getAppSettingsSnapshot: mock(() => ({ globalPromptAppend: undefined })),
|
|
88
86
|
listSkills: mock(() => []),
|
|
@@ -365,32 +363,6 @@ describe("startTurnForChat — starting-turn marker", () => {
|
|
|
365
363
|
expect(close).toHaveBeenCalledTimes(1)
|
|
366
364
|
})
|
|
367
365
|
|
|
368
|
-
test("cancel during a claude PTY boot also drops the dead session", async () => {
|
|
369
|
-
const gate = deferred<HarnessTurn>()
|
|
370
|
-
const closeClaudeSession = mock(() => {})
|
|
371
|
-
const deps = makeDeps({
|
|
372
|
-
resolveClaudeDriverPreference: mock(() => "pty" as const),
|
|
373
|
-
closeClaudeSession,
|
|
374
|
-
})
|
|
375
|
-
deps.startClaudeTurn = mock(() => {
|
|
376
|
-
deps.claudeSessions.set("chat-1", { chatId: "chat-1" } as unknown as ClaudeSessionState)
|
|
377
|
-
return gate.promise
|
|
378
|
-
})
|
|
379
|
-
|
|
380
|
-
const pending = startTurnForChat(deps, makeArgs({ provider: "claude", model: "claude-opus-4-5" }))
|
|
381
|
-
await new Promise((r) => setTimeout(r, 0))
|
|
382
|
-
|
|
383
|
-
const starting = deps.startingTurns.get("chat-1")!
|
|
384
|
-
starting.cancelRequested = true
|
|
385
|
-
deps.startingTurns.delete("chat-1")
|
|
386
|
-
|
|
387
|
-
gate.resolve(makeFakeTurn())
|
|
388
|
-
await pending
|
|
389
|
-
|
|
390
|
-
expect(deps.activeTurns.has("chat-1")).toBe(false)
|
|
391
|
-
expect(closeClaudeSession).toHaveBeenCalledTimes(1)
|
|
392
|
-
})
|
|
393
|
-
|
|
394
366
|
test("a cancelled boot does not clear a newer turn's marker", async () => {
|
|
395
367
|
const gate = deferred<HarnessTurn>()
|
|
396
368
|
const deps = makeDeps({ codexManager: {
|
|
@@ -196,7 +196,6 @@ async function startTurnForChatInner(
|
|
|
196
196
|
...(args.effort !== undefined ? { effort: args.effort } : {}),
|
|
197
197
|
...(args.serviceTier !== undefined ? { serviceTier: args.serviceTier } : {}),
|
|
198
198
|
planMode: args.planMode,
|
|
199
|
-
driver: deps.resolveClaudeDriverPreference(),
|
|
200
199
|
})
|
|
201
200
|
logSendToStartingProfile(args.profile, "start_turn.turn_started_recorded", {
|
|
202
201
|
chatId: args.chatId,
|
|
@@ -406,10 +405,6 @@ async function startTurnAfterTurnStarted(
|
|
|
406
405
|
} catch {
|
|
407
406
|
}
|
|
408
407
|
turn.close()
|
|
409
|
-
if (args.provider === "claude" && deps.resolveClaudeDriverPreference() === "pty") {
|
|
410
|
-
const session = deps.claudeSessions.get(args.chatId)
|
|
411
|
-
if (session) deps.closeClaudeSession(args.chatId, session)
|
|
412
|
-
}
|
|
413
408
|
return
|
|
414
409
|
}
|
|
415
410
|
|
|
@@ -447,7 +447,6 @@ describe("EventStore", () => {
|
|
|
447
447
|
model: "claude-opus-4-8",
|
|
448
448
|
effort: "high",
|
|
449
449
|
planMode: true,
|
|
450
|
-
driver: "pty",
|
|
451
450
|
})
|
|
452
451
|
|
|
453
452
|
const raw = await readFile(join(dataDir, "turns.jsonl"), "utf8")
|
|
@@ -462,7 +461,6 @@ describe("EventStore", () => {
|
|
|
462
461
|
model: "claude-opus-4-8",
|
|
463
462
|
effort: "high",
|
|
464
463
|
planMode: true,
|
|
465
|
-
driver: "pty",
|
|
466
464
|
})
|
|
467
465
|
})
|
|
468
466
|
|
package/src/server/events.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type {
|
|
2
2
|
AgentProvider,
|
|
3
|
-
ClaudeDriverPreference,
|
|
4
3
|
KannaStatus,
|
|
5
4
|
ModelOptions,
|
|
6
5
|
ProjectSummary,
|
|
@@ -247,7 +246,7 @@ export interface TurnRunConfig {
|
|
|
247
246
|
effort?: string
|
|
248
247
|
serviceTier?: "fast"
|
|
249
248
|
planMode: boolean
|
|
250
|
-
driver
|
|
249
|
+
driver?: "sdk" | "pty"
|
|
251
250
|
}
|
|
252
251
|
|
|
253
252
|
export type TurnEvent =
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AccountInfo, AgentProvider, NormalizedToolCall,
|
|
1
|
+
import type { AccountInfo, AgentProvider, NormalizedToolCall, TranscriptEntry } from "../shared/types"
|
|
2
2
|
|
|
3
3
|
export type HarnessEvent =
|
|
4
4
|
| { type: "transcript"; entry: TranscriptEntry }
|
|
@@ -27,6 +27,5 @@ export interface ClaudeSessionHandle {
|
|
|
27
27
|
sendPrompt: (content: string) => Promise<void>
|
|
28
28
|
setModel: (model: string) => Promise<void>
|
|
29
29
|
setPermissionMode: (planMode: boolean) => Promise<void>
|
|
30
|
-
getSupportedCommands: () => Promise<SlashCommand[]>
|
|
31
30
|
pushChannelPrompt?: (text: string) => Promise<void>
|
|
32
31
|
}
|