@qduc/term2 0.12.0 → 0.13.0

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 (475) hide show
  1. package/README.md +6 -1
  2. package/dist/agent.d.ts +3 -0
  3. package/dist/agent.d.ts.map +1 -1
  4. package/dist/agent.js +38 -14
  5. package/dist/agent.js.map +1 -1
  6. package/dist/app.d.ts.map +1 -1
  7. package/dist/app.js +90 -17
  8. package/dist/app.js.map +1 -1
  9. package/dist/cli.js +34 -23
  10. package/dist/cli.js.map +1 -1
  11. package/dist/commands/auto-approve-command.d.ts.map +1 -1
  12. package/dist/commands/auto-approve-command.js +12 -4
  13. package/dist/commands/auto-approve-command.js.map +1 -1
  14. package/dist/commands/copy-command.d.ts +3 -1
  15. package/dist/commands/copy-command.d.ts.map +1 -1
  16. package/dist/commands/copy-command.js +36 -9
  17. package/dist/commands/copy-command.js.map +1 -1
  18. package/dist/commands/sandbox-command.d.ts.map +1 -1
  19. package/dist/commands/sandbox-command.js +6 -1
  20. package/dist/commands/sandbox-command.js.map +1 -1
  21. package/dist/components/InputBox.d.ts +1 -2
  22. package/dist/components/InputBox.d.ts.map +1 -1
  23. package/dist/components/InputBox.js +5 -1
  24. package/dist/components/InputBox.js.map +1 -1
  25. package/dist/components/input/ApplicationInputSurface.d.ts +7 -2
  26. package/dist/components/input/ApplicationInputSurface.d.ts.map +1 -1
  27. package/dist/components/input/ApplicationInputSurface.js +5 -1
  28. package/dist/components/input/ApplicationInputSurface.js.map +1 -1
  29. package/dist/components/input/CopyMenuSession.d.ts +16 -0
  30. package/dist/components/input/CopyMenuSession.d.ts.map +1 -0
  31. package/dist/components/input/CopyMenuSession.js +49 -0
  32. package/dist/components/input/CopyMenuSession.js.map +1 -0
  33. package/dist/components/input/FirstRunSetupPrompt.d.ts +9 -0
  34. package/dist/components/input/FirstRunSetupPrompt.d.ts.map +1 -0
  35. package/dist/components/input/FirstRunSetupPrompt.js +20 -0
  36. package/dist/components/input/FirstRunSetupPrompt.js.map +1 -0
  37. package/dist/components/input/MenuSurface.d.ts.map +1 -1
  38. package/dist/components/input/MenuSurface.js +2 -1
  39. package/dist/components/input/MenuSurface.js.map +1 -1
  40. package/dist/components/input/ModelMenuSession.d.ts.map +1 -1
  41. package/dist/components/input/ModelMenuSession.js +11 -1
  42. package/dist/components/input/ModelMenuSession.js.map +1 -1
  43. package/dist/components/input/ProviderMenuSession.d.ts.map +1 -1
  44. package/dist/components/input/ProviderMenuSession.js +8 -2
  45. package/dist/components/input/ProviderMenuSession.js.map +1 -1
  46. package/dist/components/input/SkillsMenuSession.d.ts +3 -0
  47. package/dist/components/input/SkillsMenuSession.d.ts.map +1 -1
  48. package/dist/components/input/SkillsMenuSession.js +6 -12
  49. package/dist/components/input/SkillsMenuSession.js.map +1 -1
  50. package/dist/components/input/SlashMenuSession.d.ts +11 -3
  51. package/dist/components/input/SlashMenuSession.d.ts.map +1 -1
  52. package/dist/components/input/SlashMenuSession.js +54 -42
  53. package/dist/components/input/SlashMenuSession.js.map +1 -1
  54. package/dist/components/input/menu-registry.d.ts.map +1 -1
  55. package/dist/components/input/menu-registry.js +2 -0
  56. package/dist/components/input/menu-registry.js.map +1 -1
  57. package/dist/components/input/menu-types.d.ts +7 -0
  58. package/dist/components/input/menu-types.d.ts.map +1 -1
  59. package/dist/components/layout/BackgroundTaskManager.d.ts.map +1 -1
  60. package/dist/components/layout/BackgroundTaskManager.js +28 -10
  61. package/dist/components/layout/BackgroundTaskManager.js.map +1 -1
  62. package/dist/components/layout/BackgroundTasksPanel.d.ts +2 -1
  63. package/dist/components/layout/BackgroundTasksPanel.d.ts.map +1 -1
  64. package/dist/components/layout/BackgroundTasksPanel.js +35 -10
  65. package/dist/components/layout/BackgroundTasksPanel.js.map +1 -1
  66. package/dist/components/layout/BottomArea.d.ts +16 -2
  67. package/dist/components/layout/BottomArea.d.ts.map +1 -1
  68. package/dist/components/layout/BottomArea.js +7 -4
  69. package/dist/components/layout/BottomArea.js.map +1 -1
  70. package/dist/components/layout/StatusBar.d.ts.map +1 -1
  71. package/dist/components/layout/StatusBar.js +66 -51
  72. package/dist/components/layout/StatusBar.js.map +1 -1
  73. package/dist/components/menu/CopyMenu.d.ts +9 -0
  74. package/dist/components/menu/CopyMenu.d.ts.map +1 -0
  75. package/dist/components/menu/CopyMenu.js +7 -0
  76. package/dist/components/menu/CopyMenu.js.map +1 -0
  77. package/dist/components/menu/ModelSelectionMenu.d.ts +1 -0
  78. package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
  79. package/dist/components/menu/ModelSelectionMenu.js +23 -6
  80. package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
  81. package/dist/components/menu/ProviderSelectionMenu.d.ts +1 -0
  82. package/dist/components/menu/ProviderSelectionMenu.d.ts.map +1 -1
  83. package/dist/components/menu/ProviderSelectionMenu.js +12 -4
  84. package/dist/components/menu/ProviderSelectionMenu.js.map +1 -1
  85. package/dist/components/message/CommandMessage.js +4 -0
  86. package/dist/components/message/CommandMessage.js.map +1 -1
  87. package/dist/components/prompt/ApprovalPrompt.d.ts.map +1 -1
  88. package/dist/components/prompt/ApprovalPrompt.js +0 -25
  89. package/dist/components/prompt/ApprovalPrompt.js.map +1 -1
  90. package/dist/context/InputContext.d.ts +1 -1
  91. package/dist/context/InputContext.d.ts.map +1 -1
  92. package/dist/context/InputContext.js +2 -0
  93. package/dist/context/InputContext.js.map +1 -1
  94. package/dist/contracts/application-stream.d.ts +6 -0
  95. package/dist/contracts/application-stream.d.ts.map +1 -1
  96. package/dist/hooks/conversation-ui-reducer.d.ts +6 -0
  97. package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
  98. package/dist/hooks/conversation-ui-reducer.js +3 -0
  99. package/dist/hooks/conversation-ui-reducer.js.map +1 -1
  100. package/dist/hooks/settings-completion-config.d.ts.map +1 -1
  101. package/dist/hooks/settings-completion-config.js +2 -0
  102. package/dist/hooks/settings-completion-config.js.map +1 -1
  103. package/dist/hooks/use-app-commands.d.ts +3 -1
  104. package/dist/hooks/use-app-commands.d.ts.map +1 -1
  105. package/dist/hooks/use-app-commands.js +3 -2
  106. package/dist/hooks/use-app-commands.js.map +1 -1
  107. package/dist/hooks/use-app-keyboard-shortcuts.d.ts +7 -1
  108. package/dist/hooks/use-app-keyboard-shortcuts.d.ts.map +1 -1
  109. package/dist/hooks/use-app-keyboard-shortcuts.js +77 -7
  110. package/dist/hooks/use-app-keyboard-shortcuts.js.map +1 -1
  111. package/dist/hooks/use-conversation.d.ts +6 -2
  112. package/dist/hooks/use-conversation.d.ts.map +1 -1
  113. package/dist/hooks/use-conversation.js +12 -2
  114. package/dist/hooks/use-conversation.js.map +1 -1
  115. package/dist/hooks/use-debounced-value.d.ts +13 -0
  116. package/dist/hooks/use-debounced-value.d.ts.map +1 -0
  117. package/dist/hooks/use-debounced-value.js +27 -0
  118. package/dist/hooks/use-debounced-value.js.map +1 -0
  119. package/dist/hooks/use-first-run-setup.d.ts +24 -0
  120. package/dist/hooks/use-first-run-setup.d.ts.map +1 -0
  121. package/dist/hooks/use-first-run-setup.js +114 -0
  122. package/dist/hooks/use-first-run-setup.js.map +1 -0
  123. package/dist/hooks/use-model-selection.d.ts +1 -0
  124. package/dist/hooks/use-model-selection.d.ts.map +1 -1
  125. package/dist/hooks/use-model-selection.js +44 -1
  126. package/dist/hooks/use-model-selection.js.map +1 -1
  127. package/dist/hooks/use-provider-selection.d.ts +5 -1
  128. package/dist/hooks/use-provider-selection.d.ts.map +1 -1
  129. package/dist/hooks/use-provider-selection.js +37 -12
  130. package/dist/hooks/use-provider-selection.js.map +1 -1
  131. package/dist/hooks/use-slash-commands.d.ts +0 -1
  132. package/dist/hooks/use-slash-commands.d.ts.map +1 -1
  133. package/dist/hooks/use-slash-commands.js +1 -9
  134. package/dist/hooks/use-slash-commands.js.map +1 -1
  135. package/dist/lib/agent-chat-service.d.ts.map +1 -1
  136. package/dist/lib/agent-chat-service.js +9 -5
  137. package/dist/lib/agent-chat-service.js.map +1 -1
  138. package/dist/lib/agent-client.d.ts +7 -2
  139. package/dist/lib/agent-client.d.ts.map +1 -1
  140. package/dist/lib/agent-client.js +32 -3
  141. package/dist/lib/agent-client.js.map +1 -1
  142. package/dist/lib/agent-configuration.d.ts +3 -0
  143. package/dist/lib/agent-configuration.d.ts.map +1 -1
  144. package/dist/lib/agent-configuration.js +3 -0
  145. package/dist/lib/agent-configuration.js.map +1 -1
  146. package/dist/lib/agent-factory.d.ts +3 -0
  147. package/dist/lib/agent-factory.d.ts.map +1 -1
  148. package/dist/lib/agent-factory.js +6 -5
  149. package/dist/lib/agent-factory.js.map +1 -1
  150. package/dist/lib/input-owner.d.ts +3 -0
  151. package/dist/lib/input-owner.d.ts.map +1 -1
  152. package/dist/lib/input-owner.js +5 -0
  153. package/dist/lib/input-owner.js.map +1 -1
  154. package/dist/lib/subagent-bridge.d.ts +2 -0
  155. package/dist/lib/subagent-bridge.d.ts.map +1 -1
  156. package/dist/lib/subagent-bridge.js +4 -1
  157. package/dist/lib/subagent-bridge.js.map +1 -1
  158. package/dist/prompts/background-shell.d.ts +3 -0
  159. package/dist/prompts/background-shell.d.ts.map +1 -0
  160. package/dist/prompts/background-shell.js +11 -0
  161. package/dist/prompts/background-shell.js.map +1 -0
  162. package/dist/prompts/background-shell.ts +10 -0
  163. package/dist/prompts/orchestrator-prompt.test.ts +7 -0
  164. package/dist/prompts/orchestrator.md +1 -1
  165. package/dist/prompts/prompt-constructor.d.ts +1 -0
  166. package/dist/prompts/prompt-constructor.d.ts.map +1 -1
  167. package/dist/prompts/prompt-constructor.js +5 -1
  168. package/dist/prompts/prompt-constructor.js.map +1 -1
  169. package/dist/prompts/prompt-constructor.test.ts +16 -1
  170. package/dist/prompts/prompt-constructor.ts +7 -0
  171. package/dist/prompts/subagent-delegation.js +1 -1
  172. package/dist/prompts/subagent-delegation.ts +1 -1
  173. package/dist/prompts/subagents/worker.md +1 -1
  174. package/dist/providers/codex-auth.d.ts +6 -0
  175. package/dist/providers/codex-auth.d.ts.map +1 -0
  176. package/dist/providers/codex-auth.js +35 -0
  177. package/dist/providers/codex-auth.js.map +1 -0
  178. package/dist/providers/codex-responses-model.d.ts.map +1 -1
  179. package/dist/providers/codex-responses-model.js +17 -8
  180. package/dist/providers/codex-responses-model.js.map +1 -1
  181. package/dist/providers/codex.provider.d.ts +2 -1
  182. package/dist/providers/codex.provider.d.ts.map +1 -1
  183. package/dist/providers/codex.provider.js +3 -28
  184. package/dist/providers/codex.provider.js.map +1 -1
  185. package/dist/providers/model-catalog/catalog.d.ts +35 -2
  186. package/dist/providers/model-catalog/catalog.d.ts.map +1 -1
  187. package/dist/providers/model-catalog/catalog.js +93 -29
  188. package/dist/providers/model-catalog/catalog.js.map +1 -1
  189. package/dist/providers/openai-chat-completions-model.d.ts +2 -1
  190. package/dist/providers/openai-chat-completions-model.d.ts.map +1 -1
  191. package/dist/providers/openai-chat-completions-model.js +223 -53
  192. package/dist/providers/openai-chat-completions-model.js.map +1 -1
  193. package/dist/providers/openai-compatible-lazy.d.ts.map +1 -1
  194. package/dist/providers/openai-compatible-lazy.js +2 -1
  195. package/dist/providers/openai-compatible-lazy.js.map +1 -1
  196. package/dist/providers/openai-compatible-middleware.d.ts.map +1 -1
  197. package/dist/providers/openai-compatible-middleware.js +1 -13
  198. package/dist/providers/openai-compatible-middleware.js.map +1 -1
  199. package/dist/providers/openai-compatible-response-normalizer.d.ts +5 -4
  200. package/dist/providers/openai-compatible-response-normalizer.d.ts.map +1 -1
  201. package/dist/providers/openai-compatible-response-normalizer.js +6 -17
  202. package/dist/providers/openai-compatible-response-normalizer.js.map +1 -1
  203. package/dist/providers/openai-compatible.provider.d.ts +1 -0
  204. package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
  205. package/dist/providers/openai-compatible.provider.js +13 -4
  206. package/dist/providers/openai-compatible.provider.js.map +1 -1
  207. package/dist/providers/provider-service.d.ts +1 -0
  208. package/dist/providers/provider-service.d.ts.map +1 -1
  209. package/dist/providers/provider-service.js +4 -0
  210. package/dist/providers/provider-service.js.map +1 -1
  211. package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
  212. package/dist/services/agent-runtime/application-run-loop.js +30 -8
  213. package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
  214. package/dist/services/agent-runtime/scope-resolver.d.ts.map +1 -1
  215. package/dist/services/agent-runtime/scope-resolver.js +2 -1
  216. package/dist/services/agent-runtime/scope-resolver.js.map +1 -1
  217. package/dist/services/agent-stream.d.ts.map +1 -1
  218. package/dist/services/agent-stream.js +2 -1
  219. package/dist/services/agent-stream.js.map +1 -1
  220. package/dist/services/approval/approval-decision-executor.d.ts.map +1 -1
  221. package/dist/services/approval/approval-decision-executor.js +5 -2
  222. package/dist/services/approval/approval-decision-executor.js.map +1 -1
  223. package/dist/services/approval/approval-decision-policy.d.ts.map +1 -1
  224. package/dist/services/approval/approval-decision-policy.js +0 -2
  225. package/dist/services/approval/approval-decision-policy.js.map +1 -1
  226. package/dist/services/approval/session-read-access.d.ts.map +1 -1
  227. package/dist/services/approval/session-read-access.js +2 -1
  228. package/dist/services/approval/session-read-access.js.map +1 -1
  229. package/dist/services/approval/shell-auto-approval-resolver.d.ts +1 -1
  230. package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
  231. package/dist/services/approval/shell-auto-approval-resolver.js +9 -1
  232. package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
  233. package/dist/services/approval/tool-approval-batch-coordinator.d.ts.map +1 -1
  234. package/dist/services/approval/tool-approval-batch-coordinator.js +2 -1
  235. package/dist/services/approval/tool-approval-batch-coordinator.js.map +1 -1
  236. package/dist/services/conversation/conversation-admission-workflow.d.ts.map +1 -1
  237. package/dist/services/conversation/conversation-admission-workflow.js +20 -18
  238. package/dist/services/conversation/conversation-admission-workflow.js.map +1 -1
  239. package/dist/services/conversation/conversation-decoder.d.ts.map +1 -1
  240. package/dist/services/conversation/conversation-decoder.js +6 -0
  241. package/dist/services/conversation/conversation-decoder.js.map +1 -1
  242. package/dist/services/conversation/conversation-events.d.ts +31 -1
  243. package/dist/services/conversation/conversation-events.d.ts.map +1 -1
  244. package/dist/services/conversation/conversation-orchestrator.d.ts +2 -0
  245. package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
  246. package/dist/services/conversation/conversation-orchestrator.js +113 -1
  247. package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
  248. package/dist/services/conversation/conversation-orchestrator.types.d.ts +3 -1
  249. package/dist/services/conversation/conversation-orchestrator.types.d.ts.map +1 -1
  250. package/dist/services/conversation/conversation-replay.d.ts.map +1 -1
  251. package/dist/services/conversation/conversation-replay.js +45 -0
  252. package/dist/services/conversation/conversation-replay.js.map +1 -1
  253. package/dist/services/conversation/conversation-result-builder.d.ts.map +1 -1
  254. package/dist/services/conversation/conversation-result-builder.js +14 -2
  255. package/dist/services/conversation/conversation-result-builder.js.map +1 -1
  256. package/dist/services/conversation/conversation-store.d.ts +9 -0
  257. package/dist/services/conversation/conversation-store.d.ts.map +1 -1
  258. package/dist/services/conversation/conversation-store.js +15 -3
  259. package/dist/services/conversation/conversation-store.js.map +1 -1
  260. package/dist/services/cost/model-cost.d.ts +13 -2
  261. package/dist/services/cost/model-cost.d.ts.map +1 -1
  262. package/dist/services/cost/model-cost.js +1 -0
  263. package/dist/services/cost/model-cost.js.map +1 -1
  264. package/dist/services/cost/pricing.d.ts.map +1 -1
  265. package/dist/services/cost/pricing.js +26 -20
  266. package/dist/services/cost/pricing.js.map +1 -1
  267. package/dist/services/execution-context.d.ts +31 -0
  268. package/dist/services/execution-context.d.ts.map +1 -1
  269. package/dist/services/execution-context.js +59 -0
  270. package/dist/services/execution-context.js.map +1 -1
  271. package/dist/services/file-service.d.ts.map +1 -1
  272. package/dist/services/file-service.js +12 -3
  273. package/dist/services/file-service.js.map +1 -1
  274. package/dist/services/large-uncached-input-guard.d.ts +26 -1
  275. package/dist/services/large-uncached-input-guard.d.ts.map +1 -1
  276. package/dist/services/large-uncached-input-guard.js +73 -38
  277. package/dist/services/large-uncached-input-guard.js.map +1 -1
  278. package/dist/services/logging/conversation-log-events.d.ts +14 -1
  279. package/dist/services/logging/conversation-log-events.d.ts.map +1 -1
  280. package/dist/services/logging/conversation-log-events.js.map +1 -1
  281. package/dist/services/logging/conversation-logger.d.ts.map +1 -1
  282. package/dist/services/logging/conversation-logger.js +11 -0
  283. package/dist/services/logging/conversation-logger.js.map +1 -1
  284. package/dist/services/logging/logging-contract.d.ts.map +1 -1
  285. package/dist/services/logging/logging-contract.js +4 -0
  286. package/dist/services/logging/logging-contract.js.map +1 -1
  287. package/dist/services/model-service.d.ts +7 -0
  288. package/dist/services/model-service.d.ts.map +1 -1
  289. package/dist/services/model-service.js +21 -0
  290. package/dist/services/model-service.js.map +1 -1
  291. package/dist/services/models/model-catalog-session.d.ts +2 -0
  292. package/dist/services/models/model-catalog-session.d.ts.map +1 -1
  293. package/dist/services/models/model-catalog-session.js +9 -2
  294. package/dist/services/models/model-catalog-session.js.map +1 -1
  295. package/dist/services/provider-continuity.d.ts +15 -0
  296. package/dist/services/provider-continuity.d.ts.map +1 -1
  297. package/dist/services/provider-continuity.js +33 -0
  298. package/dist/services/provider-continuity.js.map +1 -1
  299. package/dist/services/retry/recovery-executor.d.ts.map +1 -1
  300. package/dist/services/retry/recovery-executor.js +8 -0
  301. package/dist/services/retry/recovery-executor.js.map +1 -1
  302. package/dist/services/retry/retry-classifier.d.ts.map +1 -1
  303. package/dist/services/retry/retry-classifier.js +2 -1
  304. package/dist/services/retry/retry-classifier.js.map +1 -1
  305. package/dist/services/retry/retry-error-classification.d.ts +19 -0
  306. package/dist/services/retry/retry-error-classification.d.ts.map +1 -1
  307. package/dist/services/retry/retry-error-classification.js +54 -0
  308. package/dist/services/retry/retry-error-classification.js.map +1 -1
  309. package/dist/services/session/background-task-control.d.ts +7 -2
  310. package/dist/services/session/background-task-control.d.ts.map +1 -1
  311. package/dist/services/session/background-task-control.js +43 -9
  312. package/dist/services/session/background-task-control.js.map +1 -1
  313. package/dist/services/session/background-task-liveness.d.ts +24 -0
  314. package/dist/services/session/background-task-liveness.d.ts.map +1 -0
  315. package/dist/services/session/background-task-liveness.js +23 -0
  316. package/dist/services/session/background-task-liveness.js.map +1 -0
  317. package/dist/services/session/session-access-state.d.ts.map +1 -1
  318. package/dist/services/session/session-access-state.js +5 -4
  319. package/dist/services/session/session-access-state.js.map +1 -1
  320. package/dist/services/session/session-client-factory.d.ts +11 -1
  321. package/dist/services/session/session-client-factory.d.ts.map +1 -1
  322. package/dist/services/session/session-client-factory.js +28 -1
  323. package/dist/services/session/session-client-factory.js.map +1 -1
  324. package/dist/services/session/session-composition.d.ts.map +1 -1
  325. package/dist/services/session/session-composition.js +1 -0
  326. package/dist/services/session/session-composition.js.map +1 -1
  327. package/dist/services/session/session-input-planner.d.ts +16 -0
  328. package/dist/services/session/session-input-planner.d.ts.map +1 -1
  329. package/dist/services/session/session-input-planner.js +117 -10
  330. package/dist/services/session/session-input-planner.js.map +1 -1
  331. package/dist/services/session/session-stream-processor.d.ts +1 -0
  332. package/dist/services/session/session-stream-processor.d.ts.map +1 -1
  333. package/dist/services/session/session-stream-processor.js +13 -0
  334. package/dist/services/session/session-stream-processor.js.map +1 -1
  335. package/dist/services/session/session-tool-tracker.d.ts +6 -0
  336. package/dist/services/session/session-tool-tracker.d.ts.map +1 -1
  337. package/dist/services/session/session-tool-tracker.js +9 -0
  338. package/dist/services/session/session-tool-tracker.js.map +1 -1
  339. package/dist/services/session/terminal-result-collector.d.ts.map +1 -1
  340. package/dist/services/session/terminal-result-collector.js +12 -0
  341. package/dist/services/session/terminal-result-collector.js.map +1 -1
  342. package/dist/services/session/turn-workflow.d.ts.map +1 -1
  343. package/dist/services/session/turn-workflow.js +4 -0
  344. package/dist/services/session/turn-workflow.js.map +1 -1
  345. package/dist/services/settings/settings-path.d.ts +6 -0
  346. package/dist/services/settings/settings-path.d.ts.map +1 -0
  347. package/dist/services/settings/settings-path.js +15 -0
  348. package/dist/services/settings/settings-path.js.map +1 -0
  349. package/dist/services/settings/settings-schema.d.ts +7 -1
  350. package/dist/services/settings/settings-schema.d.ts.map +1 -1
  351. package/dist/services/settings/settings-schema.js +13 -1
  352. package/dist/services/settings/settings-schema.js.map +1 -1
  353. package/dist/services/settings/settings-service.d.ts +8 -0
  354. package/dist/services/settings/settings-service.d.ts.map +1 -1
  355. package/dist/services/settings/settings-service.js +82 -4
  356. package/dist/services/settings/settings-service.js.map +1 -1
  357. package/dist/services/settings/settings-sources.d.ts.map +1 -1
  358. package/dist/services/settings/settings-sources.js +1 -0
  359. package/dist/services/settings/settings-sources.js.map +1 -1
  360. package/dist/services/shell/background-shell-output-store.d.ts +90 -0
  361. package/dist/services/shell/background-shell-output-store.d.ts.map +1 -0
  362. package/dist/services/shell/background-shell-output-store.js +207 -0
  363. package/dist/services/shell/background-shell-output-store.js.map +1 -0
  364. package/dist/services/shell/background-shell-registry.d.ts +18 -0
  365. package/dist/services/shell/background-shell-registry.d.ts.map +1 -1
  366. package/dist/services/shell/background-shell-registry.js +17 -2
  367. package/dist/services/shell/background-shell-registry.js.map +1 -1
  368. package/dist/services/shell/background-shell-watches.d.ts +141 -0
  369. package/dist/services/shell/background-shell-watches.d.ts.map +1 -0
  370. package/dist/services/shell/background-shell-watches.js +245 -0
  371. package/dist/services/shell/background-shell-watches.js.map +1 -0
  372. package/dist/services/stream-event-processor.d.ts.map +1 -1
  373. package/dist/services/stream-event-processor.js +4 -0
  374. package/dist/services/stream-event-processor.js.map +1 -1
  375. package/dist/services/subagents/execution-runner.d.ts.map +1 -1
  376. package/dist/services/subagents/execution-runner.js +47 -3
  377. package/dist/services/subagents/execution-runner.js.map +1 -1
  378. package/dist/services/subagents/mentor-runner.d.ts.map +1 -1
  379. package/dist/services/subagents/mentor-runner.js +9 -2
  380. package/dist/services/subagents/mentor-runner.js.map +1 -1
  381. package/dist/services/subagents/nested-runner.d.ts.map +1 -1
  382. package/dist/services/subagents/nested-runner.js +54 -6
  383. package/dist/services/subagents/nested-runner.js.map +1 -1
  384. package/dist/services/subagents/subagent-async-registry.d.ts.map +1 -1
  385. package/dist/services/subagents/subagent-async-registry.js +39 -5
  386. package/dist/services/subagents/subagent-async-registry.js.map +1 -1
  387. package/dist/services/subagents/subagent-notification-store.d.ts +20 -1
  388. package/dist/services/subagents/subagent-notification-store.d.ts.map +1 -1
  389. package/dist/services/subagents/subagent-notification-store.js +22 -0
  390. package/dist/services/subagents/subagent-notification-store.js.map +1 -1
  391. package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js +6 -5
  392. package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js.map +1 -1
  393. package/dist/services/subagents/tool-policy.d.ts +3 -1
  394. package/dist/services/subagents/tool-policy.d.ts.map +1 -1
  395. package/dist/services/subagents/tool-policy.js +16 -12
  396. package/dist/services/subagents/tool-policy.js.map +1 -1
  397. package/dist/services/subagents/types.d.ts +15 -0
  398. package/dist/services/subagents/types.d.ts.map +1 -1
  399. package/dist/services/subagents/utils.d.ts.map +1 -1
  400. package/dist/services/subagents/utils.js +3 -0
  401. package/dist/services/subagents/utils.js.map +1 -1
  402. package/dist/services/subagents/worker-worktree.d.ts +25 -0
  403. package/dist/services/subagents/worker-worktree.d.ts.map +1 -0
  404. package/dist/services/subagents/worker-worktree.js +74 -0
  405. package/dist/services/subagents/worker-worktree.js.map +1 -0
  406. package/dist/services/workspace/active-workspace-root.d.ts +5 -0
  407. package/dist/services/workspace/active-workspace-root.d.ts.map +1 -0
  408. package/dist/services/workspace/active-workspace-root.js +24 -0
  409. package/dist/services/workspace/active-workspace-root.js.map +1 -0
  410. package/dist/services/workspace/parse-worktree-list.d.ts +24 -0
  411. package/dist/services/workspace/parse-worktree-list.d.ts.map +1 -0
  412. package/dist/services/workspace/parse-worktree-list.js +59 -0
  413. package/dist/services/workspace/parse-worktree-list.js.map +1 -0
  414. package/dist/services/workspace/worktree-inventory.d.ts +10 -0
  415. package/dist/services/workspace/worktree-inventory.d.ts.map +1 -0
  416. package/dist/services/workspace/worktree-inventory.js +28 -0
  417. package/dist/services/workspace/worktree-inventory.js.map +1 -0
  418. package/dist/services/workspace/worktree-transition.d.ts +85 -0
  419. package/dist/services/workspace/worktree-transition.d.ts.map +1 -0
  420. package/dist/services/workspace/worktree-transition.js +70 -0
  421. package/dist/services/workspace/worktree-transition.js.map +1 -0
  422. package/dist/tools/agent/run-subagent-async.d.ts +1 -1
  423. package/dist/tools/agent/run-subagent-async.d.ts.map +1 -1
  424. package/dist/tools/agent/run-subagent-async.js +19 -4
  425. package/dist/tools/agent/run-subagent-async.js.map +1 -1
  426. package/dist/tools/agent/run-subagent.d.ts +3 -1
  427. package/dist/tools/agent/run-subagent.d.ts.map +1 -1
  428. package/dist/tools/agent/run-subagent.js +19 -1
  429. package/dist/tools/agent/run-subagent.js.map +1 -1
  430. package/dist/tools/system/shell.d.ts +42 -1
  431. package/dist/tools/system/shell.d.ts.map +1 -1
  432. package/dist/tools/system/shell.js +284 -10
  433. package/dist/tools/system/shell.js.map +1 -1
  434. package/dist/tools/system/worktree.d.ts +22 -0
  435. package/dist/tools/system/worktree.d.ts.map +1 -0
  436. package/dist/tools/system/worktree.js +138 -0
  437. package/dist/tools/system/worktree.js.map +1 -0
  438. package/dist/tools/utils.d.ts.map +1 -1
  439. package/dist/tools/utils.js +3 -2
  440. package/dist/tools/utils.js.map +1 -1
  441. package/dist/utils/ai/provider-credentials.d.ts +31 -2
  442. package/dist/utils/ai/provider-credentials.d.ts.map +1 -1
  443. package/dist/utils/ai/provider-credentials.js +119 -11
  444. package/dist/utils/ai/provider-credentials.js.map +1 -1
  445. package/dist/utils/conversation/message-utils.d.ts +8 -2
  446. package/dist/utils/conversation/message-utils.d.ts.map +1 -1
  447. package/dist/utils/conversation/message-utils.js +38 -21
  448. package/dist/utils/conversation/message-utils.js.map +1 -1
  449. package/dist/utils/copy-selections.d.ts +8 -0
  450. package/dist/utils/copy-selections.d.ts.map +1 -0
  451. package/dist/utils/copy-selections.js +42 -0
  452. package/dist/utils/copy-selections.js.map +1 -0
  453. package/dist/utils/settings-command.d.ts.map +1 -1
  454. package/dist/utils/settings-command.js +5 -0
  455. package/dist/utils/settings-command.js.map +1 -1
  456. package/dist/utils/shell/command-safety/path-analysis.d.ts.map +1 -1
  457. package/dist/utils/shell/command-safety/path-analysis.js +5 -1
  458. package/dist/utils/shell/command-safety/path-analysis.js.map +1 -1
  459. package/dist/utils/shell/execute-shell.d.ts +25 -0
  460. package/dist/utils/shell/execute-shell.d.ts.map +1 -1
  461. package/dist/utils/shell/execute-shell.js +22 -5
  462. package/dist/utils/shell/execute-shell.js.map +1 -1
  463. package/dist/utils/shell/sandbox/sandbox-env.d.ts.map +1 -1
  464. package/dist/utils/shell/sandbox/sandbox-env.js +2 -1
  465. package/dist/utils/shell/sandbox/sandbox-env.js.map +1 -1
  466. package/dist/utils/shell/sandbox/sandbox-network-store.d.ts.map +1 -1
  467. package/dist/utils/shell/sandbox/sandbox-network-store.js +3 -2
  468. package/dist/utils/shell/sandbox/sandbox-network-store.js.map +1 -1
  469. package/dist/utils/shell/sandbox/sandbox-policy.d.ts.map +1 -1
  470. package/dist/utils/shell/sandbox/sandbox-policy.js +2 -1
  471. package/dist/utils/shell/sandbox/sandbox-policy.js.map +1 -1
  472. package/dist/utils/value-suggestions.d.ts.map +1 -1
  473. package/dist/utils/value-suggestions.js +6 -0
  474. package/dist/utils/value-suggestions.js.map +1 -1
  475. package/package.json +1 -1
