@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.
Files changed (199) hide show
  1. package/README.md +5 -9
  2. package/dist/client/assets/{BoardsPage-BJalB-bc.js → BoardsPage-AckCuswi.js} +1 -1
  3. package/dist/client/assets/BoardsRoutePage-DzKwKy3f.js +1 -0
  4. package/dist/client/assets/ChatPage-DsaH8CTz.js +93 -0
  5. package/dist/client/assets/{CronJobRow-CPbO_jwU.js → CronJobRow-Bx9gRqKW.js} +1 -1
  6. package/dist/client/assets/{CronJobsPage-Ck3SNgGi.js → CronJobsPage-v0-2X1oX.js} +1 -1
  7. package/dist/client/assets/{FilePreviewSheet-XEuUtDPn.js → FilePreviewSheet-B6SDxSD0.js} +2 -2
  8. package/dist/client/assets/{FlowSurface-BCbeMTJe.js → FlowSurface-CLC-ZFar.js} +1 -1
  9. package/dist/client/assets/{GenUIBlock-BJy_dfs-.js → GenUIBlock-CC79Ujro.js} +2 -2
  10. package/dist/client/assets/{KannaSocketProvider-D7Lzlt35.js → KannaSocketProvider-B2sHsWP5.js} +1 -1
  11. package/dist/client/assets/{LocalProjectsPage-9LJkQjhT.js → LocalProjectsPage-DYBkcEAm.js} +1 -1
  12. package/dist/client/assets/SettingsPage-CZqMkMRW.js +9 -0
  13. package/dist/client/assets/{StackBoardsRoutePage-t_EaFNG4.js → StackBoardsRoutePage-Clviz0hX.js} +1 -1
  14. package/dist/client/assets/{ToolCallMessage-RbF9XT2B.js → ToolCallMessage-BfNbWGmc.js} +1 -1
  15. package/dist/client/assets/{VChartSurface-CKuPelsn.js → VChartSurface-CUbxyBo3.js} +1 -1
  16. package/dist/client/assets/{WorkflowsPage-B6qUmQA3.js → WorkflowsPage-rengzb97.js} +1 -1
  17. package/dist/client/assets/{WorkflowsSection-DxO0S4An.js → WorkflowsSection-DuXdLsMO.js} +1 -1
  18. package/dist/client/assets/{chart-renderer-DjYZvNxh.js → chart-renderer-D7ukB2wg.js} +1 -1
  19. package/dist/client/assets/{chatSounds-FD2DQzF6.js → chatSounds-BLg2xPDZ.js} +1 -1
  20. package/dist/client/assets/chevron-left-RbFvmeyK.js +1 -0
  21. package/dist/client/assets/{clipboard.adapter-GN9nnYak.js → clipboard.adapter-CgdNwn-1.js} +1 -1
  22. package/dist/client/assets/{columnStyle-DjA7hA9k.js → columnStyle-CMCF0ds6.js} +1 -1
  23. package/dist/client/assets/{createScopedStore-BoLB9Rhc.js → createScopedStore-BrD5NHWx.js} +1 -1
  24. package/dist/client/assets/{dist-CimtOoGK.js → dist-DNSTHlSo.js} +1 -1
  25. package/dist/client/assets/editor-icons-DY4uKeEY.js +1 -0
  26. package/dist/client/assets/{ellipsis-Cd7sO0LO.js → ellipsis-OHg0x_x1.js} +1 -1
  27. package/dist/client/assets/{flow-kinds-CW2TU_83.js → flow-kinds-Ki2DP9nP.js} +1 -1
  28. package/dist/client/assets/{folder-C7sXCaHj.js → folder-CnWzWIG5.js} +1 -1
  29. package/dist/client/assets/{formatters-wSVyvDFZ.js → formatters-BGORekd-.js} +1 -1
  30. package/dist/client/assets/{genui-EzBIAYFE.js → genui-C9i6j0XZ.js} +1 -1
  31. package/dist/client/assets/{globe-xmRpmpma.js → globe-BjR1tyE4.js} +1 -1
  32. package/dist/client/assets/{host-DCaA9W-Z.js → host-D9tJwZXl.js} +1 -1
  33. package/dist/client/assets/{index-CDqjh7nt.js → index-CesRxZ0X.js} +7 -7
  34. package/dist/client/assets/index-CxDE9VOy.css +1 -0
  35. package/dist/client/assets/{info-D4MMvZFe.js → info-DNYekoE-.js} +1 -1
  36. package/dist/client/assets/{input-C4fvDiQ4.js → input-DgW9uRZN.js} +1 -1
  37. package/dist/client/assets/{lexicalToReact-sPUyOWk6.js → lexicalToReact-CZvp9Pgz.js} +3 -3
  38. package/dist/client/assets/{log-aTaDVF_e.js → log-DnEvbp3E.js} +1 -1
  39. package/dist/client/assets/{monitor-_CRKcV1h.js → monitor-qbWfUdBG.js} +1 -1
  40. package/dist/client/assets/{pencil-fNBeUUCf.js → pencil-C965rrpd.js} +1 -1
  41. package/dist/client/assets/{pendingActionsStore-COTh4Ztq.js → pendingActionsStore-CxhI19V9.js} +1 -1
  42. package/dist/client/assets/{play-BAmkJfn6.js → play-uofLR7yT.js} +1 -1
  43. package/dist/client/assets/{plus-c75CkNEO.js → plus-D4CI6rj1.js} +1 -1
  44. package/dist/client/assets/{popover-CHM4skzh.js → popover-Bc646hKn.js} +1 -1
  45. package/dist/client/assets/{pushClient-BJH_ITRB.js → pushClient-CxnHu9h4.js} +1 -1
  46. package/dist/client/assets/runDetached-DfQXHAaY.js +1 -0
  47. package/dist/client/assets/{segmented-control-DNOwRupT.js → segmented-control-CKGX29Kl.js} +1 -1
  48. package/dist/client/assets/{select-dLHiAls6.js → select-BjeajpVt.js} +1 -1
  49. package/dist/client/assets/{settings-header-button-CGKCzFyk.js → settings-header-button-BYvHR6Xl.js} +1 -1
  50. package/dist/client/assets/{sidebarPendingActions-Dyp80Lv_.js → sidebarPendingActions-xgMTnfRY.js} +1 -1
  51. package/dist/client/assets/{square-pen-B1IxmScM.js → square-pen-DmppQdTd.js} +1 -1
  52. package/dist/client/assets/{state-mark-BhTZfcYe.js → state-mark-C3kEL1hX.js} +1 -1
  53. package/dist/client/assets/{status-pill-CwhJhaMy.js → status-pill-Bo1Nb6HX.js} +1 -1
  54. package/dist/client/assets/{terminal-Bnj7qFGw.js → terminal-DfCF-J4p.js} +1 -1
  55. package/dist/client/assets/{timer.adapter-DHt2zwsL.js → timer.adapter-C2RhP4d6.js} +1 -1
  56. package/dist/client/assets/{tools-3gJcj3hK.js → tools-t5T_3UBg.js} +1 -1
  57. package/dist/client/assets/{triangle-alert-CWrc0CIO.js → triangle-alert-CYQhobyY.js} +1 -1
  58. package/dist/client/assets/useAppGlobalState-DUa3pkCF.js +1 -0
  59. package/dist/client/assets/useKannaState-FcieR5qb.js +5 -0
  60. package/dist/client/assets/useTheme-D9sKDPEm.js +1 -0
  61. package/dist/client/index.html +35 -35
  62. package/package.json +2 -2
  63. package/src/server/agent-coordinator-types.ts +0 -6
  64. package/src/server/agent-coordinator.ts +6 -45
  65. package/src/server/agent.compaction.test.ts +1 -13
  66. package/src/server/agent.oauth-account-info.test.ts +0 -3
  67. package/src/server/agent.oauth-release.test.ts +0 -2
  68. package/src/server/agent.oauth-rotation.test.ts +0 -9
  69. package/src/server/agent.oauth-token-share-cap.test.ts +0 -1
  70. package/src/server/agent.openrouter-model.test.ts +0 -2
  71. package/src/server/agent.openrouter-watchdog.test.ts +0 -3
  72. package/src/server/agent.sdk-workflow-register.test.ts +2 -64
  73. package/src/server/agent.test.ts +1 -319
  74. package/src/server/app-settings.test.ts +14 -17
  75. package/src/server/app-settings.ts +22 -37
  76. package/src/server/auto-continue/e2e.test.ts +0 -1
  77. package/src/server/background-task-output-registry.test.ts +1 -1
  78. package/src/server/background-task-output-registry.ts +1 -1
  79. package/src/server/claude-cancel-handler.test.ts +0 -58
  80. package/src/server/claude-cancel-handler.ts +1 -17
  81. package/src/server/claude-harness-stream.test.ts +134 -0
  82. package/src/server/{claude-pty/jsonl-path.test.ts → claude-projects-path.adapter.test.ts} +1 -19
  83. package/src/server/{claude-pty/jsonl-path.adapter.ts → claude-projects-path.adapter.ts} +0 -11
  84. package/src/server/claude-send-command.test.ts +0 -1
  85. package/src/server/claude-session-config-helpers.test.ts +1 -90
  86. package/src/server/claude-session-config-helpers.ts +1 -38
  87. package/src/server/claude-session-error-handler.test.ts +0 -1
  88. package/src/server/claude-session-lifecycle.test.ts +2 -36
  89. package/src/server/claude-session-lifecycle.ts +2 -8
  90. package/src/server/claude-session-runner.test.ts +8 -36
  91. package/src/server/claude-session-runner.ts +1 -26
  92. package/src/server/claude-session-spawner.test.ts +5 -64
  93. package/src/server/claude-session-spawner.ts +49 -115
  94. package/src/server/claude-session-start.test.ts +1 -14
  95. package/src/server/claude-session-start.ts +0 -8
  96. package/src/server/claude-session-state-queries.test.ts +1 -2
  97. package/src/server/claude-session-state.test.ts +0 -1
  98. package/src/server/claude-session-state.ts +0 -4
  99. package/src/server/claude-subagent-wiring.test.ts +2 -68
  100. package/src/server/claude-subagent-wiring.ts +3 -50
  101. package/src/server/claude-turn-starter-types.ts +0 -3
  102. package/src/server/claude-turn-starter.test.ts +0 -28
  103. package/src/server/claude-turn-starter.ts +0 -5
  104. package/src/server/event-store.test.ts +0 -2
  105. package/src/server/events.ts +1 -2
  106. package/src/server/harness-types.ts +1 -2
  107. package/src/server/import-subagent-drill.e2e.test.ts +1 -1
  108. package/src/server/imported-subagents-dir.test.ts +1 -1
  109. package/src/server/imported-subagents-dir.ts +1 -1
  110. package/src/server/kanna-mcp.test.ts +0 -75
  111. package/src/server/kanna-mcp.ts +1 -47
  112. package/src/server/server.test.ts +5 -7
  113. package/src/server/server.ts +2 -18
  114. package/src/server/subagent-orchestrator.test.ts +0 -1
  115. package/src/server/subagent-provider-run.test.ts +48 -10
  116. package/src/server/subagent-provider-run.ts +12 -3
  117. package/src/server/tool-callback.test.ts +1 -1
  118. package/src/server/ws-router-agent-ctrl.test.ts +0 -45
  119. package/src/server/ws-router-agent-ctrl.ts +1 -31
  120. package/src/server/ws-router-broadcast.ts +0 -27
  121. package/src/server/ws-router-defaults.test.ts +2 -3
  122. package/src/server/ws-router-defaults.ts +2 -3
  123. package/src/server/ws-router-envelope.ts +0 -15
  124. package/src/server/ws-router-observability.test.ts +1 -1
  125. package/src/server/ws-router-settings.test.ts +2 -2
  126. package/src/server/ws-router.test.ts +2 -2
  127. package/src/server/ws-router.ts +0 -8
  128. package/src/shared/app-settings-types.ts +9 -20
  129. package/src/shared/claude-api-error-classification.ts +1 -1
  130. package/src/shared/protocol.ts +1 -11
  131. package/dist/client/assets/BoardsRoutePage-BTTjJX-Y.js +0 -1
  132. package/dist/client/assets/ChatPage-DH8wtQyD.js +0 -93
  133. package/dist/client/assets/SettingsPage-CKrZ6dGQ.js +0 -9
  134. package/dist/client/assets/chevron-left-CJ0qv9kF.js +0 -1
  135. package/dist/client/assets/editor-icons-CONDQZof.js +0 -1
  136. package/dist/client/assets/index-C-UYaDk6.css +0 -1
  137. package/dist/client/assets/runDetached-DqQ3k2ji.js +0 -1
  138. package/dist/client/assets/useAppGlobalState-DKOGrO5l.js +0 -1
  139. package/dist/client/assets/useKannaState-D7R_-dM6.js +0 -5
  140. package/dist/client/assets/useTheme-B57LIKyx.js +0 -1
  141. package/src/server/agent.pty-rotation.test.ts +0 -322
  142. package/src/server/claude-pty/auth.test.ts +0 -38
  143. package/src/server/claude-pty/auth.ts +0 -17
  144. package/src/server/claude-pty/claude-session-registry.adapter.ts +0 -68
  145. package/src/server/claude-pty/claude-session-registry.test.ts +0 -149
  146. package/src/server/claude-pty/driver.test.ts +0 -1153
  147. package/src/server/claude-pty/driver.ts +0 -829
  148. package/src/server/claude-pty/env.test.ts +0 -79
  149. package/src/server/claude-pty/env.ts +0 -20
  150. package/src/server/claude-pty/jsonl-to-event.test.ts +0 -882
  151. package/src/server/claude-pty/jsonl-to-event.ts +0 -357
  152. package/src/server/claude-pty/parity-matrix.test.ts +0 -437
  153. package/src/server/claude-pty/pid-registry.adapter.ts +0 -164
  154. package/src/server/claude-pty/pid-registry.test.ts +0 -178
  155. package/src/server/claude-pty/preflight/binary-fingerprint.adapter.ts +0 -20
  156. package/src/server/claude-pty/preflight/binary-fingerprint.test.ts +0 -32
  157. package/src/server/claude-pty/pty-instance-registry.test.ts +0 -208
  158. package/src/server/claude-pty/pty-instance-registry.ts +0 -172
  159. package/src/server/claude-pty/pty-memory-sampler.adapter.test.ts +0 -103
  160. package/src/server/claude-pty/pty-memory-sampler.adapter.ts +0 -86
  161. package/src/server/claude-pty/pty-process.adapter.ts +0 -60
  162. package/src/server/claude-pty/pty-process.test.ts +0 -49
  163. package/src/server/claude-pty/resolve-binary.adapter.ts +0 -106
  164. package/src/server/claude-pty/resolve-binary.test.ts +0 -118
  165. package/src/server/claude-pty/runtime-dir.adapter.ts +0 -19
  166. package/src/server/claude-pty/sandbox/detect.adapter.ts +0 -17
  167. package/src/server/claude-pty/sandbox/detect.test.ts +0 -17
  168. package/src/server/claude-pty/sandbox/platform.test.ts +0 -35
  169. package/src/server/claude-pty/sandbox/platform.ts +0 -27
  170. package/src/server/claude-pty/sandbox/preflight-io.adapter.ts +0 -14
  171. package/src/server/claude-pty/sandbox/preflight.test.ts +0 -69
  172. package/src/server/claude-pty/sandbox/preflight.ts +0 -44
  173. package/src/server/claude-pty/sandbox/profile-linux.adapter.ts +0 -63
  174. package/src/server/claude-pty/sandbox/profile-linux.test.ts +0 -90
  175. package/src/server/claude-pty/sandbox/profile-macos.adapter.ts +0 -72
  176. package/src/server/claude-pty/sandbox/profile-macos.test.ts +0 -68
  177. package/src/server/claude-pty/sandbox/wrap.adapter.ts +0 -58
  178. package/src/server/claude-pty/sandbox/wrap.test.ts +0 -82
  179. package/src/server/claude-pty/settings-writer.adapter.ts +0 -23
  180. package/src/server/claude-pty/settings-writer.test.ts +0 -22
  181. package/src/server/claude-pty/smoke-test-io.adapter.ts +0 -28
  182. package/src/server/claude-pty/smoke-test.test.ts +0 -199
  183. package/src/server/claude-pty/smoke-test.ts +0 -182
  184. package/src/server/claude-pty/tui-control.test.ts +0 -300
  185. package/src/server/claude-pty/tui-control.ts +0 -174
  186. package/src/server/claude-pty/tui-source.adapter.test.ts +0 -374
  187. package/src/server/claude-pty/tui-source.adapter.ts +0 -294
  188. package/src/server/http-server.adapter.test.ts +0 -18
  189. package/src/server/http-server.adapter.ts +0 -39
  190. package/src/server/kanna-mcp-http.test.ts +0 -274
  191. package/src/server/kanna-mcp-http.ts +0 -194
  192. package/src/server/kanna-mcp-tools/ask-user-question.test.ts +0 -108
  193. package/src/server/kanna-mcp-tools/ask-user-question.ts +0 -55
  194. package/src/server/kanna-mcp-tools/exit-plan-mode.test.ts +0 -61
  195. package/src/server/kanna-mcp-tools/exit-plan-mode.ts +0 -49
  196. package/src/server/mcp-zod-compat.adapter.ts +0 -20
  197. package/src/shared/pty-instance.ts +0 -43
  198. /package/src/server/{claude-pty/output-ring.test.ts → output-ring.test.ts} +0 -0
  199. /package/src/server/{claude-pty/output-ring.ts → output-ring.ts} +0 -0
