@draht/coding-agent 2026.11.5 → 2026.11.14-1

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 (328) hide show
  1. package/CHANGELOG.md +66 -0
  2. package/dist/bundle/chunks/anthropic-messages-C5ZJVCKX.js +6 -0
  3. package/dist/bundle/chunks/{azure-openai-responses-5YLWRJ4E.js → azure-openai-responses-TNRID5YC.js} +1 -1
  4. package/dist/bundle/chunks/bedrock-converse-stream.js +22 -22
  5. package/dist/bundle/chunks/chunk-2CHTECAU.js +2 -0
  6. package/dist/bundle/chunks/{chunk-MKVW4KK2.js → chunk-2IQVBLH6.js} +1 -1
  7. package/dist/bundle/chunks/chunk-2JZLKNZ4.js +3 -0
  8. package/dist/bundle/chunks/{chunk-LJ3SEGWI.js → chunk-4FPBO5KP.js} +6 -2
  9. package/dist/bundle/chunks/{chunk-3LFBXSCO.js → chunk-5C4MAPF6.js} +1 -1
  10. package/dist/bundle/chunks/chunk-5WEOWREV.js +82 -0
  11. package/dist/bundle/chunks/chunk-6M3D4XVD.js +2 -0
  12. package/dist/bundle/chunks/{chunk-KVH4HR57.js → chunk-6WESOD4H.js} +1 -1
  13. package/dist/bundle/chunks/{chunk-UQSONZLL.js → chunk-ATYP3OSV.js} +3 -1
  14. package/dist/bundle/chunks/chunk-B6S2UR4T.js +2 -0
  15. package/dist/bundle/chunks/chunk-EBTEI43G.js +20 -0
  16. package/dist/bundle/chunks/{chunk-EXZUXBS5.js → chunk-GAABJAG4.js} +13 -16
  17. package/dist/bundle/chunks/chunk-GBFVS2SF.js +12 -0
  18. package/dist/bundle/chunks/{chunk-ITP6IDBA.js → chunk-GQXRTK54.js} +2 -2
  19. package/dist/bundle/chunks/{chunk-YUBUKEPQ.js → chunk-JHKMYVPC.js} +187 -148
  20. package/dist/bundle/chunks/{chunk-QVGSXIKT.js → chunk-KFREX3FS.js} +1 -1
  21. package/dist/bundle/chunks/{chunk-PRT3JHOZ.js → chunk-LCTFXH4P.js} +1 -1
  22. package/dist/bundle/chunks/chunk-LO6CVU2L.js +6 -0
  23. package/dist/bundle/chunks/{chunk-ABW2JATG.js → chunk-MPJIXESS.js} +1 -1
  24. package/dist/bundle/chunks/{chunk-PZKD35UB.js → chunk-MXA4WY3C.js} +1 -1
  25. package/dist/bundle/chunks/chunk-O2XYFH2E.js +30 -0
  26. package/dist/bundle/chunks/{chunk-CLNF6E5P.js → chunk-OUXJRC2W.js} +1 -1
  27. package/dist/bundle/chunks/{chunk-SKQFE2GA.js → chunk-RI7HJ6AF.js} +10 -10
  28. package/dist/bundle/chunks/chunk-RVXTPNXQ.js +44 -0
  29. package/dist/bundle/chunks/{chunk-SPVE2GM7.js → chunk-SXHVGWCU.js} +1 -1
  30. package/dist/bundle/chunks/chunk-WNZ64GW3.js +2 -0
  31. package/dist/bundle/chunks/chunk-XWZLYE4L.js +9 -0
  32. package/dist/bundle/chunks/{chunk-JAT7HEFU.js → chunk-YSE3VKKB.js} +2 -2
  33. package/dist/bundle/chunks/{cli-7AMCJ2UG.js → cli-2QKCAPPD.js} +3 -3
  34. package/dist/bundle/chunks/{cloudflare-workers-ai-system-one-QBCV2OWJ.js → cloudflare-workers-ai-system-one-UCG6T3XP.js} +1 -1
  35. package/dist/bundle/chunks/codemode-worker.js +2 -0
  36. package/dist/bundle/chunks/{execute-VOIPQMCI.js → execute-KGJOWTPG.js} +2 -2
  37. package/dist/bundle/chunks/github-copilot.js +1 -1
  38. package/dist/bundle/chunks/google-generative-ai-GPBKPOXA.js +2 -0
  39. package/dist/bundle/chunks/google-vertex-USZY53NF.js +2 -0
  40. package/dist/bundle/chunks/https-proxy-agent-WQIRL24U.js +13 -0
  41. package/dist/bundle/chunks/lib-ULKZYRGD.js +9 -0
  42. package/dist/bundle/chunks/{llama-cpp-classify-WGVYEPG2.js → llama-cpp-classify-7DEQ4ZUF.js} +1 -1
  43. package/dist/bundle/chunks/{mistral-conversations-PV6RDK65.js → mistral-conversations-UOGXPDZ3.js} +1 -1
  44. package/dist/bundle/chunks/{multipart-parser-AZP5BX2W.js → multipart-parser-HMCXZ4BD.js} +1 -1
  45. package/dist/bundle/chunks/{node-BZAVEWJ3.js → node-DXZFQBEO.js} +1 -1
  46. package/dist/bundle/chunks/{node-C2JGH2OB.js → node-LBZLUIBE.js} +1 -1
  47. package/dist/bundle/chunks/{openai-codex-responses-SEOL3EDF.js → openai-codex-responses-VUDXQ3EU.js} +1 -1
  48. package/dist/bundle/chunks/{openai-completions-U32QPS37.js → openai-completions-UQOOS7NM.js} +3 -3
  49. package/dist/bundle/chunks/{openai-decisions-ULSYFV2A.js → openai-decisions-24WNXO2R.js} +1 -1
  50. package/dist/bundle/chunks/{openai-responses-5MYZJYPK.js → openai-responses-5AF6MZ5L.js} +1 -1
  51. package/dist/bundle/chunks/{openrouter-images-SGOP5SDW.js → openrouter-images-OUXVVTYQ.js} +1 -1
  52. package/dist/bundle/chunks/{pi-messages-QALFE2BD.js → pi-messages-DRMOEO6B.js} +1 -1
  53. package/dist/bundle/chunks/{runtime-Z74VFUDD.js → runtime-FZKS2BWI.js} +1 -1
  54. package/dist/bundle/chunks/{runtime-GDH3ZURV.js → runtime-L23MZBKL.js} +1 -1
  55. package/dist/bundle/chunks/{settings-manager-T6UJFO2F.js → settings-manager-CWRQW6PZ.js} +1 -1
  56. package/dist/bundle/chunks/src-KDGO7EGF.js +4 -0
  57. package/dist/bundle/chunks/{typesafe-system-one-GTGS5MG6.js → typesafe-system-one-K63EBJDD.js} +1 -1
  58. package/dist/bundle/chunks/virtual-modules-JZV35VDE.js +2 -0
  59. package/dist/bundle/cli-runtime.js +1 -1
  60. package/dist/bundle/index.js +1 -1
  61. package/dist/bundle/rpc-entry.js +1 -1
  62. package/dist/cli/args.d.ts.map +1 -1
  63. package/dist/cli/args.js +5 -3
  64. package/dist/cli/args.js.map +1 -1
  65. package/dist/cli/auth-command.d.ts.map +1 -1
  66. package/dist/cli/auth-command.js +30 -6
  67. package/dist/cli/auth-command.js.map +1 -1
  68. package/dist/cli/auth-login.d.ts +15 -0
  69. package/dist/cli/auth-login.d.ts.map +1 -0
  70. package/dist/cli/auth-login.js +232 -0
  71. package/dist/cli/auth-login.js.map +1 -0
  72. package/dist/cli/auth-logout.d.ts +14 -0
  73. package/dist/cli/auth-logout.d.ts.map +1 -0
  74. package/dist/cli/auth-logout.js +57 -0
  75. package/dist/cli/auth-logout.js.map +1 -0
  76. package/dist/cli/auth-terminal.d.ts +17 -0
  77. package/dist/cli/auth-terminal.d.ts.map +1 -0
  78. package/dist/cli/auth-terminal.js +63 -0
  79. package/dist/cli/auth-terminal.js.map +1 -0
  80. package/dist/core/agent-session-runtime.d.ts +5 -0
  81. package/dist/core/agent-session-runtime.d.ts.map +1 -1
  82. package/dist/core/agent-session-runtime.js +16 -2
  83. package/dist/core/agent-session-runtime.js.map +1 -1
  84. package/dist/core/agent-session.d.ts +20 -9
  85. package/dist/core/agent-session.d.ts.map +1 -1
  86. package/dist/core/agent-session.js +71 -29
  87. package/dist/core/agent-session.js.map +1 -1
  88. package/dist/core/ai-schemas.d.ts +1 -0
  89. package/dist/core/ai-schemas.d.ts.map +1 -1
  90. package/dist/core/builtins/budgets.d.ts.map +1 -1
  91. package/dist/core/builtins/budgets.js +6 -3
  92. package/dist/core/builtins/budgets.js.map +1 -1
  93. package/dist/core/cache-warmer.d.ts +4 -37
  94. package/dist/core/cache-warmer.d.ts.map +1 -1
  95. package/dist/core/cache-warmer.js +11 -91
  96. package/dist/core/cache-warmer.js.map +1 -1
  97. package/dist/core/compaction/utils.d.ts.map +1 -1
  98. package/dist/core/compaction/utils.js +2 -1
  99. package/dist/core/compaction/utils.js.map +1 -1
  100. package/dist/core/exec.d.ts +1 -0
  101. package/dist/core/exec.d.ts.map +1 -1
  102. package/dist/core/exec.js +4 -1
  103. package/dist/core/exec.js.map +1 -1
  104. package/dist/core/export-html/ansi-to-html.d.ts +5 -0
  105. package/dist/core/export-html/ansi-to-html.d.ts.map +1 -1
  106. package/dist/core/export-html/ansi-to-html.js +57 -20
  107. package/dist/core/export-html/ansi-to-html.js.map +1 -1
  108. package/dist/core/export-html/template.js +1 -1
  109. package/dist/core/export-html/tool-renderer.d.ts.map +1 -1
  110. package/dist/core/export-html/tool-renderer.js +2 -3
  111. package/dist/core/export-html/tool-renderer.js.map +1 -1
  112. package/dist/core/extensions/types.d.ts +3 -2
  113. package/dist/core/extensions/types.d.ts.map +1 -1
  114. package/dist/core/extensions/types.js.map +1 -1
  115. package/dist/core/model-config.d.ts +13 -0
  116. package/dist/core/model-config.d.ts.map +1 -1
  117. package/dist/core/model-resolver.d.ts +0 -1
  118. package/dist/core/model-resolver.d.ts.map +1 -1
  119. package/dist/core/model-resolver.js +17 -24
  120. package/dist/core/model-resolver.js.map +1 -1
  121. package/dist/core/model-runtime.d.ts +5 -0
  122. package/dist/core/model-runtime.d.ts.map +1 -1
  123. package/dist/core/model-runtime.js +7 -0
  124. package/dist/core/model-runtime.js.map +1 -1
  125. package/dist/core/polyphase/render/format.d.ts +2 -0
  126. package/dist/core/polyphase/render/format.d.ts.map +1 -1
  127. package/dist/core/polyphase/render/format.js +6 -0
  128. package/dist/core/polyphase/render/format.js.map +1 -1
  129. package/dist/core/polyphase/render/run-block.d.ts +4 -0
  130. package/dist/core/polyphase/render/run-block.d.ts.map +1 -1
  131. package/dist/core/polyphase/render/run-block.js +71 -12
  132. package/dist/core/polyphase/render/run-block.js.map +1 -1
  133. package/dist/core/polyphase/render/snapshot.d.ts +1 -1
  134. package/dist/core/polyphase/render/snapshot.d.ts.map +1 -1
  135. package/dist/core/polyphase/render/snapshot.js +22 -7
  136. package/dist/core/polyphase/render/snapshot.js.map +1 -1
  137. package/dist/core/polyphase/ui/dock.d.ts.map +1 -1
  138. package/dist/core/polyphase/ui/dock.js +34 -2
  139. package/dist/core/polyphase/ui/dock.js.map +1 -1
  140. package/dist/core/polyphase/ui/inspector.d.ts +18 -6
  141. package/dist/core/polyphase/ui/inspector.d.ts.map +1 -1
  142. package/dist/core/polyphase/ui/inspector.js +125 -44
  143. package/dist/core/polyphase/ui/inspector.js.map +1 -1
  144. package/dist/core/polyphase/ui/transcript-layout.d.ts.map +1 -1
  145. package/dist/core/polyphase/ui/transcript-layout.js +5 -1
  146. package/dist/core/polyphase/ui/transcript-layout.js.map +1 -1
  147. package/dist/core/preferred-providers.d.ts +17 -0
  148. package/dist/core/preferred-providers.d.ts.map +1 -0
  149. package/dist/core/preferred-providers.js +24 -0
  150. package/dist/core/preferred-providers.js.map +1 -0
  151. package/dist/core/prompt-templates.d.ts.map +1 -1
  152. package/dist/core/prompt-templates.js +18 -2
  153. package/dist/core/prompt-templates.js.map +1 -1
  154. package/dist/core/provider-composer.d.ts.map +1 -1
  155. package/dist/core/provider-composer.js +2 -0
  156. package/dist/core/provider-composer.js.map +1 -1
  157. package/dist/core/provider-matching.d.ts +6 -0
  158. package/dist/core/provider-matching.d.ts.map +1 -0
  159. package/dist/core/provider-matching.js +8 -0
  160. package/dist/core/provider-matching.js.map +1 -0
  161. package/dist/core/radius-mcp.d.ts +13 -0
  162. package/dist/core/radius-mcp.d.ts.map +1 -0
  163. package/dist/core/radius-mcp.js +29 -0
  164. package/dist/core/radius-mcp.js.map +1 -0
  165. package/dist/core/remote-catalog-provider.d.ts.map +1 -1
  166. package/dist/core/remote-catalog-provider.js +2 -0
  167. package/dist/core/remote-catalog-provider.js.map +1 -1
  168. package/dist/core/runtime-credentials.d.ts +8 -0
  169. package/dist/core/runtime-credentials.d.ts.map +1 -1
  170. package/dist/core/runtime-credentials.js +15 -1
  171. package/dist/core/runtime-credentials.js.map +1 -1
  172. package/dist/core/session-cwd.d.ts +7 -0
  173. package/dist/core/session-cwd.d.ts.map +1 -1
  174. package/dist/core/session-cwd.js +9 -1
  175. package/dist/core/session-cwd.js.map +1 -1
  176. package/dist/core/session-manager.d.ts.map +1 -1
  177. package/dist/core/session-manager.js +45 -36
  178. package/dist/core/session-manager.js.map +1 -1
  179. package/dist/core/settings-defaults.d.ts +1 -1
  180. package/dist/core/settings-defaults.d.ts.map +1 -1
  181. package/dist/core/settings-defaults.js +1 -1
  182. package/dist/core/settings-defaults.js.map +1 -1
  183. package/dist/core/tools/bash.d.ts.map +1 -1
  184. package/dist/core/tools/bash.js +35 -5
  185. package/dist/core/tools/bash.js.map +1 -1
  186. package/dist/core/tools/edit-diff.d.ts +23 -14
  187. package/dist/core/tools/edit-diff.d.ts.map +1 -1
  188. package/dist/core/tools/edit-diff.js +182 -41
  189. package/dist/core/tools/edit-diff.js.map +1 -1
  190. package/dist/core/tools/edit.d.ts.map +1 -1
  191. package/dist/core/tools/edit.js +8 -7
  192. package/dist/core/tools/edit.js.map +1 -1
  193. package/dist/core/tools/find.d.ts.map +1 -1
  194. package/dist/core/tools/find.js +57 -16
  195. package/dist/core/tools/find.js.map +1 -1
  196. package/dist/core/tools/grep.d.ts +4 -0
  197. package/dist/core/tools/grep.d.ts.map +1 -1
  198. package/dist/core/tools/grep.js +20 -8
  199. package/dist/core/tools/grep.js.map +1 -1
  200. package/dist/core/tools/output-accumulator.d.ts.map +1 -1
  201. package/dist/core/tools/output-accumulator.js +4 -1
  202. package/dist/core/tools/output-accumulator.js.map +1 -1
  203. package/dist/core/tools/powershell.d.ts.map +1 -1
  204. package/dist/core/tools/powershell.js +15 -2
  205. package/dist/core/tools/powershell.js.map +1 -1
  206. package/dist/core/tools/read.d.ts +13 -0
  207. package/dist/core/tools/read.d.ts.map +1 -1
  208. package/dist/core/tools/read.js +146 -35
  209. package/dist/core/tools/read.js.map +1 -1
  210. package/dist/core/tools/renderers/read.d.ts.map +1 -1
  211. package/dist/core/tools/renderers/read.js +6 -2
  212. package/dist/core/tools/renderers/read.js.map +1 -1
  213. package/dist/core/tools/truncate.d.ts +4 -0
  214. package/dist/core/tools/truncate.d.ts.map +1 -1
  215. package/dist/core/tools/truncate.js +24 -1
  216. package/dist/core/tools/truncate.js.map +1 -1
  217. package/dist/extensions/codemode/execute.js +4 -4
  218. package/dist/extensions/codemode/execute.js.map +1 -1
  219. package/dist/extensions/codemode/tool.d.ts.map +1 -1
  220. package/dist/extensions/codemode/tool.js +34 -12
  221. package/dist/extensions/codemode/tool.js.map +1 -1
  222. package/dist/extensions/llama/provider.d.ts +1 -1
  223. package/dist/extensions/llama/provider.js +1 -1
  224. package/dist/extensions/llama/provider.js.map +1 -1
  225. package/dist/extensions/llama/ui.d.ts.map +1 -1
  226. package/dist/extensions/llama/ui.js +15 -3
  227. package/dist/extensions/llama/ui.js.map +1 -1
  228. package/dist/extensions/mcp/cli.js +5 -8
  229. package/dist/extensions/mcp/cli.js.map +1 -1
  230. package/dist/extensions/mcp/index.d.ts.map +1 -1
  231. package/dist/extensions/mcp/index.js +2 -1
  232. package/dist/extensions/mcp/index.js.map +1 -1
  233. package/dist/extensions/mcp/runtime.d.ts.map +1 -1
  234. package/dist/extensions/mcp/runtime.js +3 -2
  235. package/dist/extensions/mcp/runtime.js.map +1 -1
  236. package/dist/extensions/tool-search/tool.d.ts.map +1 -1
  237. package/dist/extensions/tool-search/tool.js +18 -6
  238. package/dist/extensions/tool-search/tool.js.map +1 -1
  239. package/dist/main.d.ts.map +1 -1
  240. package/dist/main.js +67 -15
  241. package/dist/main.js.map +1 -1
  242. package/dist/modes/interactive/components/login-dialog.d.ts.map +1 -1
  243. package/dist/modes/interactive/components/login-dialog.js +2 -19
  244. package/dist/modes/interactive/components/login-dialog.js.map +1 -1
  245. package/dist/modes/interactive/components/model-selector.d.ts.map +1 -1
  246. package/dist/modes/interactive/components/model-selector.js +14 -6
  247. package/dist/modes/interactive/components/model-selector.js.map +1 -1
  248. package/dist/modes/interactive/components/oauth-selector.d.ts +10 -3
  249. package/dist/modes/interactive/components/oauth-selector.d.ts.map +1 -1
  250. package/dist/modes/interactive/components/oauth-selector.js +32 -5
  251. package/dist/modes/interactive/components/oauth-selector.js.map +1 -1
  252. package/dist/modes/interactive/components/provider-brand.d.ts +14 -0
  253. package/dist/modes/interactive/components/provider-brand.d.ts.map +1 -0
  254. package/dist/modes/interactive/components/provider-brand.js +66 -0
  255. package/dist/modes/interactive/components/provider-brand.js.map +1 -0
  256. package/dist/modes/interactive/components/radius-login-selector.d.ts +1 -2
  257. package/dist/modes/interactive/components/radius-login-selector.d.ts.map +1 -1
  258. package/dist/modes/interactive/components/radius-login-selector.js +6 -37
  259. package/dist/modes/interactive/components/radius-login-selector.js.map +1 -1
  260. package/dist/modes/interactive/components/session-selector.d.ts +6 -1
  261. package/dist/modes/interactive/components/session-selector.d.ts.map +1 -1
  262. package/dist/modes/interactive/components/session-selector.js +23 -5
  263. package/dist/modes/interactive/components/session-selector.js.map +1 -1
  264. package/dist/modes/interactive/components/tool-execution.d.ts.map +1 -1
  265. package/dist/modes/interactive/components/tool-execution.js +3 -1
  266. package/dist/modes/interactive/components/tool-execution.js.map +1 -1
  267. package/dist/modes/interactive/interactive-mode.d.ts +11 -1
  268. package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
  269. package/dist/modes/interactive/interactive-mode.js +133 -78
  270. package/dist/modes/interactive/interactive-mode.js.map +1 -1
  271. package/dist/modes/interactive/session-share.js +2 -0
  272. package/dist/modes/interactive/session-share.js.map +1 -1
  273. package/dist/package-manager-cli.d.ts.map +1 -1
  274. package/dist/package-manager-cli.js +27 -4
  275. package/dist/package-manager-cli.js.map +1 -1
  276. package/dist/prompts/commands/test-audit.md +84 -0
  277. package/dist/utils/image-resize.d.ts.map +1 -1
  278. package/dist/utils/image-resize.js +3 -1
  279. package/dist/utils/image-resize.js.map +1 -1
  280. package/dist/utils/terminal-question.d.ts +8 -0
  281. package/dist/utils/terminal-question.d.ts.map +1 -0
  282. package/dist/utils/terminal-question.js +24 -0
  283. package/dist/utils/terminal-question.js.map +1 -0
  284. package/dist/utils/web-url.d.ts +12 -0
  285. package/dist/utils/web-url.d.ts.map +1 -0
  286. package/dist/utils/web-url.js +20 -0
  287. package/dist/utils/web-url.js.map +1 -0
  288. package/docs/cli.md +14 -1
  289. package/docs/extensions.md +6 -4
  290. package/docs/llama-cpp.md +5 -5
  291. package/docs/models-configuration.md +2 -1
  292. package/docs/nvidia-rtx-llama-cpp.md +5 -5
  293. package/docs/polyphase.md +13 -1
  294. package/docs/prompt-templates.md +1 -1
  295. package/docs/providers.md +4 -2
  296. package/docs/quickstart.md +1 -1
  297. package/docs/rpc-commands.md +1 -1
  298. package/docs/rpc.md +1 -1
  299. package/docs/sessions.md +7 -1
  300. package/docs/settings.md +1 -1
  301. package/docs/tui.md +1 -1
  302. package/examples/extensions/gondolin/index.ts +4 -7
  303. package/examples/extensions/subagent/index.ts +5 -1
  304. package/package.json +10 -10
  305. package/prompts/commands/test-audit.md +84 -0
  306. package/schemas/models.schema.json +5 -1
  307. package/schemas/settings.schema.json +1 -1
  308. package/dist/bundle/chunks/anthropic-messages-TXQXPH4S.js +0 -6
  309. package/dist/bundle/chunks/chunk-6MSE6LZ3.js +0 -6
  310. package/dist/bundle/chunks/chunk-736QBNUZ.js +0 -12
  311. package/dist/bundle/chunks/chunk-AOCWORXE.js +0 -2
  312. package/dist/bundle/chunks/chunk-BIBUE2PO.js +0 -2
  313. package/dist/bundle/chunks/chunk-DQ4G4IS4.js +0 -20
  314. package/dist/bundle/chunks/chunk-J7QTCDIN.js +0 -2
  315. package/dist/bundle/chunks/chunk-NNYZSIKR.js +0 -9
  316. package/dist/bundle/chunks/chunk-SUVMF4W5.js +0 -2
  317. package/dist/bundle/chunks/chunk-THDNEOXP.js +0 -44
  318. package/dist/bundle/chunks/chunk-TIA2T6EO.js +0 -3
  319. package/dist/bundle/chunks/chunk-TK3LS5QZ.js +0 -82
  320. package/dist/bundle/chunks/chunk-TYAEYYRA.js +0 -30
  321. package/dist/bundle/chunks/google-generative-ai-NC5KHHW3.js +0 -2
  322. package/dist/bundle/chunks/google-vertex-GAPUJEF7.js +0 -2
  323. package/dist/bundle/chunks/https-proxy-agent-O2PVUIOI.js +0 -13
  324. package/dist/bundle/chunks/lib-XOG5PI3Y.js +0 -9
  325. package/dist/bundle/chunks/src-TIBHS42X.js +0 -4
  326. package/dist/bundle/chunks/virtual-modules-ZUI2T3XR.js +0 -2
  327. /package/dist/bundle/chunks/{chunk-PX3CDFUB.js → chunk-ITKDPD4D.js} +0 -0
  328. /package/dist/bundle/chunks/{chunk-ZZD35WKM.js → chunk-MOOADNVS.js} +0 -0