@@ -0,0 +1,138 @@
1
+ import { z } from 'zod';
2
+ import path from 'path';
3
+ import { listGitWorktrees } from '../../services/workspace/worktree-inventory.js';
4
+ import { enterableWorktrees, resolveEnterWorktree, resolveExitWorktree, } from '../../services/workspace/worktree-transition.js';
5
+ import { getCallIdFromItem, getOutputText, normalizeToolArguments, createBaseMessage } from '../format-helpers.js';
6
+ const ENTER_WORKTREE_DESCRIPTION = "Switch this session into one of the repository's existing git worktrees. Every subsequent shell command, file read, and file edit resolves against that worktree instead of the main checkout, and the shell sandbox only permits writes there. " +
7
+ 'Use this immediately after creating a worktree for a task, before making any edits — creating a worktree with `git worktree add` does NOT move you into it, and edits made without this tool land in the main checkout. ' +
8
+ 'Identify the worktree by its directory name or its branch name; call with an unknown name to see the available list. ' +
9
+ 'Use exit_worktree to return to the main checkout. Approvals granted in one worktree do not carry over to another.';
10
+ const EXIT_WORKTREE_DESCRIPTION = 'Return this session to the main checkout it started in, undoing enter_worktree. Subsequent commands, reads, and edits resolve against the main checkout again. ' +
11
+ 'Use this when work in the worktree is committed and you need to merge it back, or when the task that owned the worktree is finished.';
12
+ const enterWorktreeSchema = z.object({
13
+ name: z
14
+ .string()
15
+ .describe('Directory name or branch name of an existing worktree. Call with an unknown name to list the options.'),
16
+ });
17
+ const exitWorktreeSchema = z.object({});
18
+ function describeWorktree(worktree) {
19
+ const name = path.basename(worktree.path);
20
+ const label = worktree.branch ? `${name} (branch ${worktree.branch})` : `${name} (detached)`;
21
+ return ` - ${label}\n ${worktree.path}`;
22
+ }
23
+ function describeJobs(jobs) {
24
+ return jobs.map((job) => ` - ${job.id}: ${job.command}`).join('\n');
25
+ }
26
+ function busyMessage(action, jobs) {
27
+ return (`Refused to ${action}: ${jobs.length} background shell job(s) are still running under the current root.\n` +
28
+ `${describeJobs(jobs)}\n\n` +
29
+ 'These jobs captured their working directory when they launched, so switching now would leave them writing to the old root. ' +
30
+ 'Wait for them to finish or cancel them, then retry.');
31
+ }
32
+ export function createWorktreeToolDefinitions(dependencies) {
33
+ const { executionContext, listWorktrees = listGitWorktrees, getRunningJobs } = dependencies;
34
+ const enter = {
35
+ name: 'enter_worktree',
36
+ description: ENTER_WORKTREE_DESCRIPTION,
37
+ parameters: enterWorktreeSchema,
38
+ needsApproval: () => false,
39
+ execute: async (params) => {
40
+ const homeRoot = executionContext.getHomeWorkspace();
41
+ let worktrees;
42
+ try {
43
+ worktrees = await listWorktrees(homeRoot);
44
+ }
45
+ catch (error) {
46
+ return `Error: could not list worktrees (${error?.message ?? error}). Is ${homeRoot} inside a git repository?`;
47
+ }
48
+ const outcome = resolveEnterWorktree({
49
+ name: params.name,
50
+ homeRoot,
51
+ worktrees,
52
+ activeWorkspace: executionContext.getActiveWorkspace(),
53
+ runningJobs: getRunningJobs(),
54
+ });
55
+ switch (outcome.kind) {
56
+ case 'entered':
57
+ executionContext.enterWorkspace(outcome.worktree.path);
58
+ return (`Entered worktree ${path.basename(outcome.worktree.path)}${outcome.worktree.branch ? ` (branch ${outcome.worktree.branch})` : ''}.\n` +
59
+ `All shell commands, reads, and edits now resolve against ${outcome.worktree.path}.\n` +
60
+ 'Use exit_worktree to return to the main checkout.');
61
+ case 'already_active':
62
+ return `Already in worktree ${path.basename(outcome.worktree.path)} (${outcome.worktree.path}). No change.`;
63
+ case 'not_found': {
64
+ if (outcome.available.length === 0) {
65
+ return (`Worktree '${params.name}' not found, and this repository has no worktrees besides the main checkout.\n` +
66
+ 'Create one with `git worktree add .worktrees/<slug> -b <slug>`, then call enter_worktree again.');
67
+ }
68
+ return `Worktree '${params.name}' not found. Available worktrees:\n${outcome.available
69
+ .map(describeWorktree)
70
+ .join('\n')}`;
71
+ }
72
+ case 'ambiguous':
73
+ return (`Worktree name '${params.name}' is ambiguous — it matches ${outcome.candidates.length} worktrees:\n` +
74
+ `${outcome.candidates.map(describeWorktree).join('\n')}\n\n` +
75
+ 'Call enter_worktree again with the branch name to disambiguate.');
76
+ case 'unavailable':
77
+ return (`Worktree '${params.name}' is registered at ${outcome.worktree.path} but its directory is missing. ` +
78
+ 'Run `git worktree prune` to clear the stale record, or recreate the worktree.');
79
+ case 'busy':
80
+ return busyMessage(`enter worktree '${params.name}'`, outcome.jobs);
81
+ }
82
+ },
83
+ formatCommandMessage: (item, index, toolCallArgumentsById) => {
84
+ const callId = getCallIdFromItem(item);
85
+ const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
86
+ const args = normalizeToolArguments(item?.rawItem?.arguments ?? item?.arguments) ??
87
+ normalizeToolArguments(fallbackArgs) ??
88
+ {};
89
+ const output = getOutputText(item) || '';
90
+ return [
91
+ createBaseMessage(item, index, 0, false, {
92
+ command: `enter_worktree "${args?.name ?? 'unknown'}"`,
93
+ output,
94
+ success: output.startsWith('Entered') || output.startsWith('Already in'),
95
+ toolName: 'enter_worktree',
96
+ toolArgs: args,
97
+ }),
98
+ ];
99
+ },
100
+ };
101
+ const exit = {
102
+ name: 'exit_worktree',
103
+ description: EXIT_WORKTREE_DESCRIPTION,
104
+ parameters: exitWorktreeSchema,
105
+ needsApproval: () => false,
106
+ execute: async () => {
107
+ const outcome = resolveExitWorktree({
108
+ homeRoot: executionContext.getHomeWorkspace(),
109
+ activeWorkspace: executionContext.getActiveWorkspace(),
110
+ runningJobs: getRunningJobs(),
111
+ });
112
+ switch (outcome.kind) {
113
+ case 'exited':
114
+ executionContext.exitWorkspace();
115
+ return `Left the worktree. All shell commands, reads, and edits now resolve against ${outcome.homeRoot}.`;
116
+ case 'not_in_worktree':
117
+ return `Not in a worktree — the session is already in its main checkout (${outcome.homeRoot}). No change.`;
118
+ case 'busy':
119
+ return busyMessage('exit the worktree', outcome.jobs);
120
+ }
121
+ },
122
+ formatCommandMessage: (item, index) => {
123
+ const output = getOutputText(item) || '';
124
+ return [
125
+ createBaseMessage(item, index, 0, false, {
126
+ command: 'exit_worktree',
127
+ output,
128
+ success: output.startsWith('Left') || output.startsWith('Not in a worktree'),
129
+ toolName: 'exit_worktree',
130
+ toolArgs: {},
131
+ }),
132
+ ];
133
+ },
134
+ };
135
+ return { enter, exit };
136
+ }
137
+ export { enterableWorktrees };
138
+ //# sourceMappingURL=worktree.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../../source/tools/system/worktree.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,MAAsB,EAC/B,OAAO,CAAC,EAAE;IACR;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,GACA,MAAM,CAkDR;AA8CD;;;;;;;;GAQG;AACH,wBAAsB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAYjH;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,MAAsB,GAAG,OAAO,CAQtG;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,6BAAoB,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,MAAiC,EAC1C,OAAO,CAAC,EAAE;IACR;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,GACA,MAAM,CAkDR;AA8CD;;;;;;;;GAQG;AACH,wBAAsB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAYjH;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,MAAiC,GAAG,OAAO,CAQjH;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,6BAAoB,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import path from 'path';
2
+ import { getActiveWorkspaceRoot } from '../services/workspace/active-workspace-root.js';
2
3
  import { homedir } from 'os';