@@ -1,5 +1,5 @@
1
1
 
2
- import type { ClaudeDriverPreference, McpServerConfig, McpOAuthState } from "../shared/types"
2
+ import type { McpServerConfig, McpOAuthState } from "../shared/types"
3
3
  import type { ChatPermissionPolicy, ChatPermissionPolicyOverride } from "../shared/permission-policy"
4
4
  import { mergePolicyOverride } from "../shared/permission-policy"
5
5
  import { log } from "../shared/log"
@@ -7,7 +7,6 @@ import { bearerUsableUntil } from "./mcp-oauth.adapter"
7
7
 
8
8
 
9
9
  interface AppSettingsLike {
10
- claudeDriver?: { preference?: ClaudeDriverPreference }
11
10
  customMcpServers?: readonly McpServerConfig[]
12
11
  }
13
12
 
@@ -23,38 +22,18 @@ interface StoreLike {
23
22
  state?: { chatsById?: ChatsByIdLike } | null
24
23
  }
25
24
 
26
- interface PtyInstanceRegistryLike {
27
- snapshot(): ReadonlyArray<{ chatId: string; pid: number | null }>
28
- markExitedIfCurrent(
29
- chatId: string,
30
- pid: number,
31
- patch: { phase: "exited"; exitedAt: number; lastEventAt: number },
32
- ): void
33
- }
34
-
35
-
36
25
  export interface ClaudeSessionConfigHelpersDeps {
37
26
  getAppSettingsSnapshot: () => AppSettingsLike
38
27
  chatPolicy: ChatPermissionPolicy
39
28
  store: StoreLike
40
- ptyInstanceRegistry: PtyInstanceRegistryLike | null
41
29
  ensureFreshToken: (
42
30
  server: McpServerConfig,
43
31
  opts: { persist: (oauth: McpOAuthState) => void },
44
32
  ) => Promise<string>
45
33
  persistOAuthState: ((id: string, oauth: McpOAuthState) => void) | null
46
- killProcessTree: (pid: number) => Promise<void>
47
34
  }