@@ -1,4 +1,4 @@
1
- import { APP_NAME } from "../config.js";
1
+ import { APP_NAME, CONFIG_DIR_NAME } from "../config.js";
2
2
  export class AuthCommandError extends Error {
3
3
  }
4
4
  const AUTH_COMMAND_USAGE = {
@@ -18,11 +18,35 @@ export function isAuthCommandHelp(args) {
18
18
  }
19
19
  export function printAuthCommandHelp() {
20
20
  console.log(`Usage:
21
- pi auth print-api-key [--provider <provider>] [--model <model>]
22
- pi auth print-bearer-token [--provider <provider>] [--model <model>] [--min-expiry <duration>]
23
- pi auth check [--provider <provider>] [--model <model>] [--json] [--credentials] [--no-refresh]
21
+ ${APP_NAME} auth login <provider> [--api-key] [--no-browser]
22
+ ${APP_NAME} auth logout <provider>
23
+ ${APP_NAME} auth print-api-key [--provider <provider>] [--model <model>]
24
+ ${APP_NAME} auth print-bearer-token [--provider <provider>] [--model <model>] [--min-expiry <duration>]
25
+ ${APP_NAME} auth check [--provider <provider>] [--model <model>] [--json] [--credentials] [--no-refresh]
24
26
 
25
- Auth commands require at least one of --provider or --model. Checks refresh expired OAuth credentials by default; --no-refresh prevents this. --credentials emits the credential, or includes it in JSON output.`);
27
+ Log in to and out of model providers, print their credentials for external clients, or check that they are ready.
28
+ Credentials are stored in ~/${CONFIG_DIR_NAME}/agent/auth.json.
29
+
30
+ Commands:
31
+ login <provider> Sign in with an account in the browser, or save an API key, then exit
32
+ logout <provider> Remove the stored credentials; environment variables and models.json stay
33
+ print-api-key Print the resolved API key
34
+ print-bearer-token Print a resolved OAuth bearer token (refreshes if expired)
35
+ check Print ready, not_ready, or invalid; exit with 0, 1, or 2
36
+
37
+ Options for print-api-key, print-bearer-token, and check (at least one is required):
38
+ --provider <provider> Resolve credentials for a provider
39
+ --model <model> Resolve credentials from a model
40
+
41
+ Options for login:
42
+ --api-key Save an API key instead of signing in with an account
43
+ --no-browser Do not open a browser; use another sign-in method, e.g. device code
44
+
45
+ Other options:
46
+ --min-expiry <duration> Minimum remaining token lifetime for print-bearer-token, e.g. 30m or 1h
47
+ --json Print the check result as JSON
48
+ --credentials Emit the credential from check, or include it in JSON output
49
+ --no-refresh Do not refresh expired OAuth credentials during check`);
26
50
  }
27
51
  export function parseAuthCommand(args) {
28
52
  if (args[0] !== "auth")
@@ -35,7 +59,7 @@ export function parseAuthCommand(args) {
35
59
  ? "bearer_token"
36
60
  : undefined;
37
61
  if (!kind) {
38
- throw new AuthCommandError(`Unknown auth command "${args[1] ?? ""}". Use "${APP_NAME} auth print-api-key", "${APP_NAME} auth print-bearer-token", or "${APP_NAME} auth check".`);
62
+ throw new AuthCommandError(`Unknown auth command "${args[1] ?? ""}". Use "${APP_NAME} auth login", "${APP_NAME} auth logout", "${APP_NAME} auth print-api-key", "${APP_NAME} auth print-bearer-token", or "${APP_NAME} auth check".`);
39
63
  }
40
64
  const commandArgs = [];
41
65
  let json = false;
@@ -1 +1 @@
1
- {"version":3,"file":"auth-command.js","sourceRoot":"","sources":["../../src/cli/auth-command.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AuthResult } from \"@draht/ai\";\nimport { APP_NAME } from \"../config.ts\";\nimport type { Args } from \"./args.ts\";\n\nexport type AuthCommandKind = \"check\" | \"api_key\" | \"bearer_token\";\n\nexport interface AuthCommand {\n\tkind: AuthCommandKind;\n\targs: string[];\n\tjson: boolean;\n\tcredentials: boolean;\n\tnoRefresh: boolean;\n\tminExpiryMs?: number;\n}\n\nexport class AuthCommandError extends Error {}\n\nconst AUTH_COMMAND_USAGE: Record<AuthCommandKind, string> = {\n\tcheck: `${APP_NAME} auth check --provider <provider> [--json] [--credentials] [--no-refresh]`,\n\tapi_key: `${APP_NAME} auth print-api-key --provider <provider> [--model <model>]`,\n\tbearer_token: `${APP_NAME} auth print-bearer-token --provider <provider> [--model <model>] [--min-expiry <duration>]`,\n};\n\nexport function getAuthCommandName(kind: AuthCommandKind): string {\n\treturn kind === \"check\" ? \"auth check\" : kind === \"api_key\" ? \"auth print-api-key\" : \"auth print-bearer-token\";\n}\n\nexport function getAuthCommandUsage(kind: AuthCommandKind): string {\n\treturn AUTH_COMMAND_USAGE[kind];\n}\n\nexport function isAuthCommandHelp(args: string[]): boolean {\n\treturn (\n\t\targs[0] === \"auth\" &&\n\t\t(args[1] === undefined || args[1] === \"help\" || args.includes(\"--help\") || args.includes(\"-h\"))\n\t);\n}\n\nexport function printAuthCommandHelp(): void {\n\tconsole.log(`Usage:\n pi auth print-api-key [--provider <provider>] [--model <model>]\n pi auth print-bearer-token [--provider <provider>] [--model <model>] [--min-expiry <duration>]\n pi auth check [--provider <provider>] [--model <model>] [--json] [--credentials] [--no-refresh]\n\nAuth commands require at least one of --provider or --model. Checks refresh expired OAuth credentials by default; --no-refresh prevents this. --credentials emits the credential, or includes it in JSON output.`);\n}\n\nexport function parseAuthCommand(args: string[]): AuthCommand | undefined {\n\tif (args[0] !== \"auth\") return undefined;\n\n\tconst kind =\n\t\targs[1] === \"check\"\n\t\t\t? \"check\"\n\t\t\t: args[1] === \"print-api-key\"\n\t\t\t\t? \"api_key\"\n\t\t\t\t: args[1] === \"print-bearer-token\"\n\t\t\t\t\t? \"bearer_token\"\n\t\t\t\t\t: undefined;\n\tif (!kind) {\n\t\tthrow new AuthCommandError(\n\t\t\t`Unknown auth command \"${args[1] ?? \"\"}\". Use \"${APP_NAME} auth print-api-key\", \"${APP_NAME} auth print-bearer-token\", or \"${APP_NAME} auth check\".`,\n\t\t);\n\t}\n\n\tconst commandArgs: string[] = [];\n\tlet json = false;\n\tlet credentials = false;\n\tlet noRefresh = false;\n\tlet minExpiryMs: number | undefined;\n\tfor (let index = 2; index < args.length; index++) {\n\t\tconst arg = args[index];\n\t\tif (arg === \"--min-expiry\") {\n\t\t\tif (kind !== \"bearer_token\")\n\t\t\t\tthrow new AuthCommandError(\"--min-expiry is only supported by print-bearer-token\");\n\t\t\tconst value = args[++index];\n\t\t\tconst match = value ? /^(\\d+)(ms|s|m|h)$/iu.exec(value) : undefined;\n\t\t\tif (!match) throw new AuthCommandError(\"--min-expiry must use a duration such as 30m or 1h\");\n\t\t\tconst amount = Number(match[1]);\n\t\t\tconst unit = match[2];\n\t\t\tminExpiryMs = amount * (unit === \"ms\" ? 1 : unit === \"s\" ? 1_000 : unit === \"m\" ? 60_000 : 3_600_000);\n\t\t\tcontinue;\n\t\t}\n\t\tif (arg === \"--json\" || arg === \"--credentials\" || arg === \"--no-refresh\") {\n\t\t\tif (kind !== \"check\") throw new AuthCommandError(`${arg} is only supported by auth check`);\n\t\t\tif (arg === \"--json\") json = true;\n\t\t\telse if (arg === \"--credentials\") credentials = true;\n\t\t\telse noRefresh = true;\n\t\t\tcontinue;\n\t\t}\n\t\tcommandArgs.push(arg);\n\t}\n\n\treturn minExpiryMs === undefined\n\t\t? { kind, args: commandArgs, json, credentials, noRefresh }\n\t\t: { kind, args: commandArgs, json, credentials, noRefresh, minExpiryMs };\n}\n\nexport function validateAuthCommandArgs(args: Args, kind: AuthCommandKind): { provider?: string; model?: string } {\n\tconst provider = args.provider?.trim() || undefined;\n\tconst model = args.model?.trim() || undefined;\n\tif (args.unknownFlags.size > 0) {\n\t\tconst option = args.unknownFlags.keys().next().value;\n\t\tthrow new AuthCommandError(`Unknown option --${option} for \"${getAuthCommandName(kind)}\".`);\n\t}\n\tif (args.apiKey !== undefined || args.messages.length > 0 || args.fileArgs.length > 0) {\n\t\tthrow new AuthCommandError(\"Auth commands only accept --provider and --model\");\n\t}\n\tif (kind === \"check\") {\n\t\tif (!provider && !model) {\n\t\t\tthrow new AuthCommandError(\"Auth checks require --provider <provider> or --model <model>\");\n\t\t}\n\t\treturn { provider, model };\n\t}\n\tif (!provider && !model) {\n\t\tthrow new AuthCommandError(\"Credential printing requires --provider <provider> or --model <model>\");\n\t}\n\treturn { provider, model };\n}\n\nexport function getAuthCredential(auth: AuthResult | undefined): string | undefined {\n\tif (auth?.auth.apiKey) return auth.auth.apiKey;\n\tconst authorization = Object.entries(auth?.auth.headers ?? {}).find(\n\t\t([name]) => name.toLowerCase() === \"authorization\",\n\t)?.[1];\n\treturn typeof authorization === \"string\" ? /^Bearer\\s+(.+)$/iu.exec(authorization)?.[1] : undefined;\n}\n"]}
1
+ {"version":3,"file":"auth-command.js","sourceRoot":"","sources":["../../src/cli/auth-command.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AuthResult } from \"@draht/ai\";\nimport { APP_NAME, CONFIG_DIR_NAME } from \"../config.ts\";\nimport type { Args } from \"./args.ts\";\n\nexport type AuthCommandKind = \"check\" | \"api_key\" | \"bearer_token\";\n\nexport interface AuthCommand {\n\tkind: AuthCommandKind;\n\targs: string[];\n\tjson: boolean;\n\tcredentials: boolean;\n\tnoRefresh: boolean;\n\tminExpiryMs?: number;\n}\n\nexport class AuthCommandError extends Error {}\n\nconst AUTH_COMMAND_USAGE: Record<AuthCommandKind, string> = {\n\tcheck: `${APP_NAME} auth check --provider <provider> [--json] [--credentials] [--no-refresh]`,\n\tapi_key: `${APP_NAME} auth print-api-key --provider <provider> [--model <model>]`,\n\tbearer_token: `${APP_NAME} auth print-bearer-token --provider <provider> [--model <model>] [--min-expiry <duration>]`,\n};\n\nexport function getAuthCommandName(kind: AuthCommandKind): string {\n\treturn kind === \"check\" ? \"auth check\" : kind === \"api_key\" ? \"auth print-api-key\" : \"auth print-bearer-token\";\n}\n\nexport function getAuthCommandUsage(kind: AuthCommandKind): string {\n\treturn AUTH_COMMAND_USAGE[kind];\n}\n\nexport function isAuthCommandHelp(args: string[]): boolean {\n\treturn (\n\t\targs[0] === \"auth\" &&\n\t\t(args[1] === undefined || args[1] === \"help\" || args.includes(\"--help\") || args.includes(\"-h\"))\n\t);\n}\n\nexport function printAuthCommandHelp(): void {\n\tconsole.log(`Usage:\n ${APP_NAME} auth login <provider> [--api-key] [--no-browser]\n ${APP_NAME} auth logout <provider>\n ${APP_NAME} auth print-api-key [--provider <provider>] [--model <model>]\n ${APP_NAME} auth print-bearer-token [--provider <provider>] [--model <model>] [--min-expiry <duration>]\n ${APP_NAME} auth check [--provider <provider>] [--model <model>] [--json] [--credentials] [--no-refresh]\n\nLog in to and out of model providers, print their credentials for external clients, or check that they are ready.\nCredentials are stored in ~/${CONFIG_DIR_NAME}/agent/auth.json.\n\nCommands:\n login <provider> Sign in with an account in the browser, or save an API key, then exit\n logout <provider> Remove the stored credentials; environment variables and models.json stay\n print-api-key Print the resolved API key\n print-bearer-token Print a resolved OAuth bearer token (refreshes if expired)\n check Print ready, not_ready, or invalid; exit with 0, 1, or 2\n\nOptions for print-api-key, print-bearer-token, and check (at least one is required):\n --provider <provider> Resolve credentials for a provider\n --model <model> Resolve credentials from a model\n\nOptions for login:\n --api-key Save an API key instead of signing in with an account\n --no-browser Do not open a browser; use another sign-in method, e.g. device code\n\nOther options:\n --min-expiry <duration> Minimum remaining token lifetime for print-bearer-token, e.g. 30m or 1h\n --json Print the check result as JSON\n --credentials Emit the credential from check, or include it in JSON output\n --no-refresh Do not refresh expired OAuth credentials during check`);\n}\n\nexport function parseAuthCommand(args: string[]): AuthCommand | undefined {\n\tif (args[0] !== \"auth\") return undefined;\n\n\tconst kind =\n\t\targs[1] === \"check\"\n\t\t\t? \"check\"\n\t\t\t: args[1] === \"print-api-key\"\n\t\t\t\t? \"api_key\"\n\t\t\t\t: args[1] === \"print-bearer-token\"\n\t\t\t\t\t? \"bearer_token\"\n\t\t\t\t\t: undefined;\n\tif (!kind) {\n\t\tthrow new AuthCommandError(\n\t\t\t`Unknown auth command \"${args[1] ?? \"\"}\". Use \"${APP_NAME} auth login\", \"${APP_NAME} auth logout\", \"${APP_NAME} auth print-api-key\", \"${APP_NAME} auth print-bearer-token\", or \"${APP_NAME} auth check\".`,\n\t\t);\n\t}\n\n\tconst commandArgs: string[] = [];\n\tlet json = false;\n\tlet credentials = false;\n\tlet noRefresh = false;\n\tlet minExpiryMs: number | undefined;\n\tfor (let index = 2; index < args.length; index++) {\n\t\tconst arg = args[index];\n\t\tif (arg === \"--min-expiry\") {\n\t\t\tif (kind !== \"bearer_token\")\n\t\t\t\tthrow new AuthCommandError(\"--min-expiry is only supported by print-bearer-token\");\n\t\t\tconst value = args[++index];\n\t\t\tconst match = value ? /^(\\d+)(ms|s|m|h)$/iu.exec(value) : undefined;\n\t\t\tif (!match) throw new AuthCommandError(\"--min-expiry must use a duration such as 30m or 1h\");\n\t\t\tconst amount = Number(match[1]);\n\t\t\tconst unit = match[2];\n\t\t\tminExpiryMs = amount * (unit === \"ms\" ? 1 : unit === \"s\" ? 1_000 : unit === \"m\" ? 60_000 : 3_600_000);\n\t\t\tcontinue;\n\t\t}\n\t\tif (arg === \"--json\" || arg === \"--credentials\" || arg === \"--no-refresh\") {\n\t\t\tif (kind !== \"check\") throw new AuthCommandError(`${arg} is only supported by auth check`);\n\t\t\tif (arg === \"--json\") json = true;\n\t\t\telse if (arg === \"--credentials\") credentials = true;\n\t\t\telse noRefresh = true;\n\t\t\tcontinue;\n\t\t}\n\t\tcommandArgs.push(arg);\n\t}\n\n\treturn minExpiryMs === undefined\n\t\t? { kind, args: commandArgs, json, credentials, noRefresh }\n\t\t: { kind, args: commandArgs, json, credentials, noRefresh, minExpiryMs };\n}\n\nexport function validateAuthCommandArgs(args: Args, kind: AuthCommandKind): { provider?: string; model?: string } {\n\tconst provider = args.provider?.trim() || undefined;\n\tconst model = args.model?.trim() || undefined;\n\tif (args.unknownFlags.size > 0) {\n\t\tconst option = args.unknownFlags.keys().next().value;\n\t\tthrow new AuthCommandError(`Unknown option --${option} for \"${getAuthCommandName(kind)}\".`);\n\t}\n\tif (args.apiKey !== undefined || args.messages.length > 0 || args.fileArgs.length > 0) {\n\t\tthrow new AuthCommandError(\"Auth commands only accept --provider and --model\");\n\t}\n\tif (kind === \"check\") {\n\t\tif (!provider && !model) {\n\t\t\tthrow new AuthCommandError(\"Auth checks require --provider <provider> or --model <model>\");\n\t\t}\n\t\treturn { provider, model };\n\t}\n\tif (!provider && !model) {\n\t\tthrow new AuthCommandError(\"Credential printing requires --provider <provider> or --model <model>\");\n\t}\n\treturn { provider, model };\n}\n\nexport function getAuthCredential(auth: AuthResult | undefined): string | undefined {\n\tif (auth?.auth.apiKey) return auth.auth.apiKey;\n\tconst authorization = Object.entries(auth?.auth.headers ?? {}).find(\n\t\t([name]) => name.toLowerCase() === \"authorization\",\n\t)?.[1];\n\treturn typeof authorization === \"string\" ? /^Bearer\\s+(.+)$/iu.exec(authorization)?.[1] : undefined;\n}\n"]}
@@ -0,0 +1,15 @@
1
+ import { type ModelRuntime } from "../core/model-runtime.ts";
2
+ import type { LoginTerminal } from "./auth-terminal.ts";
3
+ /** Dependencies of `runAuthLogin`, injected so tests can script the terminal. */
4
+ export interface AuthLoginOptions {
5
+ modelRuntime: ModelRuntime;
6
+ terminal: LoginTerminal;
7
+ agentDir: string;
8
+ cwd: string;
9
+ getDeviceId: () => string;
10
+ /** Aborts the login, e.g. on Ctrl+C. */
11
+ signal: AbortSignal;
12
+ }
13
+ /** Run `draht auth login <provider>` in the terminal and return the process exit code. */
14
+ export declare function runAuthLogin(args: string[], options: AuthLoginOptions): Promise<number>;
15
+ //# sourceMappingURL=auth-login.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auth-login.d.ts","sourceRoot":"","sources":["../../src/cli/auth-login.ts"],"names":[],"mappings":"AAGA,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAO7F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,iFAAiF;AACjF,MAAM,WAAW,gBAAgB;IAChC,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,wCAAwC;IACxC,MAAM,EAAE,WAAW,CAAC;CACpB;AAaD,0FAA0F;AAC1F,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAwD7F"}
@@ -0,0 +1,232 @@
1
+ import { replaceControlCharacters } from "@draht/tui";
2
+ import { APP_NAME, getAuthPath } from "../config.js";
3
+ import { CredentialSynchronizationError } from "../core/model-runtime.js";
4
+ import { findMatchingProviders } from "../core/provider-matching.js";
5
+ import { RADIUS_PROVIDER_ID } from "../core/radius.js";
6
+ import { planRadiusMcpServer } from "../core/radius-mcp.js";
7
+ import { addMcpServerConfig } from "../extensions/mcp/config.js";
8
+ import { displayUrl, webUrl } from "../utils/web-url.js";
9
+ const AUTH_LOGIN_USAGE = `${APP_NAME} auth login <provider> [--api-key] [--no-browser]`;
10
+ /** Run `draht auth login <provider>` in the terminal and return the process exit code. */
11
+ export async function runAuthLogin(args, options) {
12
+ const { modelRuntime, terminal, signal } = options;
13
+ const parsed = parseLoginRequest(args);
14
+ if (parsed.type === "invalid") {
15
+ terminal.error(parsed.message);
16
+ return 1;
17
+ }
18
+ const { request } = parsed;
19
+ const { providerRef } = request;
20
+ const provider = findMatchingProviders(modelRuntime.getProviders(), providerRef)[0];
21
+ if (!provider) {
22
+ const loginProviders = modelRuntime
23
+ .getProviders()
24
+ .filter((candidate) => candidate.auth.oauth || candidate.auth.apiKey?.login)
25
+ .map((candidate) => candidate.id)
26
+ .sort();
27
+ terminal.error(`Unknown provider "${replaceControlCharacters(providerRef)}".`);
28
+ terminal.error(`Providers: ${loginProviders.join(", ")}`);
29
+ return 1;
30
+ }
31
+ if (!terminal.interactive) {
32
+ terminal.error(`"${AUTH_LOGIN_USAGE}" requires an interactive terminal`);
33
+ return 1;
34
+ }
35
+ const authType = selectAuthType(provider, request.apiKey);
36
+ if (authType.type === "unavailable") {
37
+ terminal.error(authType.message);
38
+ return 1;
39
+ }
40
+ try {
41
+ await modelRuntime.login(provider.id, authType.type, createLoginInteraction(provider.id, authType.type, request, terminal, signal), { getDeviceId: options.getDeviceId });
42
+ }
43
+ catch (error) {
44
+ const message = error instanceof Error ? error.message : String(error);
45
+ if (error instanceof CredentialSynchronizationError) {
46
+ terminal.error(`Logged in to ${provider.name}, but local model state could not be synchronized: ${message}`);
47
+ }
48
+ else if (signal.aborted || message === "Login cancelled") {
49
+ terminal.error("Login cancelled.");
50
+ }
51
+ else {
52
+ terminal.error(`Failed to log in to ${provider.name}: ${message}`);
53
+ }
54
+ return 1;
55
+ }
56
+ terminal.write(`${authType.type === "oauth" ? `Logged in to ${provider.name}` : `Saved API key for ${provider.name}`}. Credentials saved to ${getAuthPath()}`);
57
+ await refreshProviderCatalog(provider, modelRuntime, terminal, signal);
58
+ if (provider.id === RADIUS_PROVIDER_ID)
59
+ configureRadiusMcpServer(provider, options);
60
+ return 0;
61
+ }
62
+ function parseLoginRequest(args) {
63
+ const usage = { type: "invalid", message: `Usage: ${AUTH_LOGIN_USAGE}` };
64
+ const request = { providerRef: "", apiKey: false, browser: true };
65
+ for (const arg of args) {
66
+ if (arg === "--api-key")
67
+ request.apiKey = true;
68
+ else if (arg === "--no-browser")
69
+ request.browser = false;
70
+ else if (arg.startsWith("-") || request.providerRef)
71
+ return usage;
72
+ else
73
+ request.providerRef = arg;
74
+ }
75
+ if (!request.providerRef)
76
+ return usage;
77
+ if (request.apiKey && !request.browser) {
78
+ return { type: "invalid", message: "--no-browser only applies to account sign-in; omit it with --api-key." };
79
+ }
80
+ return { type: "valid", request };
81
+ }
82
+ /**
83
+ * Account login unless `apiKey` asks for an API key. Providers without account login use their API key login, since
84
+ * that is the only way in.
85
+ */
86
+ function selectAuthType(provider, apiKey) {
87
+ const hasApiKeyLogin = provider.auth.apiKey?.login !== undefined;
88
+ if (!apiKey && provider.auth.oauth)
89
+ return { type: "oauth" };
90
+ if (hasApiKeyLogin)
91
+ return { type: "api_key" };
92
+ if (apiKey && provider.auth.oauth) {
93
+ return { type: "unavailable", message: `${provider.name} has no API key login. Omit --api-key to sign in.` };
94
+ }
95
+ const method = provider.auth.apiKey?.name ?? "ambient credentials";
96
+ return { type: "unavailable", message: `${provider.name} is configured outside ${APP_NAME} (${method}).` };
97
+ }
98
+ /** Adapt provider prompts and events to the command's selected sign-in method. */
99
+ function createLoginInteraction(providerId, authType, request, terminal, signal) {
100
+ // Account logins list the browser sign-in first, as /login; API key setup asks every selection.
101
+ const methodChoice = authType === "api_key" ? "ask" : request.browser ? "browser" : "other";
102
+ let skippedMethods = [];
103
+ async function selectMethod(prompt, promptSignal) {
104
+ const [first, ...others] = prompt.options;
105
+ if (methodChoice === "ask" || !first) {
106
+ return selectInTerminal(prompt.message, prompt.options, terminal, promptSignal);
107
+ }
108
+ if (methodChoice === "browser") {
109
+ skippedMethods = others.map((option) => option.label);
110
+ return first.id;
111
+ }
112
+ const [onlyOther, ...moreOthers] = others;
113
+ // A provider whose only method is the browser sign-in still gets it, without opening the browser.
114
+ if (!onlyOther)
115
+ return first.id;
116
+ if (moreOthers.length > 0)
117
+ return selectInTerminal(prompt.message, others, terminal, promptSignal);
118
+ terminal.write(`${prompt.message} ${onlyOther.label}`);
119
+ return onlyOther.id;
120
+ }
121
+ return {
122
+ signal,
123
+ prompt(prompt) {
124
+ // The browser callback can finish a step before the pasted code, cancelling just that prompt.
125
+ const promptSignal = prompt.signal ? AbortSignal.any([signal, prompt.signal]) : signal;
126
+ if (prompt.type === "select")
127
+ return selectMethod(prompt, promptSignal);
128
+ const placeholder = prompt.placeholder ? ` (${prompt.placeholder})` : "";
129
+ const message = `${prompt.message}${placeholder}: `;
130
+ return prompt.type === "secret"
131
+ ? terminal.secret(message, promptSignal)
132
+ : terminal.question(message, promptSignal);
133
+ },
134
+ notify(event) {
135
+ if (event.type === "auth_url") {
136
+ terminal.write(`Open this URL to sign in:\n ${displayUrl(event.url)}`);
137
+ if (event.instructions)
138
+ terminal.write(event.instructions);
139
+ const target = webUrl(event.url);
140
+ if (target !== undefined && request.browser)
141
+ terminal.openUrl(target);
142
+ // Providers without a method choice have nothing else to offer, so they get no hint.
143
+ const rerun = `"${APP_NAME} auth login ${providerId} --no-browser"`;
144
+ const [onlyMethod, ...moreMethods] = skippedMethods;
145
+ if (onlyMethod !== undefined && moreMethods.length === 0) {
146
+ terminal.write(`To use "${onlyMethod}" instead, run ${rerun}`);
147
+ }
148
+ else if (onlyMethod !== undefined) {
149
+ const labels = skippedMethods.map((label) => `"${label}"`).join(", ");
150
+ terminal.write(`Other sign-in methods: ${labels}. Run ${rerun} to choose one.`);
151
+ }
152
+ }
153
+ else if (event.type === "device_code") {
154
+ terminal.write(`Open ${displayUrl(event.verificationUri)} and enter code: ${event.userCode}`);
155
+ const target = webUrl(event.verificationUri);
156
+ if (target !== undefined && request.browser && event.openBrowserOnConfirm !== false) {
157
+ terminal.openUrl(target);
158
+ }
159
+ terminal.write("Waiting for authentication...");
160
+ }
161
+ else if (event.type === "info") {
162
+ terminal.write(event.message);
163
+ for (const link of event.links ?? []) {
164
+ terminal.write(` ${link.label ? `${link.label}: ` : ""}${displayUrl(link.url)}`);
165
+ }
166
+ }
167
+ else {
168
+ terminal.write(event.message);
169
+ }
170
+ },
171
+ };
172
+ }
173
+ async function selectInTerminal(message, options, terminal, signal) {
174
+ terminal.write(message);
175
+ options.forEach((option, index) => {
176
+ terminal.write(` ${index + 1}. ${option.label}${option.description ? ` - ${option.description}` : ""}`);
177
+ });
178
+ while (true) {
179
+ const answer = (await terminal.question(`Select 1-${options.length}: `, signal)).trim();
180
+ const option = /^\d+$/u.test(answer) ? options[Number(answer) - 1] : undefined;
181
+ if (option)
182
+ return option.id;
183
+ terminal.write(`Enter a number from 1 to ${options.length}.`);
184
+ }
185
+ }
186
+ /** Fetch the provider's model catalog now, since dynamic catalogs stay empty until the first authenticated refresh. */
187
+ async function refreshProviderCatalog(provider, modelRuntime, terminal, signal) {
188
+ // The login is saved by now, so Ctrl+C only skips the refresh.
189
+ const cancelled = () => {
190
+ terminal.write(`Skipped the ${provider.name} model catalog refresh; ${APP_NAME} refreshes it on next start.`);
191
+ };
192
+ try {
193
+ const result = await modelRuntime.refresh({
194
+ providers: [provider.id],
195
+ signal: AbortSignal.any([signal, AbortSignal.timeout(15_000)]),
196
+ });
197
+ if (signal.aborted) {
198
+ cancelled();
199
+ }
200
+ else if (result.aborted) {
201
+ terminal.write(`The ${provider.name} model catalog refresh timed out; ${APP_NAME} refreshes it on next start.`);
202
+ }
203
+ else if (result.errors.size > 0) {
204
+ terminal.write(`The ${provider.name} model catalog could not be refreshed; ${APP_NAME} retries on next start.`);
205
+ }
206
+ }
207
+ catch (error) {
208
+ if (signal.aborted) {
209
+ cancelled();
210
+ return;
211
+ }
212
+ terminal.write(`The ${provider.name} model catalog could not be refreshed: ${error instanceof Error ? error.message : String(error)}`);
213
+ }
214
+ }
215
+ /**
216
+ * Point the Radius MCP server in the global mcp.json at the Radius login without asking, since the login is what the
217
+ * server needs; /login asks instead. Nothing changes when a global server already uses this login.
218
+ */
219
+ function configureRadiusMcpServer(provider, options) {
220
+ const { terminal } = options;
221
+ const plan = planRadiusMcpServer(provider.id, options.agentDir, options.cwd);
222
+ if (!plan)
223
+ return;
224
+ try {
225
+ const replaced = addMcpServerConfig(plan.mcpPath, plan.name, plan.config);
226
+ terminal.write(`${replaced ? "Updated" : "Added"} MCP server "${plan.name}" in ${plan.mcpPath} to use the ${provider.name} login.`);
227
+ }
228
+ catch (error) {
229
+ terminal.error(`Could not update ${plan.mcpPath}: ${error instanceof Error ? error.message : String(error)}`);
230
+ }
231
+ }
232
+ //# sourceMappingURL=auth-login.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auth-login.js","sourceRoot":"","sources":["../../src/cli/auth-login.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AuthInteraction, AuthPrompt, AuthType, Provider } from \"@draht/ai\";\nimport { replaceControlCharacters } from \"@draht/tui\";\nimport { APP_NAME, getAuthPath } from \"../config.ts\";\nimport { CredentialSynchronizationError, type ModelRuntime } from \"../core/model-runtime.ts\";\nimport { findMatchingProviders } from \"../core/provider-matching.ts\";\nimport { RADIUS_PROVIDER_ID } from \"../core/radius.ts\";\nimport { planRadiusMcpServer } from \"../core/radius-mcp.ts\";\nimport { addMcpServerConfig } from \"../extensions/mcp/config.ts\";\nimport { displayUrl, webUrl } from \"../utils/web-url.ts\";\n\nimport type { LoginTerminal } from \"./auth-terminal.ts\";\n\n/** Dependencies of `runAuthLogin`, injected so tests can script the terminal. */\nexport interface AuthLoginOptions {\n\tmodelRuntime: ModelRuntime;\n\tterminal: LoginTerminal;\n\tagentDir: string;\n\tcwd: string;\n\tgetDeviceId: () => string;\n\t/** Aborts the login, e.g. on Ctrl+C. */\n\tsignal: AbortSignal;\n}\n\nconst AUTH_LOGIN_USAGE = `${APP_NAME} auth login <provider> [--api-key] [--no-browser]`;\n\n/** Parsed `draht auth login` arguments. */\ninterface LoginRequest {\n\tproviderRef: string;\n\t/** Log in with an API key instead of an account. */\n\tapiKey: boolean;\n\t/** Open the browser and take the browser sign-in method without asking. */\n\tbrowser: boolean;\n}\n\n/** Run `draht auth login <provider>` in the terminal and return the process exit code. */\nexport async function runAuthLogin(args: string[], options: AuthLoginOptions): Promise<number> {\n\tconst { modelRuntime, terminal, signal } = options;\n\tconst parsed = parseLoginRequest(args);\n\tif (parsed.type === \"invalid\") {\n\t\tterminal.error(parsed.message);\n\t\treturn 1;\n\t}\n\tconst { request } = parsed;\n\tconst { providerRef } = request;\n\n\tconst provider = findMatchingProviders(modelRuntime.getProviders(), providerRef)[0];\n\tif (!provider) {\n\t\tconst loginProviders = modelRuntime\n\t\t\t.getProviders()\n\t\t\t.filter((candidate) => candidate.auth.oauth || candidate.auth.apiKey?.login)\n\t\t\t.map((candidate) => candidate.id)\n\t\t\t.sort();\n\t\tterminal.error(`Unknown provider \"${replaceControlCharacters(providerRef)}\".`);\n\t\tterminal.error(`Providers: ${loginProviders.join(\", \")}`);\n\t\treturn 1;\n\t}\n\tif (!terminal.interactive) {\n\t\tterminal.error(`\"${AUTH_LOGIN_USAGE}\" requires an interactive terminal`);\n\t\treturn 1;\n\t}\n\n\tconst authType = selectAuthType(provider, request.apiKey);\n\tif (authType.type === \"unavailable\") {\n\t\tterminal.error(authType.message);\n\t\treturn 1;\n\t}\n\ttry {\n\t\tawait modelRuntime.login(\n\t\t\tprovider.id,\n\t\t\tauthType.type,\n\t\t\tcreateLoginInteraction(provider.id, authType.type, request, terminal, signal),\n\t\t\t{ getDeviceId: options.getDeviceId },\n\t\t);\n\t} catch (error: unknown) {\n\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\tif (error instanceof CredentialSynchronizationError) {\n\t\t\tterminal.error(`Logged in to ${provider.name}, but local model state could not be synchronized: ${message}`);\n\t\t} else if (signal.aborted || message === \"Login cancelled\") {\n\t\t\tterminal.error(\"Login cancelled.\");\n\t\t} else {\n\t\t\tterminal.error(`Failed to log in to ${provider.name}: ${message}`);\n\t\t}\n\t\treturn 1;\n\t}\n\n\tterminal.write(\n\t\t`${authType.type === \"oauth\" ? `Logged in to ${provider.name}` : `Saved API key for ${provider.name}`}. Credentials saved to ${getAuthPath()}`,\n\t);\n\tawait refreshProviderCatalog(provider, modelRuntime, terminal, signal);\n\tif (provider.id === RADIUS_PROVIDER_ID) configureRadiusMcpServer(provider, options);\n\treturn 0;\n}\n\nfunction parseLoginRequest(\n\targs: string[],\n): { type: \"valid\"; request: LoginRequest } | { type: \"invalid\"; message: string } {\n\tconst usage = { type: \"invalid\", message: `Usage: ${AUTH_LOGIN_USAGE}` } as const;\n\tconst request: LoginRequest = { providerRef: \"\", apiKey: false, browser: true };\n\tfor (const arg of args) {\n\t\tif (arg === \"--api-key\") request.apiKey = true;\n\t\telse if (arg === \"--no-browser\") request.browser = false;\n\t\telse if (arg.startsWith(\"-\") || request.providerRef) return usage;\n\t\telse request.providerRef = arg;\n\t}\n\tif (!request.providerRef) return usage;\n\tif (request.apiKey && !request.browser) {\n\t\treturn { type: \"invalid\", message: \"--no-browser only applies to account sign-in; omit it with --api-key.\" };\n\t}\n\treturn { type: \"valid\", request };\n}\n\n/**\n * Account login unless `apiKey` asks for an API key. Providers without account login use their API key login, since\n * that is the only way in.\n */\nfunction selectAuthType(\n\tprovider: Provider,\n\tapiKey: boolean,\n): { type: AuthType } | { type: \"unavailable\"; message: string } {\n\tconst hasApiKeyLogin = provider.auth.apiKey?.login !== undefined;\n\tif (!apiKey && provider.auth.oauth) return { type: \"oauth\" };\n\tif (hasApiKeyLogin) return { type: \"api_key\" };\n\tif (apiKey && provider.auth.oauth) {\n\t\treturn { type: \"unavailable\", message: `${provider.name} has no API key login. Omit --api-key to sign in.` };\n\t}\n\tconst method = provider.auth.apiKey?.name ?? \"ambient credentials\";\n\treturn { type: \"unavailable\", message: `${provider.name} is configured outside ${APP_NAME} (${method}).` };\n}\n\n/** Adapt provider prompts and events to the command's selected sign-in method. */\nfunction createLoginInteraction(\n\tproviderId: string,\n\tauthType: AuthType,\n\trequest: LoginRequest,\n\tterminal: LoginTerminal,\n\tsignal: AbortSignal,\n): AuthInteraction {\n\t// Account logins list the browser sign-in first, as /login; API key setup asks every selection.\n\tconst methodChoice = authType === \"api_key\" ? \"ask\" : request.browser ? \"browser\" : \"other\";\n\tlet skippedMethods: string[] = [];\n\n\tasync function selectMethod(prompt: Extract<AuthPrompt, { type: \"select\" }>, promptSignal: AbortSignal) {\n\t\tconst [first, ...others] = prompt.options;\n\t\tif (methodChoice === \"ask\" || !first) {\n\t\t\treturn selectInTerminal(prompt.message, prompt.options, terminal, promptSignal);\n\t\t}\n\t\tif (methodChoice === \"browser\") {\n\t\t\tskippedMethods = others.map((option) => option.label);\n\t\t\treturn first.id;\n\t\t}\n\t\tconst [onlyOther, ...moreOthers] = others;\n\t\t// A provider whose only method is the browser sign-in still gets it, without opening the browser.\n\t\tif (!onlyOther) return first.id;\n\t\tif (moreOthers.length > 0) return selectInTerminal(prompt.message, others, terminal, promptSignal);\n\t\tterminal.write(`${prompt.message} ${onlyOther.label}`);\n\t\treturn onlyOther.id;\n\t}\n\n\treturn {\n\t\tsignal,\n\t\tprompt(prompt) {\n\t\t\t// The browser callback can finish a step before the pasted code, cancelling just that prompt.\n\t\t\tconst promptSignal = prompt.signal ? AbortSignal.any([signal, prompt.signal]) : signal;\n\t\t\tif (prompt.type === \"select\") return selectMethod(prompt, promptSignal);\n\t\t\tconst placeholder = prompt.placeholder ? ` (${prompt.placeholder})` : \"\";\n\t\t\tconst message = `${prompt.message}${placeholder}: `;\n\t\t\treturn prompt.type === \"secret\"\n\t\t\t\t? terminal.secret(message, promptSignal)\n\t\t\t\t: terminal.question(message, promptSignal);\n\t\t},\n\t\tnotify(event) {\n\t\t\tif (event.type === \"auth_url\") {\n\t\t\t\tterminal.write(`Open this URL to sign in:\\n ${displayUrl(event.url)}`);\n\t\t\t\tif (event.instructions) terminal.write(event.instructions);\n\t\t\t\tconst target = webUrl(event.url);\n\t\t\t\tif (target !== undefined && request.browser) terminal.openUrl(target);\n\t\t\t\t// Providers without a method choice have nothing else to offer, so they get no hint.\n\t\t\t\tconst rerun = `\"${APP_NAME} auth login ${providerId} --no-browser\"`;\n\t\t\t\tconst [onlyMethod, ...moreMethods] = skippedMethods;\n\t\t\t\tif (onlyMethod !== undefined && moreMethods.length === 0) {\n\t\t\t\t\tterminal.write(`To use \"${onlyMethod}\" instead, run ${rerun}`);\n\t\t\t\t} else if (onlyMethod !== undefined) {\n\t\t\t\t\tconst labels = skippedMethods.map((label) => `\"${label}\"`).join(\", \");\n\t\t\t\t\tterminal.write(`Other sign-in methods: ${labels}. Run ${rerun} to choose one.`);\n\t\t\t\t}\n\t\t\t} else if (event.type === \"device_code\") {\n\t\t\t\tterminal.write(`Open ${displayUrl(event.verificationUri)} and enter code: ${event.userCode}`);\n\t\t\t\tconst target = webUrl(event.verificationUri);\n\t\t\t\tif (target !== undefined && request.browser && event.openBrowserOnConfirm !== false) {\n\t\t\t\t\tterminal.openUrl(target);\n\t\t\t\t}\n\t\t\t\tterminal.write(\"Waiting for authentication...\");\n\t\t\t} else if (event.type === \"info\") {\n\t\t\t\tterminal.write(event.message);\n\t\t\t\tfor (const link of event.links ?? []) {\n\t\t\t\t\tterminal.write(` ${link.label ? `${link.label}: ` : \"\"}${displayUrl(link.url)}`);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tterminal.write(event.message);\n\t\t\t}\n\t\t},\n\t};\n}\n\nasync function selectInTerminal(\n\tmessage: string,\n\toptions: readonly { id: string; label: string; description?: string }[],\n\tterminal: LoginTerminal,\n\tsignal: AbortSignal,\n): Promise<string> {\n\tterminal.write(message);\n\toptions.forEach((option, index) => {\n\t\tterminal.write(` ${index + 1}. ${option.label}${option.description ? ` - ${option.description}` : \"\"}`);\n\t});\n\twhile (true) {\n\t\tconst answer = (await terminal.question(`Select 1-${options.length}: `, signal)).trim();\n\t\tconst option = /^\\d+$/u.test(answer) ? options[Number(answer) - 1] : undefined;\n\t\tif (option) return option.id;\n\t\tterminal.write(`Enter a number from 1 to ${options.length}.`);\n\t}\n}\n\n/** Fetch the provider's model catalog now, since dynamic catalogs stay empty until the first authenticated refresh. */\nasync function refreshProviderCatalog(\n\tprovider: Provider,\n\tmodelRuntime: ModelRuntime,\n\tterminal: LoginTerminal,\n\tsignal: AbortSignal,\n) {\n\t// The login is saved by now, so Ctrl+C only skips the refresh.\n\tconst cancelled = () => {\n\t\tterminal.write(`Skipped the ${provider.name} model catalog refresh; ${APP_NAME} refreshes it on next start.`);\n\t};\n\ttry {\n\t\tconst result = await modelRuntime.refresh({\n\t\t\tproviders: [provider.id],\n\t\t\tsignal: AbortSignal.any([signal, AbortSignal.timeout(15_000)]),\n\t\t});\n\t\tif (signal.aborted) {\n\t\t\tcancelled();\n\t\t} else if (result.aborted) {\n\t\t\tterminal.write(\n\t\t\t\t`The ${provider.name} model catalog refresh timed out; ${APP_NAME} refreshes it on next start.`,\n\t\t\t);\n\t\t} else if (result.errors.size > 0) {\n\t\t\tterminal.write(\n\t\t\t\t`The ${provider.name} model catalog could not be refreshed; ${APP_NAME} retries on next start.`,\n\t\t\t);\n\t\t}\n\t} catch (error: unknown) {\n\t\tif (signal.aborted) {\n\t\t\tcancelled();\n\t\t\treturn;\n\t\t}\n\t\tterminal.write(\n\t\t\t`The ${provider.name} model catalog could not be refreshed: ${error instanceof Error ? error.message : String(error)}`,\n\t\t);\n\t}\n}\n\n/**\n * Point the Radius MCP server in the global mcp.json at the Radius login without asking, since the login is what the\n * server needs; /login asks instead. Nothing changes when a global server already uses this login.\n */\nfunction configureRadiusMcpServer(provider: Provider, options: AuthLoginOptions): void {\n\tconst { terminal } = options;\n\tconst plan = planRadiusMcpServer(provider.id, options.agentDir, options.cwd);\n\tif (!plan) return;\n\ttry {\n\t\tconst replaced = addMcpServerConfig(plan.mcpPath, plan.name, plan.config);\n\t\tterminal.write(\n\t\t\t`${replaced ? \"Updated\" : \"Added\"} MCP server \"${plan.name}\" in ${plan.mcpPath} to use the ${provider.name} login.`,\n\t\t);\n\t} catch (error: unknown) {\n\t\tterminal.error(`Could not update ${plan.mcpPath}: ${error instanceof Error ? error.message : String(error)}`);\n\t}\n}\n"]}
@@ -0,0 +1,14 @@
1
+ import { type ModelRuntime } from "../core/model-runtime.ts";
2
+ import type { AuthOutput } from "./auth-terminal.ts";
3
+ /** Dependencies of `runAuthLogout`, injected so tests can capture the output. */
4
+ export interface AuthLogoutOptions {
5
+ modelRuntime: ModelRuntime;
6
+ terminal: AuthOutput;
7
+ signal: AbortSignal;
8
+ }
9
+ /**
10
+ * Run `draht auth logout <provider>`: remove the credential `draht auth login` or /login stored, and return the exit code.
11
+ * Environment variables and models.json config stay, as with /logout.
12
+ */
13
+ export declare function runAuthLogout(args: string[], options: AuthLogoutOptions): Promise<number>;
14
+ //# sourceMappingURL=auth-logout.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auth-logout.d.ts","sourceRoot":"","sources":["../../src/cli/auth-logout.ts"],"names":[],"mappings":"AAGA,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,iFAAiF;AACjF,MAAM,WAAW,iBAAiB;IACjC,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,UAAU,CAAC;IACrB,MAAM,EAAE,WAAW,CAAC;CACpB;AAID;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmD/F"}
@@ -0,0 +1,57 @@
1
+ import { replaceControlCharacters } from "@draht/tui";
2
+ import { APP_NAME } from "../config.js";
3
+ import { CredentialSynchronizationError } from "../core/model-runtime.js";
4
+ import { findMatchingProviders } from "../core/provider-matching.js";
5
+ const AUTH_LOGOUT_USAGE = `${APP_NAME} auth logout <provider>`;
6
+ /**
7
+ * Run `draht auth logout <provider>`: remove the credential `draht auth login` or /login stored, and return the exit code.
8
+ * Environment variables and models.json config stay, as with /logout.
9
+ */
10
+ export async function runAuthLogout(args, options) {
11
+ const { modelRuntime, terminal, signal } = options;
12
+ const [providerRef, ...rest] = args;
13
+ if (providerRef === undefined || providerRef.startsWith("-") || rest.length > 0) {
14
+ terminal.error(`Usage: ${AUTH_LOGOUT_USAGE}`);
15
+ return 1;
16
+ }
17
+ let stored;
18
+ try {
19
+ stored = await modelRuntime.listCredentials({ signal });
20
+ }
21
+ catch (error) {
22
+ terminal.error(`Could not read stored credentials: ${error instanceof Error ? error.message : String(error)}`);
23
+ return 1;
24
+ }
25
+ const provider = findMatchingProviders(modelRuntime.getProviders(), providerRef)[0];
26
+ // Providers registered by extensions are not loaded here, so their stored credentials match by id alone.
27
+ const credential = stored.find((candidate) => candidate.providerId === (provider?.id ?? providerRef));
28
+ if (!provider && !credential) {
29
+ terminal.error(`Unknown provider "${replaceControlCharacters(providerRef)}".`);
30
+ const storedIds = stored.map((credential) => credential.providerId).sort();
31
+ terminal.error(`Stored credentials: ${storedIds.join(", ") || "none"}`);
32
+ return 1;
33
+ }
34
+ const providerName = provider?.name ?? providerRef;
35
+ if (!credential) {
36
+ terminal.write(`No stored credentials for ${providerName}. Environment variables and models.json config are unchanged.`);
37
+ return 0;
38
+ }
39
+ try {
40
+ await modelRuntime.logout(credential.providerId, { signal });
41
+ }
42
+ catch (error) {
43
+ const message = error instanceof Error ? error.message : String(error);
44
+ if (error instanceof CredentialSynchronizationError) {
45
+ terminal.error(`Credentials removed for ${providerName}, but local model state could not be synchronized: ${message}`);
46
+ }
47
+ else {
48
+ terminal.error(`Logout failed: ${message}`);
49
+ }
50
+ return 1;
51
+ }
52
+ terminal.write(credential.type === "oauth"
53
+ ? `Logged out of ${providerName}.`
54
+ : `Removed stored API key for ${providerName}. Environment variables and models.json config are unchanged.`);
55
+ return 0;
56
+ }
57
+ //# sourceMappingURL=auth-logout.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auth-logout.js","sourceRoot":"","sources":["../../src/cli/auth-logout.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CredentialInfo } from \"@draht/ai\";\nimport { replaceControlCharacters } from \"@draht/tui\";\nimport { APP_NAME } from \"../config.ts\";\nimport { CredentialSynchronizationError, type ModelRuntime } from \"../core/model-runtime.ts\";\nimport { findMatchingProviders } from \"../core/provider-matching.ts\";\nimport type { AuthOutput } from \"./auth-terminal.ts\";\n\n/** Dependencies of `runAuthLogout`, injected so tests can capture the output. */\nexport interface AuthLogoutOptions {\n\tmodelRuntime: ModelRuntime;\n\tterminal: AuthOutput;\n\tsignal: AbortSignal;\n}\n\nconst AUTH_LOGOUT_USAGE = `${APP_NAME} auth logout <provider>`;\n\n/**\n * Run `draht auth logout <provider>`: remove the credential `draht auth login` or /login stored, and return the exit code.\n * Environment variables and models.json config stay, as with /logout.\n */\nexport async function runAuthLogout(args: string[], options: AuthLogoutOptions): Promise<number> {\n\tconst { modelRuntime, terminal, signal } = options;\n\tconst [providerRef, ...rest] = args;\n\tif (providerRef === undefined || providerRef.startsWith(\"-\") || rest.length > 0) {\n\t\tterminal.error(`Usage: ${AUTH_LOGOUT_USAGE}`);\n\t\treturn 1;\n\t}\n\n\tlet stored: readonly CredentialInfo[];\n\ttry {\n\t\tstored = await modelRuntime.listCredentials({ signal });\n\t} catch (error: unknown) {\n\t\tterminal.error(`Could not read stored credentials: ${error instanceof Error ? error.message : String(error)}`);\n\t\treturn 1;\n\t}\n\tconst provider = findMatchingProviders(modelRuntime.getProviders(), providerRef)[0];\n\t// Providers registered by extensions are not loaded here, so their stored credentials match by id alone.\n\tconst credential = stored.find((candidate) => candidate.providerId === (provider?.id ?? providerRef));\n\tif (!provider && !credential) {\n\t\tterminal.error(`Unknown provider \"${replaceControlCharacters(providerRef)}\".`);\n\t\tconst storedIds = stored.map((credential) => credential.providerId).sort();\n\t\tterminal.error(`Stored credentials: ${storedIds.join(\", \") || \"none\"}`);\n\t\treturn 1;\n\t}\n\tconst providerName = provider?.name ?? providerRef;\n\tif (!credential) {\n\t\tterminal.write(\n\t\t\t`No stored credentials for ${providerName}. Environment variables and models.json config are unchanged.`,\n\t\t);\n\t\treturn 0;\n\t}\n\n\ttry {\n\t\tawait modelRuntime.logout(credential.providerId, { signal });\n\t} catch (error: unknown) {\n\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\tif (error instanceof CredentialSynchronizationError) {\n\t\t\tterminal.error(\n\t\t\t\t`Credentials removed for ${providerName}, but local model state could not be synchronized: ${message}`,\n\t\t\t);\n\t\t} else {\n\t\t\tterminal.error(`Logout failed: ${message}`);\n\t\t}\n\t\treturn 1;\n\t}\n\tterminal.write(\n\t\tcredential.type === \"oauth\"\n\t\t\t? `Logged out of ${providerName}.`\n\t\t\t: `Removed stored API key for ${providerName}. Environment variables and models.json config are unchanged.`,\n\t);\n\treturn 0;\n}\n"]}
@@ -0,0 +1,17 @@
1
+ /** Output shared by the terminal authentication commands. */
2
+ export interface AuthOutput {
3
+ write(line: string): void;
4
+ error(line: string): void;
5
+ }
6
+ /** Line-based terminal I/O for `draht auth login`. Prompts reject when `signal` aborts. */
7
+ export interface LoginTerminal extends AuthOutput {
8
+ /** Whether stdin and stdout are a terminal; login prompts need one. */
9
+ interactive: boolean;
10
+ question(message: string, signal: AbortSignal): Promise<string>;
11
+ /** Read a line without echoing it. */
12
+ secret(message: string, signal: AbortSignal): Promise<string>;
13
+ openUrl(url: string): void;
14
+ }
15
+ /** Terminal I/O on stdin and stdout. `onInterrupt` runs on Ctrl+C or EOF in a question, or Ctrl+C in a secret. */
16
+ export declare function createProcessLoginTerminal(onInterrupt: () => void): LoginTerminal;
17
+ //# sourceMappingURL=auth-terminal.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auth-terminal.d.ts","sourceRoot":"","sources":["../../src/cli/auth-terminal.ts"],"names":[],"mappings":"AAGA,6DAA6D;AAC7D,MAAM,WAAW,UAAU;IAC1B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,2FAA2F;AAC3F,MAAM,WAAW,aAAc,SAAQ,UAAU;IAChD,uEAAuE;IACvE,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,sCAAsC;IACtC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,kHAAkH;AAClH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,IAAI,GAAG,aAAa,CASjF"}
@@ -0,0 +1,63 @@
1
+ import { openBrowser } from "../utils/open-browser.js";
2
+ import { questionTerminal } from "../utils/terminal-question.js";
3
+ /** Terminal I/O on stdin and stdout. `onInterrupt` runs on Ctrl+C or EOF in a question, or Ctrl+C in a secret. */
4
+ export function createProcessLoginTerminal(onInterrupt) {
5
+ return {
6
+ interactive: process.stdin.isTTY === true && process.stdout.isTTY === true,
7
+ write: (line) => process.stdout.write(`${line}\n`),
8
+ error: (line) => process.stderr.write(`${line}\n`),
9
+ question: (message, signal) => questionTerminal(message, { signal, output: process.stdout, onInterrupt }),
10
+ secret: (message, signal) => readSecret(message, signal, onInterrupt),
11
+ openUrl: openBrowser,
12
+ };
13
+ }
14
+ function readSecret(message, signal, onInterrupt) {
15
+ const stdin = process.stdin;
16
+ return new Promise((resolve, reject) => {
17
+ if (signal.aborted) {
18
+ reject(new Error("Login cancelled"));
19
+ return;
20
+ }
21
+ let value = "";
22
+ const finish = () => {
23
+ stdin.off("data", onData);
24
+ signal.removeEventListener("abort", onAbort);
25
+ stdin.setRawMode(false);
26
+ stdin.pause();
27
+ process.stdout.write("\n");
28
+ };
29
+ const onAbort = () => {
30
+ finish();
31
+ reject(new Error("Login cancelled"));
32
+ };
33
+ const onData = (data) => {
34
+ const chunk = data.toString("utf8");
35
+ // Ignore escape sequences such as arrow keys.
36
+ if (chunk.startsWith("\u001b"))
37
+ return;
38
+ for (const char of chunk) {
39
+ if (char === "\r" || char === "\n") {
40
+ finish();
41
+ resolve(value);
42
+ return;
43
+ }
44
+ if (char === "\u0003") {
45
+ onInterrupt();
46
+ return;
47
+ }
48
+ if (char === "\u007f" || char === "\b") {
49
+ value = Array.from(value).slice(0, -1).join("");
50
+ }
51
+ else if (char >= " ") {
52
+ value += char;
53
+ }
54
+ }
55
+ };
56
+ process.stdout.write(message);
57
+ stdin.setRawMode(true);
58
+ stdin.resume();
59
+ stdin.on("data", onData);
60
+ signal.addEventListener("abort", onAbort, { once: true });
61
+ });
62
+ }
63
+ //# sourceMappingURL=auth-terminal.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auth-terminal.js","sourceRoot":"","sources":["../../src/cli/auth-terminal.ts"],"names":[],"mappings":"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","sourcesContent":["import { openBrowser } from \"../utils/open-browser.ts\";\nimport { questionTerminal } from \"../utils/terminal-question.ts\";\n\n/** Output shared by the terminal authentication commands. */\nexport interface AuthOutput {\n\twrite(line: string): void;\n\terror(line: string): void;\n}\n\n/** Line-based terminal I/O for `draht auth login`. Prompts reject when `signal` aborts. */\nexport interface LoginTerminal extends AuthOutput {\n\t/** Whether stdin and stdout are a terminal; login prompts need one. */\n\tinteractive: boolean;\n\tquestion(message: string, signal: AbortSignal): Promise<string>;\n\t/** Read a line without echoing it. */\n\tsecret(message: string, signal: AbortSignal): Promise<string>;\n\topenUrl(url: string): void;\n}\n\n/** Terminal I/O on stdin and stdout. `onInterrupt` runs on Ctrl+C or EOF in a question, or Ctrl+C in a secret. */\nexport function createProcessLoginTerminal(onInterrupt: () => void): LoginTerminal {\n\treturn {\n\t\tinteractive: process.stdin.isTTY === true && process.stdout.isTTY === true,\n\t\twrite: (line) => process.stdout.write(`${line}\\n`),\n\t\terror: (line) => process.stderr.write(`${line}\\n`),\n\t\tquestion: (message, signal) => questionTerminal(message, { signal, output: process.stdout, onInterrupt }),\n\t\tsecret: (message, signal) => readSecret(message, signal, onInterrupt),\n\t\topenUrl: openBrowser,\n\t};\n}\n\nfunction readSecret(message: string, signal: AbortSignal, onInterrupt: () => void): Promise<string> {\n\tconst stdin = process.stdin;\n\treturn new Promise((resolve, reject) => {\n\t\tif (signal.aborted) {\n\t\t\treject(new Error(\"Login cancelled\"));\n\t\t\treturn;\n\t\t}\n\t\tlet value = \"\";\n\t\tconst finish = () => {\n\t\t\tstdin.off(\"data\", onData);\n\t\t\tsignal.removeEventListener(\"abort\", onAbort);\n\t\t\tstdin.setRawMode(false);\n\t\t\tstdin.pause();\n\t\t\tprocess.stdout.write(\"\\n\");\n\t\t};\n\t\tconst onAbort = () => {\n\t\t\tfinish();\n\t\t\treject(new Error(\"Login cancelled\"));\n\t\t};\n\t\tconst onData = (data: Buffer) => {\n\t\t\tconst chunk = data.toString(\"utf8\");\n\t\t\t// Ignore escape sequences such as arrow keys.\n\t\t\tif (chunk.startsWith(\"\\u001b\")) return;\n\t\t\tfor (const char of chunk) {\n\t\t\t\tif (char === \"\\r\" || char === \"\\n\") {\n\t\t\t\t\tfinish();\n\t\t\t\t\tresolve(value);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (char === \"\\u0003\") {\n\t\t\t\t\tonInterrupt();\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (char === \"\\u007f\" || char === \"\\b\") {\n\t\t\t\t\tvalue = Array.from(value).slice(0, -1).join(\"\");\n\t\t\t\t} else if (char >= \" \") {\n\t\t\t\t\tvalue += char;\n\t\t\t\t}\n\t\t\t}\n\t\t};\n\t\tprocess.stdout.write(message);\n\t\tstdin.setRawMode(true);\n\t\tstdin.resume();\n\t\tstdin.on(\"data\", onData);\n\t\tsignal.addEventListener(\"abort\", onAbort, { once: true });\n\t});\n}\n"]}
@@ -117,6 +117,11 @@ export declare class AgentSessionRuntime {
117
117
  importFromJsonl(inputPath: string, cwdOverride?: string): Promise<{
118
118
  cancelled: boolean;
119
119
  }>;
120
+ /**
121
+ * Dispose the session for process exit. Also waits for credential writes in progress: an OAuth
122
+ * refresh may already have spent the old single-use refresh token, so exiting before the new one
123
+ * is saved would lose the login (#11692).
124
+ */
120
125
  dispose(): Promise<void>;
121
126
  }
122
127
  /**