3
4
  import { lstat, realpath } from 'fs/promises';
4
5
  import { z } from 'zod';
@@ -7,7 +8,7 @@ import { SANDBOX_TEMP_DIR } from '../utils/shell/temp-dir.js';
7
8
  /**
8
9
  * Resolves a relative path and ensures it's within the workspace
9
10
  */
10
- export function resolveWorkspacePath(relativePath, baseDir = process.cwd(), options) {
11
+ export function resolveWorkspacePath(relativePath, baseDir = getActiveWorkspaceRoot(), options) {
11
12
  const allowOutsideWorkspace = options?.allowOutsideWorkspace ?? false;
12
13
  const allowDiscoveredSkillFolders = options?.allowDiscoveredSkillFolders ?? false;
13
14
  // Expand ~ if the path starts with it
@@ -113,7 +114,7 @@ export async function isWorkspacePathPhysicallyInside(targetPath, workspaceRoot)
113
114
  * hook loading/trust: trusting a project permits execution, never silent model
114
115
  * mutation.
115
116
  */
116
- export function isProtectedHookPath(targetPath, workspaceRoot = process.cwd()) {
117
+ export function isProtectedHookPath(targetPath, workspaceRoot = getActiveWorkspaceRoot()) {
117
118
  const normalizedTarget = path.resolve(targetPath);
118
119
  const roots = [path.join(homedir(), '.term2', 'hooks'), path.join(path.resolve(workspaceRoot), '.term2', 'hooks')];
119
120
  return roots.some((root) => {
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,39 @@
1
1
  import type { ISettingsService } from '../../services/service-interfaces.js';
2
+ export declare const PROVIDER_CREDENTIAL_SETTING_KEYS: {
3
+ readonly openai: 'agent.openai.apiKey';
4
+ readonly openrouter: 'agent.openrouter.apiKey';
5
+ };
6
+ export declare const getProviderCredentialSettingKey: (providerId: string) => string | undefined;
7
+ export declare const getProviderIdForCredentialSettingKey: (settingKey: string | undefined) => string | undefined;
8
+ export type ProviderCredentialResolution = {
9
+ required: boolean;
10
+ configured: boolean;
11
+ source: 'setting' | 'environment' | 'stored' | 'token-file' | 'local' | 'external' | 'missing';
12
+ unavailableReason?: 'missing-credentials' | 'missing-codex-login';
13
+ settingKey?: string;
14
+ environmentKey?: string;
15
+ credentialPath?: string | null;
16
+ };
2
17
  /**
3
- * Check if a provider has the required credentials configured
18
+ * Resolve provider readiness from the same credential sources the provider
19
+ * runtime consumes. Local loopback custom providers and llama.cpp are
20
+ * explicitly no-auth; remote custom providers require a stored or type-level
21
+ * environment credential. Codex uses its local auth file as a presence-only
22
+ * credential. Unknown registered providers retain their external auth contract
23
+ * and are not blocked by this API-key predicate.
24
+ */
25
+ export declare const resolveProviderCredentials: (settingsService: ISettingsService, providerId: string) => ProviderCredentialResolution;
26
+ /** Resolve the actual credential value for runtime-compatible provider setup. */
27
+ export declare const resolveProviderCredentialValue: (settingsService: ISettingsService, providerId: string) => string | undefined;
28
+ /**
29
+ * Check credential presence only. This deliberately does not contact a
30
+ * provider or validate the credential; invalid credentials fail at request
31
+ * time where the provider can report the real error.
4
32
  */
5
33
  export declare const hasProviderCredentials: (settingsService: ISettingsService, providerId: string) => boolean;
6
34
  /**
7
- * Get list of provider IDs that have valid credentials
35
+ * Get provider IDs that are locally runnable according to credential
36
+ * presence. The name is retained for compatibility with existing callers.
8
37
  */
9
38
  export declare const getAvailableProviderIds: (settingsService: ISettingsService, allProviderIds: string[]) => string[];
10
39
  //# sourceMappingURL=provider-credentials.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"provider-credentials.d.ts","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,sBAAsB,oBAAqB,gBAAgB,cAAc,MAAM,KAAG,OAa9F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,gBAAgB,kBAAkB,MAAM,EAAE,KAAG,MAAM,EAE3G,CAAC"}
1
+ {"version":3,"file":"provider-credentials.d.ts","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAW7E,eAAO,MAAM,gCAAgC;aAC3C,MAAM,EAAE,qBAAqB;aAC7B,UAAU,EAAE,yBAAyB;CAC7B,CAAC;AAEX,eAAO,MAAM,+BAA+B,eAAgB,MAAM,KAAG,MAAM,GAAG,SACiB,CAAC;AAEhG,eAAO,MAAM,oCAAoC,eAAgB,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAK9F,CAAC;AAQF,MAAM,MAAM,4BAA4B,GAAG;IACzC,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IAC/F,iBAAiB,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,CAAC;IAClE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAmDF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,oBACpB,gBAAgB,cACrB,MAAM,KACjB,4BA+BF,CAAC;AAEF,iFAAiF;AACjF,eAAO,MAAM,8BAA8B,oBACxB,gBAAgB,cACrB,MAAM,KACjB,MAAM,GAAG,SAkBX,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,oBAAqB,gBAAgB,cAAc,MAAM,KAAG,OAG9F,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,gBAAgB,kBAAkB,MAAM,EAAE,KAAG,MAAM,EAE3G,CAAC"}
@@ -1,20 +1,128 @@
1
+ import { decodeStoredCustomProviderConfigs, normalizeProviderIdentifier, } from '../../services/settings/custom-provider-normalization.js';
2
+ import { getProvider } from '../../providers/registry.js';
3
+ import { resolveCodexTokenPath } from '../../providers/codex-auth.js';
4
+ const hasConfiguredCredential = (value) => typeof value === 'string' && value.trim().length > 0;
5
+ export const PROVIDER_CREDENTIAL_SETTING_KEYS = {
6
+ openai: 'agent.openai.apiKey',
7
+ openrouter: 'agent.openrouter.apiKey',
8
+ };
9
+ export const getProviderCredentialSettingKey = (providerId) => PROVIDER_CREDENTIAL_SETTING_KEYS[providerId];
10
+ export const getProviderIdForCredentialSettingKey = (settingKey) => {
11
+ if (!settingKey)
12
+ return undefined;
13
+ return Object.entries(PROVIDER_CREDENTIAL_SETTING_KEYS).find(([, key]) => key === settingKey)?.[0];
14
+ };
15
+ const CUSTOM_PROVIDER_ENV_KEYS = {
16
+ anthropic: 'ANTHROPIC_API_KEY',
17
+ google: 'GOOGLE_GENERATIVE_AI_API_KEY',
18
+ opencode: 'OPENCODE_API_KEY',
19
+ };
20
+ const isConfigured = hasConfiguredCredential;
21
+ const isLoopbackBaseUrl = (baseUrl) => {
22
+ if (!baseUrl)
23
+ return false;
24
+ try {
25
+ const hostname = new URL(baseUrl).hostname.toLowerCase();
26
+ return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '[::1]' || hostname === '::1';
27
+ }
28
+ catch {
29
+ return false;
30
+ }
31
+ };
32
+ const getStoredCustomProvider = (settingsService, providerId) => {
33
+ const raw = settingsService.getDynamic('providers');
34
+ const normalizedProviderId = normalizeProviderIdentifier(providerId);
35
+ return decodeStoredCustomProviderConfigs(raw).find((provider) => provider.id === providerId ||
36
+ provider.name === providerId ||
37
+ provider.id === normalizedProviderId ||
38
+ provider.name === normalizedProviderId);
39
+ };
40
+ const resolveCredentialSources = (settingsService, settingKey, storedKey, environmentKey) => {
41
+ if (settingKey && isConfigured(settingsService.getDynamic(settingKey))) {
42
+ return { required: true, configured: true, source: 'setting', settingKey, environmentKey };
43
+ }
44
+ if (isConfigured(storedKey)) {
45
+ return { required: true, configured: true, source: 'stored', settingKey, environmentKey };
46
+ }
47
+ if (environmentKey && isConfigured(process.env[environmentKey])) {
48
+ return { required: true, configured: true, source: 'environment', settingKey, environmentKey };
49
+ }
50
+ return {
51
+ required: true,
52
+ configured: false,
53
+ source: 'missing',
54
+ unavailableReason: 'missing-credentials',
55
+ settingKey,
56
+ environmentKey,
57
+ };
58
+ };
1
59
  /**
2
- * Check if a provider has the required credentials configured
60
+ * Resolve provider readiness from the same credential sources the provider
61
+ * runtime consumes. Local loopback custom providers and llama.cpp are
62
+ * explicitly no-auth; remote custom providers require a stored or type-level
63
+ * environment credential. Codex uses its local auth file as a presence-only
64
+ * credential. Unknown registered providers retain their external auth contract
65
+ * and are not blocked by this API-key predicate.
3
66
  */
4
- export const hasProviderCredentials = (settingsService, providerId) => {
5
- if (providerId === 'openai') {
6
- // OpenAI uses OPENAI_API_KEY from the SDK, not from settings
7
- // We can't check it directly, so assume it might be available
8
- return true;
67
+ export const resolveProviderCredentials = (settingsService, providerId) => {
68
+ if (providerId === 'codex') {
69
+ const credentialPath = resolveCodexTokenPath();
70
+ return {
71
+ required: true,
72
+ configured: credentialPath !== null,
73
+ source: credentialPath ? 'token-file' : 'missing',
74
+ unavailableReason: credentialPath ? undefined : 'missing-codex-login',
75
+ credentialPath,
76
+ };
9
77
  }
10
- if (providerId === 'openrouter') {
11
- return !!settingsService.get('agent.openrouter.apiKey');
78
+ const settingKey = getProviderCredentialSettingKey(providerId);
79
+ if (settingKey) {
80
+ const environmentKey = providerId === 'openai' ? 'OPENAI_API_KEY' : 'OPENROUTER_API_KEY';
81
+ return resolveCredentialSources(settingsService, settingKey, undefined, environmentKey);
12
82
  }
13
- // For unknown providers, assume they're available
14
- return true;
83
+ const custom = getStoredCustomProvider(settingsService, providerId);
84
+ if (!custom) {
85
+ const definition = getProvider(providerId);
86
+ return definition?.isRuntimeDefined
87
+ ? { required: true, configured: false, source: 'missing', unavailableReason: 'missing-credentials' }
88
+ : { required: false, configured: true, source: 'external' };
89
+ }
90
+ if (custom.type === 'llama.cpp' || isLoopbackBaseUrl(custom.baseUrl)) {
91
+ return { required: false, configured: true, source: 'local' };
92
+ }
93
+ return resolveCredentialSources(settingsService, undefined, custom.apiKey, CUSTOM_PROVIDER_ENV_KEYS[custom.type]);
94
+ };
95
+ /** Resolve the actual credential value for runtime-compatible provider setup. */
96
+ export const resolveProviderCredentialValue = (settingsService, providerId) => {
97
+ const custom = getStoredCustomProvider(settingsService, providerId);
98
+ const resolution = resolveProviderCredentials(settingsService, providerId);
99
+ if (custom?.apiKey && resolution.source === 'local') {
100
+ return custom.apiKey;
101
+ }
102
+ if (resolution.source === 'setting' && resolution.settingKey) {
103
+ const value = settingsService.getDynamic(resolution.settingKey);
104
+ return typeof value === 'string' ? value : undefined;
105
+ }
106
+ if (resolution.source === 'environment' && resolution.environmentKey) {
107
+ return process.env[resolution.environmentKey];
108
+ }
109
+ if (resolution.source === 'stored') {
110
+ return custom?.apiKey;
111
+ }
112
+ return undefined;
113
+ };
114
+ /**
115
+ * Check credential presence only. This deliberately does not contact a
116
+ * provider or validate the credential; invalid credentials fail at request
117
+ * time where the provider can report the real error.
118
+ */
119
+ export const hasProviderCredentials = (settingsService, providerId) => {
120
+ const resolution = resolveProviderCredentials(settingsService, providerId);
121
+ return !resolution.required || resolution.configured;
15
122
  };
16
123
  /**
17
- * Get list of provider IDs that have valid credentials
124
+ * Get provider IDs that are locally runnable according to credential
125
+ * presence. The name is retained for compatibility with existing callers.
18
126
  */
19
127
  export const getAvailableProviderIds = (settingsService, allProviderIds) => {
20
128
  return allProviderIds.filter((id) => hasProviderCredentials(settingsService, id));
@@ -1 +1 @@
1
- {"version":3,"file":"provider-credentials.js","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,eAAiC,EAAE,UAAkB,EAAW,EAAE;IACvG,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,6DAA6D;QAC7D,8DAA8D;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAC1D,CAAC;IAED,kDAAkD;IAClD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,eAAiC,EAAE,cAAwB,EAAY,EAAE;IAC/G,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,sBAAsB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;AACpF,CAAC,CAAC"}
1
+ {"version":3,"file":"provider-credentials.js","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,14 @@
1
1
  import type { CommandMessage } from '../../tools/types.js';
2
2
  import type { Message } from '../../types/message.js';
3
3
  /**
4
- * Get the text content of the final assistant response, combining contiguous
5
- * bot messages into a single string. Returns null if no bot messages exist.
4
+ * Get an assistant response by its 1-based position from newest to oldest.
5
+ * Contiguous bot messages are combined because streaming can represent one
6
+ * response as several UI messages. Returns null when that response does not
7
+ * exist.
8
+ */
9
+ export declare function getAssistantResponseText(messages: Message[], responseNumber?: number): string | null;
10
+ /**
11
+ * Get the text content of the final assistant response.
6
12
  */
7
13
  export declare function getLastFinalAssistantText(messages: Message[]): string | null;
8
14
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"message-utils.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/message-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGtD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,IAAI,CA2B5E;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAkB5E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE,CAsB9F;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CASrF;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,CAGhF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CASnG"}
1
+ {"version":3,"file":"message-utils.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/message-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGtD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,cAAc,SAAI,GAAG,MAAM,GAAG,IAAI,CAuC/F;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,IAAI,CAE5E;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAkB5E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE,CAsB9F;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CASrF;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,CAGhF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CASnG"}
@@ -1,33 +1,50 @@
1
1
  import { isCommandMessage, isUserMessage } from '../../types/message.js';
2
2
  /**
3
- * Get the text content of the final assistant response, combining contiguous
4
- * bot messages into a single string. Returns null if no bot messages exist.
3
+ * Get an assistant response by its 1-based position from newest to oldest.
4
+ * Contiguous bot messages are combined because streaming can represent one
5
+ * response as several UI messages. Returns null when that response does not
6
+ * exist.
5
7
  */
6
- export function getLastFinalAssistantText(messages) {
7
- let lastBotIndex = -1;
8
- for (let index = messages.length - 1; index >= 0; index--) {
9
- const message = messages[index];
10
- if (message?.sender === 'bot' && typeof message.text === 'string' && message.text.length > 0) {
11
- lastBotIndex = index;
12
- break;
13
- }
14
- }
15
- if (lastBotIndex === -1) {
8
+ export function getAssistantResponseText(messages, responseNumber = 1) {
9
+ if (!Number.isSafeInteger(responseNumber) || responseNumber < 1) {
16
10
  return null;
17
11
  }
18
- const texts = [];
19
- for (let index = lastBotIndex; index >= 0; index--) {
20
- const message = messages[index];
21
- if (message?.sender === 'bot') {
22
- if (typeof message.text === 'string') {
23
- texts.unshift(message.text);
12
+ let remaining = responseNumber;
13
+ for (let index = messages.length - 1; index >= 0;) {
14
+ while (index >= 0 && messages[index]?.sender !== 'bot') {
15
+ index--;
16
+ }
17
+ if (index < 0) {
18
+ return null;
19
+ }
20
+ const texts = [];
21
+ while (index >= 0) {
22
+ const message = messages[index];
23
+ if (message?.sender !== 'bot') {
24
+ break;
25
+ }
26
+ const text = message.text;
27
+ if (typeof text === 'string') {
28
+ texts.unshift(text);
24
29
  }
30
+ index--;
25
31
  }
26
- else {
27
- break;
32
+ const responseText = texts.join('').trim();
33
+ if (!responseText) {
34
+ continue;
35
+ }
36
+ remaining--;
37
+ if (remaining === 0) {
38
+ return responseText;
28
39
  }
29
40
  }
30
- return texts.join('').trim() || null;
41
+ return null;
42
+ }
43
+ /**
44
+ * Get the text content of the final assistant response.
45
+ */
46
+ export function getLastFinalAssistantText(messages) {
47
+ return getAssistantResponseText(messages);
31
48
  }
32
49
  /**
33
50
  * Remove trailing assistant-visible messages so a retry can replace the last
@@ -1 +1 @@
1
- {"version":3,"file":"message-utils.js","sourceRoot":"","sources":["../../../source/utils/conversation/message-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEzE;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAAmB;IAC3D,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC;IACtB,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1D,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,OAAO,EAAE,MAAM,KAAK,KAAK,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7F,YAAY,GAAG,KAAK,CAAC;YACrB,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,IAAI,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,OAAO,EAAE,MAAM,KAAK,KAAK,EAAE,CAAC;YAC9B,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACrC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;AACvC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CAAC,QAAmB;IAC/D,IAAI,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC1B,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QAClC,IACE,OAAO,EAAE,MAAM,KAAK,SAAS;YAC7B,OAAO,EAAE,MAAM,KAAK,KAAK;YACzB,OAAO,EAAE,MAAM,KAAK,WAAW;YAC/B,OAAO,EAAE,MAAM,KAAK,QAAQ;YAC5B,OAAO,EAAE,MAAM,KAAK,UAAU,EAC9B,CAAC;YACD,GAAG,EAAE,CAAC;YACN,SAAS;QACX,CAAC;QACD,MAAM;IACR,CAAC;IAED,OAAO,GAAG,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACrE,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAe,EAAE,WAA6B;IACjF,mDAAmD;IACnD,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IACjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACxC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAEpG,uEAAuE;IACvE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACvF,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QAClC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACxC,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,8BAA8B,CAAC,QAA4B;IACzE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;YAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CAAC,QAA4B;IACtE,MAAM,OAAO,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAC;IACzD,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,QAA4B,EAAE,UAAkB;IACzF,OAAO,8BAA8B,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,UAAU,CAAC,CAAC,MAAM,CAAC;AAChG,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAmB;IACvD,MAAM,MAAM,GAA6C,EAAE,CAAC;IAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"message-utils.js","sourceRoot":"","sources":["../../../source/utils/conversation/message-utils.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ export type CopySelection = Readonly<{
2
+ label: string;
3
+ text: string;
4
+ }>;
5
+ /** Extract fenced Markdown code blocks, excluding the fence and language hint. */
6
+ export declare function extractFencedCodeBlocks(text: string): string[];
7
+ export declare function buildCopySelections(response: string): CopySelection[];
8
+ //# sourceMappingURL=copy-selections.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"copy-selections.d.ts","sourceRoot":"","sources":["../../source/utils/copy-selections.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAWH,kFAAkF;AAClF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAgC9D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,EAAE,CAQrE"}
@@ -0,0 +1,42 @@
1
+ const OPEN_FENCE_PATTERN = /^\s*(`{3,}|~{3,})([^\n]*)$/;
2
+ const CLOSE_FENCE_PATTERN = /^\s*([`~]{3,})\s*$/;
3
+ /** Extract fenced Markdown code blocks, excluding the fence and language hint. */
4
+ export function extractFencedCodeBlocks(text) {
5
+ const lines = text.split(/\r?\n/);
6
+ const blocks = [];
7
+ let openFence = null;
8
+ for (let index = 0; index < lines.length; index++) {
9
+ const line = lines[index] ?? '';
10
+ if (!openFence) {
11
+ const match = line.match(OPEN_FENCE_PATTERN);
12
+ if (!match)
13
+ continue;
14
+ const marker = match[1];
15
+ openFence = {
16
+ character: marker[0],
17
+ length: marker.length,
18
+ contentStart: index + 1,
19
+ };
20
+ continue;
21
+ }
22
+ const closeMatch = line.match(CLOSE_FENCE_PATTERN);
23
+ if (!closeMatch)
24
+ continue;
25
+ const marker = closeMatch[1];
26
+ if (marker[0] !== openFence.character || marker.length < openFence.length)
27
+ continue;
28
+ blocks.push(lines.slice(openFence.contentStart, index).join('\n'));
29
+ openFence = null;
30
+ }
31
+ return blocks;
32
+ }
33
+ export function buildCopySelections(response) {
34
+ return [
35
+ { label: 'Full response', text: response },
36
+ ...extractFencedCodeBlocks(response).map((text, index) => ({
37
+ label: `Code block #${index + 1}`,
38
+ text,
39
+ })),
40
+ ];
41
+ }
42
+ //# sourceMappingURL=copy-selections.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"copy-selections.js","sourceRoot":"","sources":["../../source/utils/copy-selections.ts"],"names":[],"mappings":"AAWA,MAAM,kBAAkB,GAAG,4BAA4B,CAAC;AACxD,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAEjD,kFAAkF;AAClF,MAAM,UAAU,uBAAuB,CAAC,IAAY;IAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,SAAS,GAAqB,IAAI,CAAC;IAEvC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK;gBAAE,SAAS;YAErB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;YACzB,SAAS,GAAG;gBACV,SAAS,EAAE,MAAM,CAAC,CAAC,CAAc;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,YAAY,EAAE,KAAK,GAAG,CAAC;aACxB,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM;YAAE,SAAS;QAEpF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,SAAS,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAgB;IAClD,OAAO;QACL,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC1C,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACzD,KAAK,EAAE,eAAe,KAAK,GAAG,CAAC,EAAE;YACjC,IAAI;SACL,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"settings-command.d.ts","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAMrG,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAqBlD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CA8H3E;AAED,UAAU,yBAAyB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACxD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED,wBAAgB,qBAAqB,CAAC,EACpC,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,GACb,EAAE,yBAAyB,GAAG,YAAY,CAsI1C"}
1
+ {"version":3,"file":"settings-command.d.ts","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAMrG,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAqBlD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAmI3E;AAED,UAAU,yBAAyB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACxD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED,wBAAgB,qBAAqB,CAAC,EACpC,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,GACb,EAAE,yBAAyB,GAAG,YAAY,CAsI1C"}
@@ -108,6 +108,11 @@ export function formatSettingsSummary(settings) {
108
108
  value: settings.shell.timeout.value,
109
109
  source: settings.shell.timeout.source,
110
110
  },
111
+ {
112
+ key: SETTING_KEYS.SHELL_BACKGROUND_TIMEOUT,
113
+ value: settings.shell.backgroundTimeout.value,
114
+ source: settings.shell.backgroundTimeout.source,
115
+ },
111
116
  {
112
117
  key: SETTING_KEYS.SHELL_MAX_OUTPUT_LINES,
113
118
  value: settings.shell.maxOutputLines.value,