48
35
 
49
36
 
50
- export function resolveClaudeDriverPreference(
51
- deps: ClaudeSessionConfigHelpersDeps,
52
- ): ClaudeDriverPreference {
53
- const fromSettings = deps.getAppSettingsSnapshot().claudeDriver?.preference
54
- if (fromSettings === "pty" || fromSettings === "sdk") return fromSettings
55
- return process.env.KANNA_CLAUDE_DRIVER === "pty" ? "pty" : "sdk"
56
- }
57
-
58
37
  export function getEnabledCustomMcpServers(
59
38
  deps: ClaudeSessionConfigHelpersDeps,
60
39
  ): readonly McpServerConfig[] {
@@ -107,19 +86,3 @@ export function resolveChatPolicy(
107
86
  const override = deps.store.state?.chatsById?.get(chatId)?.policyOverride ?? null
108
87
  return mergePolicyOverride(deps.chatPolicy, override)
109
88
  }
110
-
111
- export async function killPtyInstance(
112
- deps: ClaudeSessionConfigHelpersDeps,
113
- chatId: string,
114
- ): Promise<void> {
115
- const instance = deps.ptyInstanceRegistry?.snapshot().find((entry) => entry.chatId === chatId)
116
- if (!instance || instance.pid === null) {
117
- throw new Error("No live PTY instance for chat")
118
- }
119
- await deps.killProcessTree(instance.pid)
120
- deps.ptyInstanceRegistry?.markExitedIfCurrent(chatId, instance.pid, {
121
- phase: "exited",
122
- exitedAt: Date.now(),
123
- lastEventAt: Date.now(),
124
- })
125
- }
@@ -29,7 +29,6 @@ function makeHandle() {
29
29
  sendPrompt: async () => {},
30
30
  setModel: async () => {},
31
31
  setPermissionMode: async () => {},
32
- getSupportedCommands: async () => [],
33
32
  pushChannelPrompt: async () => {},
34
33
  }
35
34
  }
@@ -26,7 +26,6 @@ function makeFakeHandle() {
26
26
  sendPrompt: async () => {},
27
27
  setModel: async () => {},
28
28
  setPermissionMode: async () => {},
29
- getSupportedCommands: async () => [],
30
29
  }
31
30
  }
32
31
 
@@ -76,7 +75,6 @@ function makeDeps(overrides: Partial<SessionLifecycleDeps> = {}): SessionLifecyc
76
75
  pendingTools: { has: () => false },
77
76
  oauthPool: null,
78
77
  workflowRegistry: null,
79
- resolveClaudeDriverPreference: () => "sdk",
80
78
  emitStateChange: () => {},
81
79
  store: {
82
80
  getChat: () => null,
@@ -284,7 +282,7 @@ describe("background-task guard with an SDK level signal", () => {
284
282
  expect(backgroundTaskGuardExpired(session, now)).toBe(false)
285
283
  })
286
284
 
287
- test("without a level signal the deadline still governs (PTY / old CLI)", () => {
285
+ test("without a level signal the deadline still governs (before the first snapshot, or an old CLI)", () => {
288
286
  const now = Date.now()
289
287
  const session = makeSession({
290
288
  backgroundTasks: oneTask(),
@@ -340,11 +338,10 @@ describe("closeClaudeSession", () => {
340
338
  expect(released).toBe(false)
341
339
  })
342
340
 
343
- test("unregisters workflow for SDK driver", () => {
341
+ test("unregisters the chat workflow watch on close", () => {
344
342
  let unregisteredChat = ""
345
343
  const session = makeSession({ chatId: "chat-1" })
346
344
  const deps = makeDeps({
347
- resolveClaudeDriverPreference: () => "sdk",
348
345
  workflowRegistry: {
349
346
  hasActiveRun: () => false,
350
347
  register: () => {},
@@ -355,21 +352,6 @@ describe("closeClaudeSession", () => {
355
352
  expect(unregisteredChat).toBe("chat-1")
356
353
  })
357
354
 
358
- test("does NOT unregister workflow for PTY driver", () => {
359
- let unregistered = false
360
- const session = makeSession({ chatId: "chat-1" })
361
- const deps = makeDeps({
362
- resolveClaudeDriverPreference: () => "pty",
363
- workflowRegistry: {
364
- hasActiveRun: () => false,
365
- register: () => {},
366
- unregister: () => { unregistered = true },
367
- },
368
- })
369
- closeClaudeSession(deps, "chat-1", session)
370
- expect(unregistered).toBe(false)
371
- })
372
-
373
355
  test("does not error when session is already removed from map", () => {
374
356
  const session = makeSession({ chatId: "chat-1" })
375
357
  const differentSession = makeSession({ chatId: "chat-1" })
@@ -406,21 +388,6 @@ describe("maybeRegisterSdkWorkflowsDir", () => {
406
388
  expect(registered).toBe(false)
407
389
  })
408
390
 
409
- test("no-ops when driver is PTY", () => {
410
- let registered = false
411
- const session = makeSession({ sessionToken: "tok-abc", workflowsDirRegistered: false })
412
- const deps = makeDeps({
413
- resolveClaudeDriverPreference: () => "pty",
414
- workflowRegistry: {
415
- hasActiveRun: () => false,
416
- register: () => { registered = true },
417
- unregister: () => {},
418
- },
419
- })
420
- maybeRegisterSdkWorkflowsDir(deps, session)
421
- expect(registered).toBe(false)
422
- })
423
-
424
391
  test("no-ops when sessionToken is null", () => {
425
392
  let registered = false
426
393
  const session = makeSession({ sessionToken: null, workflowsDirRegistered: false })
@@ -445,7 +412,6 @@ describe("maybeRegisterSdkWorkflowsDir", () => {
445
412
  workflowsDirRegistered: false,
446
413
  })
447
414
  const deps = makeDeps({
448
- resolveClaudeDriverPreference: () => "sdk",
449
415
  homeDir: "/home/user",
450
416
  workflowRegistry: {
451
417
  hasActiveRun: () => false,
@@ -1,8 +1,7 @@
1
1
 
2
- import type { ClaudeDriverPreference } from "../shared/types"
3
2
  import type { ClaudeSessionState, ActiveTurn } from "./claude-session-state"
4
3
  import type { TokenUnavailability } from "./oauth-pool/oauth-token-pool"
5
- import { computeWorkflowsDir } from "./claude-pty/jsonl-path.adapter"
4
+ import { computeWorkflowsDir } from "./claude-projects-path.adapter"
6
5
  import {
7
6
  hasPendingBackgroundTask,
8
7
  backgroundTaskGuardExpired,
@@ -50,8 +49,6 @@ export interface SessionLifecycleDeps {
50
49
 
51
50
  workflowRegistry: LifecycleWorkflowRegistry | null
52
51
 
53
- resolveClaudeDriverPreference(): ClaudeDriverPreference
54
-
55
52
  emitStateChange(chatId: string): void
56
53
 
57
54
  store: LifecycleStore
@@ -93,9 +90,7 @@ export function closeClaudeSession(
93
90
  deps.oauthPool?.release(chatId)
94
91
  }
95
92
  session.session.close()
96
- if (deps.resolveClaudeDriverPreference() !== "pty") {
97
- deps.workflowRegistry?.unregister(chatId)
98
- }
93
+ deps.workflowRegistry?.unregister(chatId)
99
94
  }
100
95
 
101
96
  export function maybeRegisterSdkWorkflowsDir(
@@ -104,7 +99,6 @@ export function maybeRegisterSdkWorkflowsDir(
104
99
  ): void {
105
100
  if (!deps.workflowRegistry) return
106
101
  if (session.workflowsDirRegistered) return
107
- if (deps.resolveClaudeDriverPreference() === "pty") return
108
102
  if (!session.sessionToken) return
109
103
  const dir = computeWorkflowsDir({
110
104
  homeDir: deps.homeDir,
@@ -20,7 +20,6 @@ function makeSession(overrides: Partial<ConstructorParameters<typeof ClaudeSessi
20
20
  closed: Promise.resolve(),
21
21
  setModel: async () => {},
22
22
  setPermissionMode: async () => {},
23
- getSupportedCommands: async () => [],
24
23
  }
25
24
  return new ClaudeSessionState({
26
25
  id: "sess-1",
@@ -149,7 +148,6 @@ function makeDeps(session: ClaudeSessionState, overrides: Partial<RunClaudeSessi
149
148
  handleAuthFailure: async () => false,
150
149
  closeClaudeSession: () => {},
151
150
  maybeStartNextQueuedMessage: async () => {},
152
- resolveClaudeDriverPreference: () => "sdk",
153
151
  ...overrides,
154
152
  }
155
153
  }
@@ -422,7 +420,6 @@ describe("runClaudeSession", () => {
422
420
 
423
421
  function runCompactBoundary(args: {
424
422
  compactionTurn: CompactionTurnKind
425
- driver: "pty" | "sdk"
426
423
  }) {
427
424
  const session = makeSession()
428
425
  session.pendingPromptSeqs = [1]
@@ -443,7 +440,6 @@ describe("runClaudeSession", () => {
443
440
  recordTurnFinished: async (chatId) => { finishedCalls.push(chatId) },
444
441
  setCompactFailureCount: async (_chatId, count) => { breakerCalls.push(count) },
445
442
  },
446
- resolveClaudeDriverPreference: () => args.driver,
447
443
  })
448
444
  const compactBoundaryEntry = {
449
445
  _id: "compact-1",
@@ -457,32 +453,8 @@ describe("runClaudeSession", () => {
457
453
  return { session, active, activeTurns, finishedCalls, breakerCalls, deps }
458
454
  }
459
455
 
460
- test("compact_boundary on a proactive compact (PTY) finalizes and resets the breaker", async () => {
461
- const ctx = runCompactBoundary({ compactionTurn: "proactive", driver: "pty" })
462
-
463
- await runClaudeSession(ctx.deps, ctx.session)
464
-
465
- expect(ctx.finishedCalls).toHaveLength(1)
466
- expect(ctx.active.hasFinalResult).toBe(true)
467
- expect(ctx.activeTurns.size).toBe(0)
468
- expect(ctx.session.pendingPromptSeqs).toEqual([])
469
- expect(ctx.breakerCalls).toEqual([0])
470
- })
471
-
472
- test("compact_boundary on a user-typed compact (PTY) finalizes without touching the breaker", async () => {
473
- const ctx = runCompactBoundary({ compactionTurn: "user", driver: "pty" })
474
-
475
- await runClaudeSession(ctx.deps, ctx.session)
476
-
477
- expect(ctx.finishedCalls).toHaveLength(1)
478
- expect(ctx.active.hasFinalResult).toBe(true)
479
- expect(ctx.activeTurns.size).toBe(0)
480
- expect(ctx.session.pendingPromptSeqs).toEqual([])
481
- expect(ctx.breakerCalls).toEqual([])
482
- })
483
-
484
- test("compact_boundary on a user-typed compact under the SDK driver does NOT finalize", async () => {
485
- const ctx = runCompactBoundary({ compactionTurn: "user", driver: "sdk" })
456
+ test("compact_boundary on a user-typed compact does NOT finalize the turn", async () => {
457
+ const ctx = runCompactBoundary({ compactionTurn: "user" })
486
458
 
487
459
  await runClaudeSession(ctx.deps, ctx.session)
488
460
 
@@ -706,21 +678,21 @@ describe("runClaudeSession", () => {
706
678
  expect(session.backgroundTasksLevelSourced).toBe(true)
707
679
  })
708
680
 
709
- test("a launch tool_result paired with its tool_call does NOT promote the session (PTY invariant)", async () => {
681
+ test("a launch tool_result paired with its tool_call does NOT promote the session (version-skew fallback invariant)", async () => {
710
682
  const session = makeSession()
711
683
  const toolCallEntry = {
712
- _id: "tool-call-pty",
684
+ _id: "tool-call-fallback",
713
685
  createdAt: Date.now(),
714
686
  kind: "tool_call",
715
- tool: { kind: "tool", toolKind: "bash", toolName: "Bash", toolId: "toolu_pty1",
687
+ tool: { kind: "tool", toolKind: "bash", toolName: "Bash", toolId: "toolu_fallback1",
716
688
  input: { command: "watch.sh", runInBackground: true } },
717
689
  } as unknown as TranscriptEntry
718
690
  const bgToolResultEntry = {
719
691
  _id: "tool-res-no-promote",
720
692
  createdAt: Date.now(),
721
693
  kind: "tool_result",
722
- toolId: "toolu_pty1",
723
- content: "Command running in background with ID: ptyonly1",
694
+ toolId: "toolu_fallback1",
695
+ content: "Command running in background with ID: fallbackonly1",
724
696
  } as unknown as TranscriptEntry
725
697
  const deps = makeDeps(session)
726
698
  session.session.stream = fakeStream([
@@ -730,7 +702,7 @@ describe("runClaudeSession", () => {
730
702
 
731
703
  await runClaudeSession(deps, session)
732
704
 
733
- expect(session.backgroundTasks.has("ptyonly1")).toBe(true)
705
+ expect(session.backgroundTasks.has("fallbackonly1")).toBe(true)
734
706
  expect(session.backgroundTasksLevelSourced).toBe(false)
735
707
  expect(session.backgroundTaskDeadlineAt).toBeGreaterThan(Date.now())
736
708
  })
@@ -5,7 +5,6 @@ import { toError } from "../shared/errors"
5
5
  import type { AgentProvider, Subagent, TranscriptEntry } from "../shared/types"
6
6
  import type { LimitDetector, LimitDetection } from "./auto-continue/limit-detector"
7
7
  import type { AuthErrorDetection } from "./auto-continue/auth-error-detector"
8
- import type { ClaudeDriverPreference } from "../shared/types"
9
8
  import {
10
9
  isPromptTooLongMessage,
11
10
  isNoConversationFoundMessage,
@@ -15,7 +14,7 @@ import {
15
14
  import { timestamped } from "./claude-message-normalizer"
16
15
  import { logClaudeSteer } from "./claude-steer-log"
17
16
  import type { ClaudeSessionState, ActiveTurn } from "./claude-session-state"
18
- import { isCliCompactTurn, isProactiveCompactTurn } from "./claude-session-state"
17
+ import { isProactiveCompactTurn } from "./claude-session-state"
19
18
  import type { PendingToolSlots } from "./pending-tool-slot"
20
19
  import type { TurnEndGuard } from "./turn-end-guard"
21
20
 
@@ -74,7 +73,6 @@ export interface RunClaudeSessionDeps {
74
73
  handleAuthFailure(session: ClaudeSessionState, detection: AuthErrorDetection): Promise<boolean>
75
74
  closeClaudeSession(chatId: string, session: ClaudeSessionState): void
76
75
  maybeStartNextQueuedMessage(chatId: string): Promise<boolean | void>
77
- resolveClaudeDriverPreference(): ClaudeDriverPreference
78
76
  turnEndGuard?: TurnEndGuard
79
77
  onBackgroundTaskLaunch?(chatId: string, taskId: string, outputPath: string | null): void
80
78
  onBackgroundTaskSettle?(chatId: string, taskId: string): void
@@ -290,29 +288,6 @@ export async function runClaudeSession(
290
288
  pendingPromptSeqs: [...session.pendingPromptSeqs],
291
289
  })
292
290
 
293
- if (
294
- event.entry.kind === "compact_boundary"
295
- && active !== undefined
296
- && isCliCompactTurn(active)
297
- && !active.cancelRequested
298
- && deps.resolveClaudeDriverPreference() === "pty"
299
- ) {
300
- active.hasFinalResult = true
301
- await deps.store.recordTurnFinished(session.chatId)
302
- if (isProactiveCompactTurn(active)) {
303
- await deps.store.setCompactFailureCount(session.chatId, 0)
304
- }
305
- if (active.claudePromptSeq != null) {
306
- const idx = session.pendingPromptSeqs.indexOf(active.claudePromptSeq)
307
- if (idx >= 0) session.pendingPromptSeqs.splice(idx, 1)
308
- }
309
- deps.activeTurns.delete(session.chatId)
310
- deps.oauthPool?.release(session.chatId)
311
- await deps.maybeStartNextQueuedMessage(session.chatId)
312
- deps.emitStateChange(session.chatId)
313
- continue
314
- }
315
-
316
291
  if (
317
292
  event.entry.kind === "result"
318
293
  && active
@@ -20,7 +20,6 @@ function makeFakeHandle(overrides: Partial<ClaudeSessionHandle> = {}): ClaudeSes
20
20
  sendPrompt: async () => {},
21
21
  setModel: async () => {},
22
22
  setPermissionMode: async () => {},
23
- getSupportedCommands: async () => [],
24
23
  pushChannelPrompt: undefined,
25
24
  ...overrides,
26
25
  }
@@ -103,15 +102,9 @@ function makeDeps(overrides: Partial<SpawnClaudeTurnDeps> = {}): SpawnClaudeTurn
103
102
  mentionedSubagentIdsByChat,
104
103
  oauthPool: null,
105
104
  startClaudeSessionFn: async () => fakeHandle,
106
- startClaudeSessionPTYFn: async () => fakeHandle,
107
105
  subagentOrchestrator: {} as SpawnClaudeTurnDeps["subagentOrchestrator"],
108
106
  toolCallback: null,
109
107
  tunnelGateway: null,
110
- claudePtyRegistry: null,
111
- ptyInstanceRegistry: null,
112
- workflowRegistry: null,
113
- subagentTranscriptRegistry: null,
114
- resolveClaudeDriverPreference: () => "sdk",
115
108
  isLoopArmed: () => null,
116
109
  closeClaudeSession: () => {},
117
110
  enforceClaudeSessionBudget: () => {},
@@ -153,50 +146,16 @@ describe("spawnClaudeTurn", () => {
153
146
  expect(turn.provider).toBe("claude")
154
147
  })
155
148
 
156
- test("uses SDK driver when resolveClaudeDriverPreference returns sdk", async () => {
157
- let sdkCalled = false
158
- let ptyCalled = false
159
- const deps = makeDeps({
160
- resolveClaudeDriverPreference: () => "sdk",
161
- startClaudeSessionFn: async () => { sdkCalled = true; return makeFakeHandle() },
162
- startClaudeSessionPTYFn: async () => { ptyCalled = true; return makeFakeHandle() },
163
- })
164
-
165
- await spawnClaudeTurn(deps, makeArgs({ provider: "claude" }))
166
-
167
- expect(sdkCalled).toBe(true)
168
- expect(ptyCalled).toBe(false)
169
- })
170
-
171
- test("uses PTY driver when resolveClaudeDriverPreference returns pty", async () => {
172
- let sdkCalled = false
173
- let ptyCalled = false
149
+ test("starts an openrouter session through the SDK with the stored API key", async () => {
150
+ let forwardedKey: string | null | undefined
174
151
  const deps = makeDeps({
175
- resolveClaudeDriverPreference: () => "pty",
176
- startClaudeSessionFn: async () => { sdkCalled = true; return makeFakeHandle() },
177
- startClaudeSessionPTYFn: async () => { ptyCalled = true; return makeFakeHandle() },
178
- })
179
-
180
- await spawnClaudeTurn(deps, makeArgs({ provider: "claude" }))
181
-
182
- expect(sdkCalled).toBe(false)
183
- expect(ptyCalled).toBe(true)
184
- })
185
-
186
- test("always uses SDK driver for openrouter provider even when pty is preferred", async () => {
187
- let sdkCalled = false
188
- let ptyCalled = false
189
- const deps = makeDeps({
190
- resolveClaudeDriverPreference: () => "pty",
191
- startClaudeSessionFn: async () => { sdkCalled = true; return makeFakeHandle() },
192
- startClaudeSessionPTYFn: async () => { ptyCalled = true; return makeFakeHandle() },
152
+ startClaudeSessionFn: async (a) => { forwardedKey = a.openrouterApiKey; return makeFakeHandle() },
193
153
  readLlmProvider: async () => makeOpenRouterProvider("or-key"),
194
154
  })
195
155
 
196
156
  await spawnClaudeTurn(deps, makeArgs({ provider: "openrouter" }))
197
157
 
198
- expect(sdkCalled).toBe(true)
199
- expect(ptyCalled).toBe(false)
158
+ expect(forwardedKey).toBe("or-key")
200
159
  })
201
160
 
202
161
  test("fires runClaudeSession in fire-and-forget manner", async () => {
@@ -382,7 +341,6 @@ describe("spawnClaudeTurn", () => {
382
341
  release: () => { released = true },
383
342
  },
384
343
  startClaudeSessionFn: async () => { throw new Error("spawn failed") },
385
- startClaudeSessionPTYFn: async () => { throw new Error("spawn failed") },
386
344
  })
387
345
 
388
346
  await expect(spawnClaudeTurn(deps, makeArgs())).rejects.toThrow("spawn failed")
@@ -461,10 +419,9 @@ describe("cost baseline wiring", () => {
461
419
  })
462
420
 
463
421
  describe("compaction observer wiring", () => {
464
- test("the SDK branch forwards onCompaction so the hooks can be registered", async () => {
422
+ test("forwards onCompaction so the compaction hooks can be registered", async () => {
465
423
  let forwarded: unknown = "unset"
466
424
  const deps = makeDeps({
467
- resolveClaudeDriverPreference: () => "sdk",
468
425
  startClaudeSessionFn: async (a) => {
469
426
  forwarded = a.onCompaction
470
427
  return makeFakeHandle()
@@ -475,20 +432,4 @@ describe("compaction observer wiring", () => {
475
432
 
476
433
  expect(typeof forwarded).toBe("function")
477
434
  })
478
-
479
- test("the PTY branch never receives it, since hooks are an SDK transport feature", async () => {
480
- let sdkCalled = false
481
- const deps = makeDeps({
482
- resolveClaudeDriverPreference: () => "pty",
483
- startClaudeSessionFn: async () => { sdkCalled = true; return makeFakeHandle() },
484
- startClaudeSessionPTYFn: async (a) => {
485
- expect("onCompaction" in a).toBe(false)
486
- return makeFakeHandle()
487
- },
488
- })
489
-
490
- await spawnClaudeTurn(deps, makeArgs())
491
-
492
- expect(sdkCalled).toBe(false)
493
- })
494
435
  })