@draht/coding-agent 2026.7.13 → 2026.9.5-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.
- package/CHANGELOG.md +241 -0
- package/README.md +47 -2
- package/agents/debugger.md +12 -1
- package/agents/git-committer.md +1 -0
- package/agents/implementer.md +20 -0
- package/agents/investigator.md +75 -0
- package/agents/reviewer.md +7 -0
- package/agents/spec-reviewer.md +66 -0
- package/agents/verifier.md +4 -3
- package/bin/draht-tools.cjs +472 -41
- package/dist/agents/debugger.md +12 -1
- package/dist/agents/git-committer.md +1 -0
- package/dist/agents/implementer.md +20 -0
- package/dist/agents/investigator.md +75 -0
- package/dist/agents/reviewer.md +7 -0
- package/dist/agents/spec-reviewer.md +66 -0
- package/dist/agents/verifier.md +4 -3
- package/dist/bun/cli.js +2 -0
- package/dist/bun/cli.js.map +1 -1
- package/dist/cli/args.d.ts +10 -0
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +80 -3
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/attach-mode.d.ts +61 -0
- package/dist/cli/attach-mode.d.ts.map +1 -1
- package/dist/cli/attach-mode.js +243 -5
- package/dist/cli/attach-mode.js.map +1 -1
- package/dist/cli/config-selector.js +1 -1
- package/dist/cli/config-selector.js.map +1 -1
- package/dist/cli/credential-print.d.ts +23 -0
- package/dist/cli/credential-print.d.ts.map +1 -0
- package/dist/cli/credential-print.js +117 -0
- package/dist/cli/credential-print.js.map +1 -0
- package/dist/cli/list-models.d.ts +2 -2
- package/dist/cli/list-models.d.ts.map +1 -1
- package/dist/cli/list-models.js +3 -3
- package/dist/cli/list-models.js.map +1 -1
- package/dist/cli/startup-ui.js +1 -1
- package/dist/cli/startup-ui.js.map +1 -1
- package/dist/config.d.ts +9 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +31 -4
- package/dist/config.js.map +1 -1
- package/dist/core/agent-session-runtime.d.ts +17 -1
- package/dist/core/agent-session-runtime.d.ts.map +1 -1
- package/dist/core/agent-session-runtime.js +90 -30
- package/dist/core/agent-session-runtime.js.map +1 -1
- package/dist/core/agent-session-services.d.ts +4 -7
- package/dist/core/agent-session-services.d.ts.map +1 -1
- package/dist/core/agent-session-services.js +24 -9
- package/dist/core/agent-session-services.js.map +1 -1
- package/dist/core/agent-session.d.ts +87 -27
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +337 -154
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/auth-storage.d.ts +20 -104
- package/dist/core/auth-storage.d.ts.map +1 -1
- package/dist/core/auth-storage.js +104 -260
- package/dist/core/auth-storage.js.map +1 -1
- package/dist/core/builtins/checkpoints.d.ts +20 -0
- package/dist/core/builtins/checkpoints.d.ts.map +1 -0
- package/dist/core/builtins/checkpoints.js +161 -0
- package/dist/core/builtins/checkpoints.js.map +1 -0
- package/dist/core/builtins/duet.d.ts +26 -0
- package/dist/core/builtins/duet.d.ts.map +1 -0
- package/dist/core/builtins/duet.js +660 -0
- package/dist/core/builtins/duet.js.map +1 -0
- package/dist/core/builtins/index.d.ts.map +1 -1
- package/dist/core/builtins/index.js +7 -1
- package/dist/core/builtins/index.js.map +1 -1
- package/dist/core/builtins/subagent.d.ts +24 -4
- package/dist/core/builtins/subagent.d.ts.map +1 -1
- package/dist/core/builtins/subagent.js +278 -35
- package/dist/core/builtins/subagent.js.map +1 -1
- package/dist/core/cache-stats.d.ts +2 -2
- package/dist/core/cache-stats.d.ts.map +1 -1
- package/dist/core/cache-stats.js +1 -1
- package/dist/core/cache-stats.js.map +1 -1
- package/dist/core/checkpoints/checkpoint-cli.d.ts +17 -0
- package/dist/core/checkpoints/checkpoint-cli.d.ts.map +1 -0
- package/dist/core/checkpoints/checkpoint-cli.js +78 -0
- package/dist/core/checkpoints/checkpoint-cli.js.map +1 -0
- package/dist/core/checkpoints/checkpoint-manager.d.ts +294 -0
- package/dist/core/checkpoints/checkpoint-manager.d.ts.map +1 -0
- package/dist/core/checkpoints/checkpoint-manager.js +865 -0
- package/dist/core/checkpoints/checkpoint-manager.js.map +1 -0
- package/dist/core/checkpoints/rewind.d.ts +141 -0
- package/dist/core/checkpoints/rewind.d.ts.map +1 -0
- package/dist/core/checkpoints/rewind.js +246 -0
- package/dist/core/checkpoints/rewind.js.map +1 -0
- package/dist/core/compaction/branch-summarization.d.ts +9 -3
- package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
- package/dist/core/compaction/branch-summarization.js +16 -14
- package/dist/core/compaction/branch-summarization.js.map +1 -1
- package/dist/core/compaction/compaction.d.ts +24 -3
- package/dist/core/compaction/compaction.d.ts.map +1 -1
- package/dist/core/compaction/compaction.js +96 -30
- package/dist/core/compaction/compaction.js.map +1 -1
- package/dist/core/compaction/utils.d.ts +1 -1
- package/dist/core/compaction/utils.d.ts.map +1 -1
- package/dist/core/compaction/utils.js +6 -17
- package/dist/core/compaction/utils.js.map +1 -1
- package/dist/core/context-windows.d.ts +7 -0
- package/dist/core/context-windows.d.ts.map +1 -0
- package/dist/core/context-windows.js +35 -0
- package/dist/core/context-windows.js.map +1 -0
- package/dist/core/extensions/index.d.ts +1 -1
- package/dist/core/extensions/index.d.ts.map +1 -1
- package/dist/core/extensions/index.js.map +1 -1
- package/dist/core/extensions/loader.d.ts.map +1 -1
- package/dist/core/extensions/loader.js +101 -23
- package/dist/core/extensions/loader.js.map +1 -1
- package/dist/core/extensions/runner.d.ts +19 -3
- package/dist/core/extensions/runner.d.ts.map +1 -1
- package/dist/core/extensions/runner.js +117 -2
- package/dist/core/extensions/runner.js.map +1 -1
- package/dist/core/extensions/types.d.ts +236 -9
- package/dist/core/extensions/types.d.ts.map +1 -1
- package/dist/core/extensions/types.js.map +1 -1
- package/dist/core/extensions/wrapper.d.ts.map +1 -1
- package/dist/core/extensions/wrapper.js +22 -3
- package/dist/core/extensions/wrapper.js.map +1 -1
- package/dist/core/footer-data-provider.d.ts +10 -0
- package/dist/core/footer-data-provider.d.ts.map +1 -1
- package/dist/core/footer-data-provider.js +1 -1
- package/dist/core/footer-data-provider.js.map +1 -1
- package/dist/core/http-dispatcher.d.ts.map +1 -1
- package/dist/core/http-dispatcher.js +7 -0
- package/dist/core/http-dispatcher.js.map +1 -1
- package/dist/core/index.d.ts +1 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/keybindings.d.ts +18 -3
- package/dist/core/keybindings.d.ts.map +1 -1
- package/dist/core/keybindings.js +12 -3
- package/dist/core/keybindings.js.map +1 -1
- package/dist/core/model-config.d.ts +542 -0
- package/dist/core/model-config.d.ts.map +1 -0
- package/dist/core/model-config.js +247 -0
- package/dist/core/model-config.js.map +1 -0
- package/dist/core/model-registry.d.ts +19 -124
- package/dist/core/model-registry.d.ts.map +1 -1
- package/dist/core/model-registry.js +56 -727
- package/dist/core/model-registry.js.map +1 -1
- package/dist/core/model-resolver.d.ts +7 -6
- package/dist/core/model-resolver.d.ts.map +1 -1
- package/dist/core/model-resolver.js +74 -27
- package/dist/core/model-resolver.js.map +1 -1
- package/dist/core/model-runtime.d.ts +89 -0
- package/dist/core/model-runtime.d.ts.map +1 -0
- package/dist/core/model-runtime.js +451 -0
- package/dist/core/model-runtime.js.map +1 -0
- package/dist/core/models-store.d.ts +17 -0
- package/dist/core/models-store.d.ts.map +1 -0
- package/dist/core/models-store.js +46 -0
- package/dist/core/models-store.js.map +1 -0
- package/dist/core/multi-agent/permission-gate.d.ts.map +1 -1
- package/dist/core/multi-agent/permission-gate.js +4 -3
- package/dist/core/multi-agent/permission-gate.js.map +1 -1
- package/dist/core/multi-agent/worktree.d.ts +2 -0
- package/dist/core/multi-agent/worktree.d.ts.map +1 -1
- package/dist/core/multi-agent/worktree.js +2 -2
- package/dist/core/multi-agent/worktree.js.map +1 -1
- package/dist/core/package-manager.d.ts +7 -1
- package/dist/core/package-manager.d.ts.map +1 -1
- package/dist/core/package-manager.js +41 -45
- package/dist/core/package-manager.js.map +1 -1
- package/dist/core/permission-relay/index.d.ts +19 -0
- package/dist/core/permission-relay/index.d.ts.map +1 -0
- package/dist/core/permission-relay/index.js +49 -0
- package/dist/core/permission-relay/index.js.map +1 -0
- package/dist/core/permission-relay/relay-ui-context.d.ts +39 -0
- package/dist/core/permission-relay/relay-ui-context.d.ts.map +1 -0
- package/dist/core/permission-relay/relay-ui-context.js +788 -0
- package/dist/core/permission-relay/relay-ui-context.js.map +1 -0
- package/dist/core/permission-relay/types.d.ts +222 -0
- package/dist/core/permission-relay/types.d.ts.map +1 -0
- package/dist/core/permission-relay/types.js +15 -0
- package/dist/core/permission-relay/types.js.map +1 -0
- package/dist/core/pi-manifest.d.ts +14 -0
- package/dist/core/pi-manifest.d.ts.map +1 -0
- package/dist/core/pi-manifest.js +35 -0
- package/dist/core/pi-manifest.js.map +1 -0
- package/dist/core/project-trust.js +2 -2
- package/dist/core/project-trust.js.map +1 -1
- package/dist/core/prompt-templates.d.ts +1 -0
- package/dist/core/prompt-templates.d.ts.map +1 -1
- package/dist/core/prompt-templates.js +4 -4
- package/dist/core/prompt-templates.js.map +1 -1
- package/dist/core/provider-composer.d.ts +55 -0
- package/dist/core/provider-composer.d.ts.map +1 -0
- package/dist/core/provider-composer.js +375 -0
- package/dist/core/provider-composer.js.map +1 -0
- package/dist/core/radius.d.ts +2 -0
- package/dist/core/radius.d.ts.map +1 -0
- package/dist/core/radius.js +2 -0
- package/dist/core/radius.js.map +1 -0
- package/dist/core/remote-catalog-provider.d.ts +5 -0
- package/dist/core/remote-catalog-provider.d.ts.map +1 -0
- package/dist/core/remote-catalog-provider.js +115 -0
- package/dist/core/remote-catalog-provider.js.map +1 -0
- package/dist/core/resource-loader.d.ts +36 -0
- package/dist/core/resource-loader.d.ts.map +1 -1
- package/dist/core/resource-loader.js +159 -27
- package/dist/core/resource-loader.js.map +1 -1
- package/dist/core/runtime-credentials.d.ts +15 -0
- package/dist/core/runtime-credentials.d.ts.map +1 -0
- package/dist/core/runtime-credentials.js +35 -0
- package/dist/core/runtime-credentials.js.map +1 -0
- package/dist/core/sandbox/bash-operations.d.ts +149 -0
- package/dist/core/sandbox/bash-operations.d.ts.map +1 -0
- package/dist/core/sandbox/bash-operations.js +163 -0
- package/dist/core/sandbox/bash-operations.js.map +1 -0
- package/dist/core/sandbox/env.d.ts +83 -0
- package/dist/core/sandbox/env.d.ts.map +1 -0
- package/dist/core/sandbox/env.js +123 -0
- package/dist/core/sandbox/env.js.map +1 -0
- package/dist/core/sandbox/executor.d.ts +104 -0
- package/dist/core/sandbox/executor.d.ts.map +1 -0
- package/dist/core/sandbox/executor.js +92 -0
- package/dist/core/sandbox/executor.js.map +1 -0
- package/dist/core/sandbox/index.d.ts +36 -0
- package/dist/core/sandbox/index.d.ts.map +1 -0
- package/dist/core/sandbox/index.js +36 -0
- package/dist/core/sandbox/index.js.map +1 -0
- package/dist/core/sandbox/linux.d.ts +121 -0
- package/dist/core/sandbox/linux.d.ts.map +1 -0
- package/dist/core/sandbox/linux.js +260 -0
- package/dist/core/sandbox/linux.js.map +1 -0
- package/dist/core/sandbox/policy.d.ts +142 -0
- package/dist/core/sandbox/policy.d.ts.map +1 -0
- package/dist/core/sandbox/policy.js +297 -0
- package/dist/core/sandbox/policy.js.map +1 -0
- package/dist/core/sandbox/real-path.d.ts +112 -0
- package/dist/core/sandbox/real-path.d.ts.map +1 -0
- package/dist/core/sandbox/real-path.js +158 -0
- package/dist/core/sandbox/real-path.js.map +1 -0
- package/dist/core/sandbox/seatbelt-profile.d.ts +95 -0
- package/dist/core/sandbox/seatbelt-profile.d.ts.map +1 -0
- package/dist/core/sandbox/seatbelt-profile.js +239 -0
- package/dist/core/sandbox/seatbelt-profile.js.map +1 -0
- package/dist/core/sandbox/seatbelt.d.ts +95 -0
- package/dist/core/sandbox/seatbelt.d.ts.map +1 -0
- package/dist/core/sandbox/seatbelt.js +154 -0
- package/dist/core/sandbox/seatbelt.js.map +1 -0
- package/dist/core/sandbox/self-test.d.ts +109 -0
- package/dist/core/sandbox/self-test.d.ts.map +1 -0
- package/dist/core/sandbox/self-test.js +369 -0
- package/dist/core/sandbox/self-test.js.map +1 -0
- package/dist/core/sandbox/spawn.d.ts +33 -0
- package/dist/core/sandbox/spawn.d.ts.map +1 -0
- package/dist/core/sandbox/spawn.js +87 -0
- package/dist/core/sandbox/spawn.js.map +1 -0
- package/dist/core/sdk.d.ts +3 -6
- package/dist/core/sdk.d.ts.map +1 -1
- package/dist/core/sdk.js +25 -22
- package/dist/core/sdk.js.map +1 -1
- package/dist/core/session-manager.d.ts +74 -7
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +169 -34
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/settings-manager.d.ts +22 -1
- package/dist/core/settings-manager.d.ts.map +1 -1
- package/dist/core/settings-manager.js +36 -16
- package/dist/core/settings-manager.js.map +1 -1
- package/dist/core/skills.d.ts +3 -1
- package/dist/core/skills.d.ts.map +1 -1
- package/dist/core/skills.js +19 -6
- package/dist/core/skills.js.map +1 -1
- package/dist/core/slash-commands.d.ts.map +1 -1
- package/dist/core/slash-commands.js +1 -0
- package/dist/core/slash-commands.js.map +1 -1
- package/dist/core/soak/soak-log.d.ts +298 -0
- package/dist/core/soak/soak-log.d.ts.map +1 -0
- package/dist/core/soak/soak-log.js +660 -0
- package/dist/core/soak/soak-log.js.map +1 -0
- package/dist/core/soak/soak-reader.d.ts +60 -0
- package/dist/core/soak/soak-reader.d.ts.map +1 -0
- package/dist/core/soak/soak-reader.js +106 -0
- package/dist/core/soak/soak-reader.js.map +1 -0
- package/dist/core/socket-server/discovery.d.ts +78 -1
- package/dist/core/socket-server/discovery.d.ts.map +1 -1
- package/dist/core/socket-server/discovery.js +356 -37
- package/dist/core/socket-server/discovery.js.map +1 -1
- package/dist/core/socket-server/index.d.ts +10 -4
- package/dist/core/socket-server/index.d.ts.map +1 -1
- package/dist/core/socket-server/index.js +6 -3
- package/dist/core/socket-server/index.js.map +1 -1
- package/dist/core/socket-server/permission-delivery.d.ts +125 -0
- package/dist/core/socket-server/permission-delivery.d.ts.map +1 -0
- package/dist/core/socket-server/permission-delivery.js +152 -0
- package/dist/core/socket-server/permission-delivery.js.map +1 -0
- package/dist/core/socket-server/permission-registry.d.ts +301 -0
- package/dist/core/socket-server/permission-registry.d.ts.map +1 -0
- package/dist/core/socket-server/permission-registry.js +410 -0
- package/dist/core/socket-server/permission-registry.js.map +1 -0
- package/dist/core/socket-server/permission-relay.d.ts +81 -0
- package/dist/core/socket-server/permission-relay.d.ts.map +1 -0
- package/dist/core/socket-server/permission-relay.js +528 -0
- package/dist/core/socket-server/permission-relay.js.map +1 -0
- package/dist/core/socket-server/safe-text.d.ts +83 -0
- package/dist/core/socket-server/safe-text.d.ts.map +1 -0
- package/dist/core/socket-server/safe-text.js +277 -0
- package/dist/core/socket-server/safe-text.js.map +1 -0
- package/dist/core/socket-server/session-integration.d.ts +65 -2
- package/dist/core/socket-server/session-integration.d.ts.map +1 -1
- package/dist/core/socket-server/session-integration.js +434 -32
- package/dist/core/socket-server/session-integration.js.map +1 -1
- package/dist/core/socket-server/socket-client.d.ts +21 -2
- package/dist/core/socket-server/socket-client.d.ts.map +1 -1
- package/dist/core/socket-server/socket-client.js +52 -1
- package/dist/core/socket-server/socket-client.js.map +1 -1
- package/dist/core/socket-server/socket-server.d.ts +152 -1
- package/dist/core/socket-server/socket-server.d.ts.map +1 -1
- package/dist/core/socket-server/socket-server.js +775 -26
- package/dist/core/socket-server/socket-server.js.map +1 -1
- package/dist/core/socket-server/types.d.ts +106 -2
- package/dist/core/socket-server/types.d.ts.map +1 -1
- package/dist/core/socket-server/types.js +13 -1
- package/dist/core/socket-server/types.js.map +1 -1
- package/dist/core/system-prompt.d.ts.map +1 -1
- package/dist/core/system-prompt.js +10 -21
- package/dist/core/system-prompt.js.map +1 -1
- package/dist/core/tools/bash.d.ts +3 -1
- package/dist/core/tools/bash.d.ts.map +1 -1
- package/dist/core/tools/bash.js +39 -7
- package/dist/core/tools/bash.js.map +1 -1
- package/dist/core/tools/edit.d.ts.map +1 -1
- package/dist/core/tools/edit.js +17 -2
- package/dist/core/tools/edit.js.map +1 -1
- package/dist/core/tools/find.d.ts +3 -0
- package/dist/core/tools/find.d.ts.map +1 -1
- package/dist/core/tools/find.js +11 -18
- package/dist/core/tools/find.js.map +1 -1
- package/dist/core/tools/read.js +1 -1
- package/dist/core/tools/read.js.map +1 -1
- package/dist/core/tools/tool-definition-wrapper.d.ts.map +1 -1
- package/dist/core/tools/tool-definition-wrapper.js +3 -1
- package/dist/core/tools/tool-definition-wrapper.js.map +1 -1
- package/dist/core/trust-manager.d.ts +6 -4
- package/dist/core/trust-manager.d.ts.map +1 -1
- package/dist/core/trust-manager.js +55 -21
- package/dist/core/trust-manager.js.map +1 -1
- package/dist/core/usage-totals.d.ts +19 -0
- package/dist/core/usage-totals.d.ts.map +1 -0
- package/dist/core/usage-totals.js +52 -0
- package/dist/core/usage-totals.js.map +1 -0
- package/dist/extensions/index.d.ts +3 -0
- package/dist/extensions/index.d.ts.map +1 -0
- package/dist/extensions/index.js +7 -0
- package/dist/extensions/index.js.map +1 -0
- package/dist/extensions/llama/client.d.ts +61 -0
- package/dist/extensions/llama/client.d.ts.map +1 -0
- package/dist/extensions/llama/client.js +300 -0
- package/dist/extensions/llama/client.js.map +1 -0
- package/dist/extensions/llama/huggingface.d.ts +23 -0
- package/dist/extensions/llama/huggingface.d.ts.map +1 -0
- package/dist/extensions/llama/huggingface.js +139 -0
- package/dist/extensions/llama/huggingface.js.map +1 -0
- package/dist/extensions/llama/index.d.ts +3 -0
- package/dist/extensions/llama/index.d.ts.map +1 -0
- package/dist/extensions/llama/index.js +208 -0
- package/dist/extensions/llama/index.js.map +1 -0
- package/dist/extensions/llama/provider.d.ts +10 -0
- package/dist/extensions/llama/provider.d.ts.map +1 -0
- package/dist/extensions/llama/provider.js +111 -0
- package/dist/extensions/llama/provider.js.map +1 -0
- package/dist/extensions/llama/ui.d.ts +42 -0
- package/dist/extensions/llama/ui.d.ts.map +1 -0
- package/dist/extensions/llama/ui.js +400 -0
- package/dist/extensions/llama/ui.js.map +1 -0
- package/dist/extensions/stub-provider/index.d.ts +9 -0
- package/dist/extensions/stub-provider/index.d.ts.map +1 -0
- package/dist/extensions/stub-provider/index.js +13 -0
- package/dist/extensions/stub-provider/index.js.map +1 -0
- package/dist/extensions/stub-provider/provider.d.ts +77 -0
- package/dist/extensions/stub-provider/provider.d.ts.map +1 -0
- package/dist/extensions/stub-provider/provider.js +193 -0
- package/dist/extensions/stub-provider/provider.js.map +1 -0
- package/dist/hooks/gsd/draht-quality-gate.js +3 -3
- package/dist/index.d.ts +4 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +305 -61
- package/dist/main.js.map +1 -1
- package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/assistant-message.js +22 -10
- package/dist/modes/interactive/components/assistant-message.js.map +1 -1
- package/dist/modes/interactive/components/config-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/config-selector.js +3 -2
- package/dist/modes/interactive/components/config-selector.js.map +1 -1
- package/dist/modes/interactive/components/custom-editor.js +1 -1
- package/dist/modes/interactive/components/custom-editor.js.map +1 -1
- package/dist/modes/interactive/components/custom-message.d.ts +3 -1
- package/dist/modes/interactive/components/custom-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/custom-message.js +9 -2
- package/dist/modes/interactive/components/custom-message.js.map +1 -1
- package/dist/modes/interactive/components/extension-editor.d.ts +1 -2
- package/dist/modes/interactive/components/extension-editor.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-editor.js +16 -46
- package/dist/modes/interactive/components/extension-editor.js.map +1 -1
- package/dist/modes/interactive/components/extension-selector.d.ts +49 -0
- package/dist/modes/interactive/components/extension-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-selector.js +202 -5
- package/dist/modes/interactive/components/extension-selector.js.map +1 -1
- package/dist/modes/interactive/components/footer.d.ts.map +1 -1
- package/dist/modes/interactive/components/footer.js +24 -23
- package/dist/modes/interactive/components/footer.js.map +1 -1
- package/dist/modes/interactive/components/login-dialog.d.ts +5 -5
- package/dist/modes/interactive/components/login-dialog.d.ts.map +1 -1
- package/dist/modes/interactive/components/login-dialog.js +17 -8
- package/dist/modes/interactive/components/login-dialog.js.map +1 -1
- package/dist/modes/interactive/components/model-selector.d.ts +11 -4
- package/dist/modes/interactive/components/model-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/model-selector.js +74 -41
- package/dist/modes/interactive/components/model-selector.js.map +1 -1
- package/dist/modes/interactive/components/oauth-selector.d.ts +4 -4
- package/dist/modes/interactive/components/oauth-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/oauth-selector.js +14 -25
- package/dist/modes/interactive/components/oauth-selector.js.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.js +22 -13
- package/dist/modes/interactive/components/scoped-models-selector.js.map +1 -1
- package/dist/modes/interactive/components/session-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/session-selector.js +10 -2
- package/dist/modes/interactive/components/session-selector.js.map +1 -1
- package/dist/modes/interactive/components/settings-selector.d.ts +2 -0
- package/dist/modes/interactive/components/settings-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/settings-selector.js +10 -0
- package/dist/modes/interactive/components/settings-selector.js.map +1 -1
- package/dist/modes/interactive/components/tool-execution.d.ts.map +1 -1
- package/dist/modes/interactive/components/tool-execution.js +10 -1
- package/dist/modes/interactive/components/tool-execution.js.map +1 -1
- package/dist/modes/interactive/components/tree-selector.d.ts +25 -2
- package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/tree-selector.js +68 -17
- package/dist/modes/interactive/components/tree-selector.js.map +1 -1
- package/dist/modes/interactive/external-editor.d.ts +12 -0
- package/dist/modes/interactive/external-editor.d.ts.map +1 -0
- package/dist/modes/interactive/external-editor.js +37 -0
- package/dist/modes/interactive/external-editor.js.map +1 -0
- package/dist/modes/interactive/interactive-mode.d.ts +107 -10
- package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode.js +763 -285
- package/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-client.d.ts +4 -0
- package/dist/modes/rpc/rpc-client.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-client.js +7 -0
- package/dist/modes/rpc/rpc-client.js.map +1 -1
- package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-mode.js +185 -9
- package/dist/modes/rpc/rpc-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-types.d.ts +79 -1
- package/dist/modes/rpc/rpc-types.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-types.js.map +1 -1
- package/dist/package-manager-cli.d.ts.map +1 -1
- package/dist/package-manager-cli.js +67 -5
- package/dist/package-manager-cli.js.map +1 -1
- package/dist/prompts/commands/atomic-commit.md +1 -12
- package/dist/prompts/commands/brainstorm.md +12 -15
- package/dist/prompts/commands/create-verification-skill.md +108 -0
- package/dist/prompts/commands/discuss-phase.md +3 -14
- package/dist/prompts/commands/execute-phase.md +3 -11
- package/dist/prompts/commands/fix.md +41 -18
- package/dist/prompts/commands/grill.md +66 -0
- package/dist/prompts/commands/init-project.md +5 -15
- package/dist/prompts/commands/map-codebase.md +1 -13
- package/dist/prompts/commands/new-project.md +5 -15
- package/dist/prompts/commands/next-milestone.md +1 -13
- package/dist/prompts/commands/orchestrate.md +1 -1
- package/dist/prompts/commands/pause-work.md +1 -13
- package/dist/prompts/commands/plan-phase.md +2 -11
- package/dist/prompts/commands/progress.md +0 -13
- package/dist/prompts/commands/quick.md +3 -11
- package/dist/prompts/commands/resolve-conflicts.md +71 -0
- package/dist/prompts/commands/resume-work.md +0 -13
- package/dist/prompts/commands/review.md +4 -13
- package/dist/prompts/commands/triage.md +159 -0
- package/dist/prompts/commands/verify-work.md +4 -14
- package/dist/prompts/commands/why.md +135 -0
- package/dist/skills/atomic-reasoning/SKILL.md +115 -0
- package/dist/skills/blast-radius/SKILL.md +55 -0
- package/dist/skills/epistemics/SKILL.md +99 -0
- package/dist/skills/hexagon-animation/SKILL.md +49 -0
- package/dist/skills/hexagon-animation/generate.mjs +81 -0
- package/dist/skills/hexagon-animation/template.html +361 -0
- package/dist/skills/typescript-discipline/SKILL.md +50 -0
- package/dist/skills/typescript-discipline/references/patterns.md +294 -0
- package/dist/skills/unslop/SKILL.md +101 -0
- package/dist/utils/canonical-path.d.ts +28 -0
- package/dist/utils/canonical-path.d.ts.map +1 -0
- package/dist/utils/canonical-path.js +90 -0
- package/dist/utils/canonical-path.js.map +1 -0
- package/dist/utils/child-process.d.ts +12 -1
- package/dist/utils/child-process.d.ts.map +1 -1
- package/dist/utils/child-process.js +25 -8
- package/dist/utils/child-process.js.map +1 -1
- package/dist/utils/clipboard-native.d.ts +1 -0
- package/dist/utils/clipboard-native.d.ts.map +1 -1
- package/dist/utils/clipboard-native.js.map +1 -1
- package/dist/utils/clipboard.d.ts +2 -0
- package/dist/utils/clipboard.d.ts.map +1 -1
- package/dist/utils/clipboard.js +53 -9
- package/dist/utils/clipboard.js.map +1 -1
- package/dist/utils/exif-orientation.d.ts.map +1 -1
- package/dist/utils/exif-orientation.js +2 -3
- package/dist/utils/exif-orientation.js.map +1 -1
- package/dist/utils/paths.d.ts +2 -7
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +13 -15
- package/dist/utils/paths.js.map +1 -1
- package/dist/utils/shell.d.ts.map +1 -1
- package/dist/utils/shell.js +6 -4
- package/dist/utils/shell.js.map +1 -1
- package/dist/utils/tools-manager.d.ts.map +1 -1
- package/dist/utils/tools-manager.js +3 -5
- package/dist/utils/tools-manager.js.map +1 -1
- package/dist/utils/version-check.d.ts.map +1 -1
- package/dist/utils/version-check.js +3 -1
- package/dist/utils/version-check.js.map +1 -1
- package/docs/attachable-sessions.md +79 -0
- package/docs/compaction.md +29 -24
- package/docs/containerization.md +23 -23
- package/docs/custom-provider.md +66 -32
- package/docs/development.md +9 -9
- package/docs/docs.json +6 -2
- package/docs/duet.md +42 -0
- package/docs/environment-variables.md +88 -0
- package/docs/extensions.md +278 -65
- package/docs/index.md +12 -10
- package/docs/json.md +12 -8
- package/docs/keybindings.md +8 -5
- package/docs/llama-cpp.md +99 -0
- package/docs/models.md +19 -8
- package/docs/packages.md +43 -42
- package/docs/prompt-templates.md +5 -4
- package/docs/providers.md +45 -11
- package/docs/quickstart.md +33 -33
- package/docs/rpc.md +190 -19
- package/docs/sdk.md +18 -15
- package/docs/security.md +18 -18
- package/docs/session-format.md +53 -15
- package/docs/sessions.md +17 -14
- package/docs/settings.md +26 -19
- package/docs/shell-aliases.md +2 -2
- package/docs/skills.md +12 -11
- package/docs/terminal-setup.md +12 -12
- package/docs/termux.md +6 -6
- package/docs/themes.md +11 -11
- package/docs/tmux.md +4 -4
- package/docs/tui.md +46 -31
- package/docs/usage.md +53 -63
- package/docs/windows.md +2 -2
- package/examples/extensions/custom-compaction.ts +4 -0
- package/examples/extensions/custom-provider-anthropic/index.ts +9 -3
- package/examples/extensions/custom-provider-anthropic/package.json +1 -1
- package/examples/extensions/custom-provider-gitlab-duo/package.json +1 -1
- package/examples/extensions/custom-provider-qwen-cli/package.json +1 -1
- package/examples/extensions/gondolin/package.json +2 -2
- package/examples/extensions/handoff.ts +9 -1
- package/examples/extensions/kimi-deferred-tools.ts +61 -0
- package/examples/extensions/message-renderer.ts +2 -2
- package/examples/extensions/overlay-qa-tests.ts +3 -3
- package/examples/extensions/sandbox/package.json +1 -1
- package/examples/extensions/summarize.ts +3 -0
- package/examples/extensions/with-deps/package.json +1 -1
- package/examples/sdk/02-custom-model.ts +5 -8
- package/examples/sdk/09-api-keys-and-oauth.ts +15 -31
- package/examples/sdk/12-full-control.ts +9 -12
- package/hooks/gsd/draht-quality-gate.js +3 -3
- package/package.json +14 -11
- package/prompts/commands/atomic-commit.md +1 -12
- package/prompts/commands/brainstorm.md +12 -15
- package/prompts/commands/create-verification-skill.md +108 -0
- package/prompts/commands/discuss-phase.md +3 -14
- package/prompts/commands/execute-phase.md +3 -11
- package/prompts/commands/fix.md +41 -18
- package/prompts/commands/grill.md +66 -0
- package/prompts/commands/init-project.md +5 -15
- package/prompts/commands/map-codebase.md +1 -13
- package/prompts/commands/new-project.md +5 -15
- package/prompts/commands/next-milestone.md +1 -13
- package/prompts/commands/orchestrate.md +1 -1
- package/prompts/commands/pause-work.md +1 -13
- package/prompts/commands/plan-phase.md +2 -11
- package/prompts/commands/progress.md +0 -13
- package/prompts/commands/quick.md +3 -11
- package/prompts/commands/resolve-conflicts.md +71 -0
- package/prompts/commands/resume-work.md +0 -13
- package/prompts/commands/review.md +4 -13
- package/prompts/commands/triage.md +159 -0
- package/prompts/commands/verify-work.md +4 -14
- package/prompts/commands/why.md +135 -0
- package/skills/atomic-reasoning/SKILL.md +115 -0
- package/skills/blast-radius/SKILL.md +55 -0
- package/skills/epistemics/SKILL.md +99 -0
- package/skills/hexagon-animation/SKILL.md +49 -0
- package/skills/hexagon-animation/generate.mjs +81 -0
- package/skills/hexagon-animation/template.html +361 -0
- package/skills/typescript-discipline/SKILL.md +50 -0
- package/skills/typescript-discipline/references/patterns.md +294 -0
- package/skills/unslop/SKILL.md +101 -0
- package/dist/core/provider-display-names.d.ts +0 -2
- package/dist/core/provider-display-names.d.ts.map +0 -1
- package/dist/core/provider-display-names.js +0 -36
- package/dist/core/provider-display-names.js.map +0 -1
- package/dist/prompts/agents/build.md +0 -86
- package/dist/prompts/agents/plan.md +0 -79
- package/dist/prompts/agents/verify.md +0 -69
- package/prompts/agents/build.md +0 -86
- package/prompts/agents/plan.md +0 -79
- package/prompts/agents/verify.md +0 -69
|
@@ -3,7 +3,68 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Provides tmux-style attachment where you can see output and send input
|
|
5
5
|
* to a running session. Multiple clients can attach simultaneously.
|
|
6
|
+
*
|
|
7
|
+
* It is also the THIRD renderer of a permission ask (R34-PERM.2), and the one that used to
|
|
8
|
+
* swallow answers: every typed line went out as an `input` frame, so a human typing "Yes" at a
|
|
9
|
+
* dialog the session had raised did not answer it — the word arrived as a queued chat prompt
|
|
10
|
+
* while the agent sat parked inside `beforeToolCall` waiting for a decision that could never
|
|
11
|
+
* come. The answer mode below is that bug's fix: while an ask is outstanding, a typed line is an
|
|
12
|
+
* ANSWER or it is nothing at all.
|
|
13
|
+
*/
|
|
14
|
+
import { type PermissionOption, type PermissionRequestMessage, type PermissionResolvedMessage } from "../core/socket-server/index.js";
|
|
15
|
+
/**
|
|
16
|
+
* Build the socket path for a session id supplied on the command line.
|
|
17
|
+
*
|
|
18
|
+
* The value is validated with the same rule the session manager applies when creating
|
|
19
|
+
* ids, so a `--attach` argument can never traverse out of the socket directory.
|
|
20
|
+
*
|
|
21
|
+
* @throws {Error} When the session id is not a valid session id.
|
|
22
|
+
*/
|
|
23
|
+
export declare function resolveAttachSocketPath(sessionId: string, socketDir: string): string;
|
|
24
|
+
/**
|
|
25
|
+
* Whether an `error` frame from the server should end the attached client.
|
|
26
|
+
*
|
|
27
|
+
* Uncoded frames stay fatal: they report protocol or attach failures.
|
|
28
|
+
*/
|
|
29
|
+
export declare function isFatalAttachError(code?: string): boolean;
|
|
30
|
+
/** Whether an `error` frame is a notice rather than a failure. */
|
|
31
|
+
export declare function isAttachNotice(code?: string): boolean;
|
|
32
|
+
/**
|
|
33
|
+
* Resolve a typed line against the options an ask actually offered.
|
|
34
|
+
*
|
|
35
|
+
* Three spellings are accepted, and all three name an OFFERED option: its id, its label, or its
|
|
36
|
+
* 1-based position in the rendered list. Nothing else resolves — there is deliberately no
|
|
37
|
+
* "y"/"yes" fallback, no prefix match and no default, because every one of those invents an
|
|
38
|
+
* option the session did not offer and the whole point of answering by id is that the ask
|
|
39
|
+
* decides what may happen, not the renderer.
|
|
40
|
+
*
|
|
41
|
+
* Id and label are tried BEFORE the ordinal, so an ask that offers an option literally called
|
|
42
|
+
* "1" is answered by naming it rather than by whatever happens to sit first in the list.
|
|
43
|
+
*
|
|
44
|
+
* Exported for the option-matching tests; `runAttachMode` is the only production caller.
|
|
45
|
+
*/
|
|
46
|
+
export declare function matchPermissionAnswer(line: string, options: readonly PermissionOption[]): PermissionOption | undefined;
|
|
47
|
+
/** The one-line "that was not one of the choices" reminder, listing what IS on offer. */
|
|
48
|
+
export declare function permissionAnswerReminder(options: readonly PermissionOption[]): string;
|
|
49
|
+
/**
|
|
50
|
+
* Render one permission ask from its TYPED fields.
|
|
51
|
+
*
|
|
52
|
+
* Deliberately NOT built from the legacy `title`/`message` prose: that sentence is
|
|
53
|
+
* `${toolName}: ${reason}`, which cannot say which directory the command would run in or what
|
|
54
|
+
* the command actually is, and a human approving a `bash` call needs both. The typed fields are
|
|
55
|
+
* already neutralized and bounded where the frame was CONSTRUCTED (`safe-text.ts`), so nothing
|
|
56
|
+
* here re-sanitizes them — doing so twice is how a doubly-escaped command stops being the
|
|
57
|
+
* command the human is deciding about.
|
|
58
|
+
*
|
|
59
|
+
* NOTE ON `reason`: the socket frame carries no dedicated field for it. The permission gate
|
|
60
|
+
* folds it into `message` as `${toolName}: ${reason}`, so that field is rendered under its own
|
|
61
|
+
* name, on its own line, AFTER the typed facts rather than instead of them.
|
|
62
|
+
*
|
|
63
|
+
* Returned as lines rather than printed so the shape is testable without a socket.
|
|
6
64
|
*/
|
|
65
|
+
export declare function renderPermissionAsk(message: PermissionRequestMessage): string[];
|
|
66
|
+
/** How a settled ask is reported back to the operator, naming who actually decided it. */
|
|
67
|
+
export declare function renderPermissionResolution(message: PermissionResolvedMessage): string;
|
|
7
68
|
/**
|
|
8
69
|
* Run attach mode - connect to an existing socket session.
|
|
9
70
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach-mode.d.ts","sourceRoot":"","sources":["../../src/cli/attach-mode.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"attach-mode.d.ts","sourceRoot":"","sources":["../../src/cli/attach-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAE9B,MAAM,gCAAgC,CAAC;AAExC;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAGpF;AA6BD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAEzD;AAYD,kEAAkE;AAClE,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,SAAS,gBAAgB,EAAE,GAClC,gBAAgB,GAAG,SAAS,CAc9B;AAED,yFAAyF;AACzF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,CAGrF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,wBAAwB,GAAG,MAAM,EAAE,CA4B/E;AAED,0FAA0F;AAC1F,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAIrF;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmLpE"}
|
package/dist/cli/attach-mode.js
CHANGED
|
@@ -3,12 +3,164 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Provides tmux-style attachment where you can see output and send input
|
|
5
5
|
* to a running session. Multiple clients can attach simultaneously.
|
|
6
|
+
*
|
|
7
|
+
* It is also the THIRD renderer of a permission ask (R34-PERM.2), and the one that used to
|
|
8
|
+
* swallow answers: every typed line went out as an `input` frame, so a human typing "Yes" at a
|
|
9
|
+
* dialog the session had raised did not answer it — the word arrived as a queued chat prompt
|
|
10
|
+
* while the agent sat parked inside `beforeToolCall` waiting for a decision that could never
|
|
11
|
+
* come. The answer mode below is that bug's fix: while an ask is outstanding, a typed line is an
|
|
12
|
+
* ANSWER or it is nothing at all.
|
|
6
13
|
*/
|
|
7
14
|
import path from "node:path";
|
|
8
15
|
import { createInterface } from "node:readline";
|
|
9
16
|
import chalk from "chalk";
|
|
10
|
-
import { getAgentDir } from "../config.js";
|
|
11
|
-
import {
|
|
17
|
+
import { APP_NAME, getAgentDir } from "../config.js";
|
|
18
|
+
import { assertValidSessionId } from "../core/session-manager.js";
|
|
19
|
+
import { SocketClient, } from "../core/socket-server/index.js";
|
|
20
|
+
/**
|
|
21
|
+
* Build the socket path for a session id supplied on the command line.
|
|
22
|
+
*
|
|
23
|
+
* The value is validated with the same rule the session manager applies when creating
|
|
24
|
+
* ids, so a `--attach` argument can never traverse out of the socket directory.
|
|
25
|
+
*
|
|
26
|
+
* @throws {Error} When the session id is not a valid session id.
|
|
27
|
+
*/
|
|
28
|
+
export function resolveAttachSocketPath(sessionId, socketDir) {
|
|
29
|
+
assertValidSessionId(sessionId);
|
|
30
|
+
return path.join(socketDir, `${sessionId}.sock`);
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Error frames that report a recoverable condition rather than a dead session.
|
|
34
|
+
*
|
|
35
|
+
* `PROMPT_FAILED` means one prompt was rejected (no model, no credentials),
|
|
36
|
+
* `PROMPT_QUEUED` means a prompt sent mid-turn was accepted and runs when the current
|
|
37
|
+
* turn finishes (R32-FLEET.7), and `SESSION_REPLACED` means the runtime switched
|
|
38
|
+
* sessions - in all three cases the client is still attached and the session is still
|
|
39
|
+
* there, so the client prints the message and stays.
|
|
40
|
+
*
|
|
41
|
+
* The `PERMISSION_*` codes are every way the session can REFUSE ONE ANSWER (R34-PERM.1): the
|
|
42
|
+
* ask is gone, the option was never offered, somebody else already decided, this connection is
|
|
43
|
+
* read-only or never declared the capability. A refusal is a statement about that one keystroke
|
|
44
|
+
* and about nothing else — the session is still running and this client is still attached — so
|
|
45
|
+
* exiting on it would turn "you named an option I did not offer" into a lost session.
|
|
46
|
+
*/
|
|
47
|
+
const NON_FATAL_ERROR_CODES = new Set([
|
|
48
|
+
"PROMPT_FAILED",
|
|
49
|
+
"PROMPT_QUEUED",
|
|
50
|
+
"SESSION_REPLACED",
|
|
51
|
+
"PERMISSION_UNKNOWN_REQUEST",
|
|
52
|
+
"PERMISSION_INVALID_OPTION",
|
|
53
|
+
"PERMISSION_ALREADY_RESOLVED",
|
|
54
|
+
"PERMISSION_NOT_ATTACHED",
|
|
55
|
+
"PERMISSION_READ_ONLY",
|
|
56
|
+
"PERMISSION_NOT_CAPABLE",
|
|
57
|
+
]);
|
|
58
|
+
/**
|
|
59
|
+
* Whether an `error` frame from the server should end the attached client.
|
|
60
|
+
*
|
|
61
|
+
* Uncoded frames stay fatal: they report protocol or attach failures.
|
|
62
|
+
*/
|
|
63
|
+
export function isFatalAttachError(code) {
|
|
64
|
+
return code === undefined || !NON_FATAL_ERROR_CODES.has(code);
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Codes that ride the `error` channel while reporting something that went RIGHT.
|
|
68
|
+
*
|
|
69
|
+
* The socket wire has one server→client channel for out-of-band messages, so
|
|
70
|
+
* R32-FLEET.7's "your prompt was queued" arrives as an `error` frame. Printing
|
|
71
|
+
* it in red under an "Error:" heading would tell the operator their prompt
|
|
72
|
+
* failed at the exact moment it did not.
|
|
73
|
+
*/
|
|
74
|
+
const NOTICE_ERROR_CODES = new Set(["PROMPT_QUEUED"]);
|
|
75
|
+
/** Whether an `error` frame is a notice rather than a failure. */
|
|
76
|
+
export function isAttachNotice(code) {
|
|
77
|
+
return code !== undefined && NOTICE_ERROR_CODES.has(code);
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Resolve a typed line against the options an ask actually offered.
|
|
81
|
+
*
|
|
82
|
+
* Three spellings are accepted, and all three name an OFFERED option: its id, its label, or its
|
|
83
|
+
* 1-based position in the rendered list. Nothing else resolves — there is deliberately no
|
|
84
|
+
* "y"/"yes" fallback, no prefix match and no default, because every one of those invents an
|
|
85
|
+
* option the session did not offer and the whole point of answering by id is that the ask
|
|
86
|
+
* decides what may happen, not the renderer.
|
|
87
|
+
*
|
|
88
|
+
* Id and label are tried BEFORE the ordinal, so an ask that offers an option literally called
|
|
89
|
+
* "1" is answered by naming it rather than by whatever happens to sit first in the list.
|
|
90
|
+
*
|
|
91
|
+
* Exported for the option-matching tests; `runAttachMode` is the only production caller.
|
|
92
|
+
*/
|
|
93
|
+
export function matchPermissionAnswer(line, options) {
|
|
94
|
+
const typed = line.trim();
|
|
95
|
+
if (typed === "")
|
|
96
|
+
return undefined;
|
|
97
|
+
const folded = typed.toLowerCase();
|
|
98
|
+
const named = options.find((option) => option.id.toLowerCase() === folded || option.label.trim().toLowerCase() === folded);
|
|
99
|
+
if (named !== undefined)
|
|
100
|
+
return named;
|
|
101
|
+
if (!/^\d+$/.test(typed))
|
|
102
|
+
return undefined;
|
|
103
|
+
const ordinal = Number.parseInt(typed, 10);
|
|
104
|
+
if (ordinal < 1 || ordinal > options.length)
|
|
105
|
+
return undefined;
|
|
106
|
+
return options[ordinal - 1];
|
|
107
|
+
}
|
|
108
|
+
/** The one-line "that was not one of the choices" reminder, listing what IS on offer. */
|
|
109
|
+
export function permissionAnswerReminder(options) {
|
|
110
|
+
const offered = options.map((option, index) => `${index + 1}) ${option.label} [${option.id}]`).join(" ");
|
|
111
|
+
return `Not one of the offered answers — nothing was sent. Answer with: ${offered}`;
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Render one permission ask from its TYPED fields.
|
|
115
|
+
*
|
|
116
|
+
* Deliberately NOT built from the legacy `title`/`message` prose: that sentence is
|
|
117
|
+
* `${toolName}: ${reason}`, which cannot say which directory the command would run in or what
|
|
118
|
+
* the command actually is, and a human approving a `bash` call needs both. The typed fields are
|
|
119
|
+
* already neutralized and bounded where the frame was CONSTRUCTED (`safe-text.ts`), so nothing
|
|
120
|
+
* here re-sanitizes them — doing so twice is how a doubly-escaped command stops being the
|
|
121
|
+
* command the human is deciding about.
|
|
122
|
+
*
|
|
123
|
+
* NOTE ON `reason`: the socket frame carries no dedicated field for it. The permission gate
|
|
124
|
+
* folds it into `message` as `${toolName}: ${reason}`, so that field is rendered under its own
|
|
125
|
+
* name, on its own line, AFTER the typed facts rather than instead of them.
|
|
126
|
+
*
|
|
127
|
+
* Returned as lines rather than printed so the shape is testable without a socket.
|
|
128
|
+
*/
|
|
129
|
+
export function renderPermissionAsk(message) {
|
|
130
|
+
const lines = [];
|
|
131
|
+
lines.push("");
|
|
132
|
+
lines.push(chalk.bold.yellow("Permission required"));
|
|
133
|
+
lines.push(` Tool: ${message.toolName}`);
|
|
134
|
+
lines.push(` Directory: ${message.cwd}`);
|
|
135
|
+
if (message.command !== undefined) {
|
|
136
|
+
lines.push(` Command: ${message.command}`);
|
|
137
|
+
}
|
|
138
|
+
if (message.path !== undefined) {
|
|
139
|
+
lines.push(` Path: ${message.path}`);
|
|
140
|
+
}
|
|
141
|
+
if (message.operation !== undefined) {
|
|
142
|
+
lines.push(` Operation: ${message.operation}`);
|
|
143
|
+
}
|
|
144
|
+
if (message.message !== "") {
|
|
145
|
+
lines.push(` Reason: ${message.message}`);
|
|
146
|
+
}
|
|
147
|
+
if (message.truncated) {
|
|
148
|
+
// Said out loud: a decision made on an elided string is a decision made on less than the
|
|
149
|
+
// whole truth, and the human is entitled to know that before answering.
|
|
150
|
+
lines.push(chalk.yellow(" (some fields were too long and were shortened for display)"));
|
|
151
|
+
}
|
|
152
|
+
for (const [index, option] of message.options.entries()) {
|
|
153
|
+
lines.push(` ${index + 1}) ${option.label} [${option.id}]`);
|
|
154
|
+
}
|
|
155
|
+
lines.push(chalk.dim("Type the number, the label or the id to answer. Anything else is not sent."));
|
|
156
|
+
return lines;
|
|
157
|
+
}
|
|
158
|
+
/** How a settled ask is reported back to the operator, naming who actually decided it. */
|
|
159
|
+
export function renderPermissionResolution(message) {
|
|
160
|
+
const who = message.clientId === null ? message.surface : `${message.surface} (${message.clientId})`;
|
|
161
|
+
const chosen = message.chosenOptionId === null ? "" : ` [${message.chosenOptionId}]`;
|
|
162
|
+
return `Permission ${message.decision}${chosen} — answered on ${who}`;
|
|
163
|
+
}
|
|
12
164
|
/**
|
|
13
165
|
* Run attach mode - connect to an existing socket session.
|
|
14
166
|
*
|
|
@@ -17,12 +169,36 @@ import { SocketClient } from "../core/socket-server/index.js";
|
|
|
17
169
|
export async function runAttachMode(sessionId) {
|
|
18
170
|
const agentDir = getAgentDir();
|
|
19
171
|
const socketDir = path.join(agentDir, "sockets");
|
|
20
|
-
|
|
172
|
+
let socketPath;
|
|
173
|
+
try {
|
|
174
|
+
socketPath = resolveAttachSocketPath(sessionId, socketDir);
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
const message = error instanceof Error ? error.message : "Invalid session id";
|
|
178
|
+
console.error(chalk.red(`Invalid --attach value: ${sessionId}`));
|
|
179
|
+
console.error(chalk.dim(message));
|
|
180
|
+
console.error(chalk.dim(`\nList running sessions with: ${APP_NAME} --list-sessions\n`));
|
|
181
|
+
process.exit(1);
|
|
182
|
+
}
|
|
21
183
|
console.log(chalk.dim(`Attaching to session ${chalk.cyan(sessionId)}...`));
|
|
22
184
|
const client = new SocketClient({
|
|
23
185
|
socketPath,
|
|
24
186
|
mode: "read-write",
|
|
25
187
|
});
|
|
188
|
+
/**
|
|
189
|
+
* Asks this client has been shown and that nobody has settled yet, oldest first.
|
|
190
|
+
*
|
|
191
|
+
* A list rather than a single slot because the session may legitimately have several asks in
|
|
192
|
+
* flight, and because a REPLAY after reconnect re-sends everything still pending: keying by
|
|
193
|
+
* `requestId` is what makes the same ask arriving twice re-render once instead of queueing a
|
|
194
|
+
* phantom second dialog whose answer would be refused as `PERMISSION_ALREADY_RESOLVED`.
|
|
195
|
+
*
|
|
196
|
+
* Only the head is answerable. Answer mode ends for an ask when its `permission_resolved`
|
|
197
|
+
* arrives — never when this client sends an answer, because the answer may be refused, and a
|
|
198
|
+
* client that dropped out of answer mode on send would forward the operator's second attempt
|
|
199
|
+
* to the model as a chat prompt.
|
|
200
|
+
*/
|
|
201
|
+
const pendingAsks = [];
|
|
26
202
|
// Handle session metadata
|
|
27
203
|
client.onMetadata((sessionId, cwd, createdAt) => {
|
|
28
204
|
console.log(chalk.dim(`Connected to session ${chalk.cyan(sessionId)}`));
|
|
@@ -51,10 +227,54 @@ export async function runAttachMode(sessionId) {
|
|
|
51
227
|
client.onClientLeft((clientId) => {
|
|
52
228
|
console.log(chalk.dim(`\n[${clientId} left]\n`));
|
|
53
229
|
});
|
|
230
|
+
// A permission ask raised by the session. Printed on its own, never spliced into the output
|
|
231
|
+
// stream: the output stream is the agent talking, and this is the session asking THIS human a
|
|
232
|
+
// question it will block on until somebody answers.
|
|
233
|
+
client.onPermissionRequest((message) => {
|
|
234
|
+
const known = pendingAsks.findIndex((ask) => ask.requestId === message.requestId);
|
|
235
|
+
if (known >= 0) {
|
|
236
|
+
// A replay of something already outstanding (a reconnect shows every pending ask again).
|
|
237
|
+
// Refresh what is on file and re-render only if it is the one being answered right now.
|
|
238
|
+
pendingAsks[known] = message;
|
|
239
|
+
if (known === 0) {
|
|
240
|
+
for (const line of renderPermissionAsk(message))
|
|
241
|
+
console.log(line);
|
|
242
|
+
}
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
245
|
+
pendingAsks.push(message);
|
|
246
|
+
if (pendingAsks.length === 1) {
|
|
247
|
+
for (const line of renderPermissionAsk(message))
|
|
248
|
+
console.log(line);
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
console.log(chalk.dim(`[${pendingAsks.length - 1} more permission ask(s) waiting]`));
|
|
252
|
+
});
|
|
253
|
+
// How an ask ended, whoever ended it. This is R34-PERM.2's echo arriving at this surface: when
|
|
254
|
+
// a phone answered first, the operator sitting here must be told that, not left holding a
|
|
255
|
+
// dialog that has already been decided somewhere else.
|
|
256
|
+
client.onPermissionResolved((message) => {
|
|
257
|
+
const index = pendingAsks.findIndex((ask) => ask.requestId === message.requestId);
|
|
258
|
+
console.log(chalk.cyan(`\n${renderPermissionResolution(message)}\n`));
|
|
259
|
+
if (index < 0)
|
|
260
|
+
return;
|
|
261
|
+
pendingAsks.splice(index, 1);
|
|
262
|
+
const next = pendingAsks[0];
|
|
263
|
+
if (index === 0 && next !== undefined) {
|
|
264
|
+
for (const line of renderPermissionAsk(next))
|
|
265
|
+
console.log(line);
|
|
266
|
+
}
|
|
267
|
+
});
|
|
54
268
|
// Handle errors
|
|
55
|
-
client.onError((message) => {
|
|
269
|
+
client.onError((message, code) => {
|
|
270
|
+
if (isAttachNotice(code)) {
|
|
271
|
+
console.log(chalk.dim(`\n[${message}]\n`));
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
56
274
|
console.error(chalk.red(`\nError: ${message}\n`));
|
|
57
|
-
|
|
275
|
+
if (isFatalAttachError(code)) {
|
|
276
|
+
process.exit(1);
|
|
277
|
+
}
|
|
58
278
|
});
|
|
59
279
|
// Handle disconnect
|
|
60
280
|
client.onDisconnect(() => {
|
|
@@ -79,6 +299,24 @@ export async function runAttachMode(sessionId) {
|
|
|
79
299
|
});
|
|
80
300
|
rl.prompt();
|
|
81
301
|
rl.on("line", (line) => {
|
|
302
|
+
const ask = pendingAsks[0];
|
|
303
|
+
if (ask !== undefined) {
|
|
304
|
+
// ANSWER MODE. The session is blocked on a decision, so this line is a decision or it
|
|
305
|
+
// is nothing — it is never forwarded as a prompt. A line that names no offered option
|
|
306
|
+
// is refused HERE, locally, and costs the ask nothing: bouncing it off the session
|
|
307
|
+
// would either be rejected there anyway or, worse, land in the model's context as a
|
|
308
|
+
// chat message the human meant as an answer.
|
|
309
|
+
const option = matchPermissionAnswer(line, ask.options);
|
|
310
|
+
if (option === undefined) {
|
|
311
|
+
console.log(chalk.yellow(permissionAnswerReminder(ask.options)));
|
|
312
|
+
rl.prompt();
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
client.sendPermissionResponse(ask.requestId, option.id);
|
|
316
|
+
console.log(chalk.dim(`Answered "${option.label}" — waiting for the session to confirm...`));
|
|
317
|
+
rl.prompt();
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
82
320
|
if (line.trim()) {
|
|
83
321
|
client.sendInput(`${line}\n`);
|
|
84
322
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach-mode.js","sourceRoot":"","sources":["../../src/cli/attach-mode.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Attach mode - Connect to an existing socket-based draht session\n *\n * Provides tmux-style attachment where you can see output and send input\n * to a running session. Multiple clients can attach simultaneously.\n */\n\nimport path from \"node:path\";\nimport { createInterface } from \"node:readline\";\nimport chalk from \"chalk\";\nimport { getAgentDir } from \"../config.js\";\nimport { SocketClient } from \"../core/socket-server/index.js\";\n\n/**\n * Run attach mode - connect to an existing socket session.\n *\n * @param sessionId - Session ID to attach to\n */\nexport async function runAttachMode(sessionId: string): Promise<void> {\n\tconst agentDir = getAgentDir();\n\tconst socketDir = path.join(agentDir, \"sockets\");\n\tconst socketPath = path.join(socketDir, `${sessionId}.sock`);\n\n\tconsole.log(chalk.dim(`Attaching to session ${chalk.cyan(sessionId)}...`));\n\n\tconst client = new SocketClient({\n\t\tsocketPath,\n\t\tmode: \"read-write\",\n\t});\n\n\t// Handle session metadata\n\tclient.onMetadata((sessionId, cwd, createdAt) => {\n\t\tconsole.log(chalk.dim(`Connected to session ${chalk.cyan(sessionId)}`));\n\t\tconsole.log(chalk.dim(`CWD: ${cwd}`));\n\t\tconsole.log(chalk.dim(`Created: ${createdAt.toLocaleString()}`));\n\t\tconsole.log(chalk.dim(`\\nType messages to send input, Ctrl+D to detach\\n`));\n\t});\n\n\t// Handle output from session\n\tclient.onOutput((data, stream) => {\n\t\tif (stream === \"stderr\") {\n\t\t\tprocess.stderr.write(chalk.red(data));\n\t\t} else {\n\t\t\tprocess.stdout.write(data);\n\t\t}\n\t});\n\n\t// Handle input echo from other clients\n\tclient.onInputEcho((data, clientId) => {\n\t\t// Show who typed what (tmux-style)\n\t\tconsole.log(chalk.dim(`[${clientId}] `) + chalk.yellow(data));\n\t});\n\n\t// Handle other clients joining/leaving\n\tclient.onClientJoined((clientId, mode) => {\n\t\tconsole.log(chalk.dim(`\\n[${clientId} joined (${mode})]\\n`));\n\t});\n\n\tclient.onClientLeft((clientId) => {\n\t\tconsole.log(chalk.dim(`\\n[${clientId} left]\\n`));\n\t});\n\n\t// Handle errors\n\tclient.onError((message) => {\n\t\tconsole.error(chalk.red(`\\nError: ${message}\\n`));\n\t\tprocess.exit(1);\n\t});\n\n\t// Handle disconnect\n\tclient.onDisconnect(() => {\n\t\tconsole.log(chalk.dim(\"\\nDisconnected from session.\\n\"));\n\t\tprocess.exit(0);\n\t});\n\n\t// Connect to socket\n\ttry {\n\t\tawait client.connect();\n\t} catch (err) {\n\t\tconsole.error(chalk.red(`Failed to connect: ${err instanceof Error ? err.message : \"Unknown error\"}`));\n\t\tconsole.error(chalk.dim(`\\nSocket path: ${socketPath}`));\n\t\tconsole.error(chalk.dim(`\\nCheck if the session is running with: draht --list-sessions\\n`));\n\t\tprocess.exit(1);\n\t}\n\n\t// Set up readline for input\n\tconst rl = createInterface({\n\t\tinput: process.stdin,\n\t\toutput: process.stdout,\n\t\tprompt: chalk.dim(\"> \"),\n\t});\n\n\trl.prompt();\n\n\trl.on(\"line\", (line) => {\n\t\tif (line.trim()) {\n\t\t\tclient.sendInput(`${line}\\n`);\n\t\t}\n\t\trl.prompt();\n\t});\n\n\trl.on(\"close\", () => {\n\t\tclient.disconnect();\n\t\tprocess.exit(0);\n\t});\n\n\t// Handle Ctrl+C\n\tprocess.on(\"SIGINT\", () => {\n\t\tclient.disconnect();\n\t\tprocess.exit(0);\n\t});\n}\n"]}
|
|
1
|
+
{"version":3,"file":"attach-mode.js","sourceRoot":"","sources":["../../src/cli/attach-mode.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Attach mode - Connect to an existing socket-based draht session\n *\n * Provides tmux-style attachment where you can see output and send input\n * to a running session. Multiple clients can attach simultaneously.\n *\n * It is also the THIRD renderer of a permission ask (R34-PERM.2), and the one that used to\n * swallow answers: every typed line went out as an `input` frame, so a human typing \"Yes\" at a\n * dialog the session had raised did not answer it — the word arrived as a queued chat prompt\n * while the agent sat parked inside `beforeToolCall` waiting for a decision that could never\n * come. The answer mode below is that bug's fix: while an ask is outstanding, a typed line is an\n * ANSWER or it is nothing at all.\n */\n\nimport path from \"node:path\";\nimport { createInterface } from \"node:readline\";\nimport chalk from \"chalk\";\nimport { APP_NAME, getAgentDir } from \"../config.js\";\nimport { assertValidSessionId } from \"../core/session-manager.js\";\nimport {\n\ttype PermissionOption,\n\ttype PermissionRequestMessage,\n\ttype PermissionResolvedMessage,\n\tSocketClient,\n} from \"../core/socket-server/index.js\";\n\n/**\n * Build the socket path for a session id supplied on the command line.\n *\n * The value is validated with the same rule the session manager applies when creating\n * ids, so a `--attach` argument can never traverse out of the socket directory.\n *\n * @throws {Error} When the session id is not a valid session id.\n */\nexport function resolveAttachSocketPath(sessionId: string, socketDir: string): string {\n\tassertValidSessionId(sessionId);\n\treturn path.join(socketDir, `${sessionId}.sock`);\n}\n\n/**\n * Error frames that report a recoverable condition rather than a dead session.\n *\n * `PROMPT_FAILED` means one prompt was rejected (no model, no credentials),\n * `PROMPT_QUEUED` means a prompt sent mid-turn was accepted and runs when the current\n * turn finishes (R32-FLEET.7), and `SESSION_REPLACED` means the runtime switched\n * sessions - in all three cases the client is still attached and the session is still\n * there, so the client prints the message and stays.\n *\n * The `PERMISSION_*` codes are every way the session can REFUSE ONE ANSWER (R34-PERM.1): the\n * ask is gone, the option was never offered, somebody else already decided, this connection is\n * read-only or never declared the capability. A refusal is a statement about that one keystroke\n * and about nothing else — the session is still running and this client is still attached — so\n * exiting on it would turn \"you named an option I did not offer\" into a lost session.\n */\nconst NON_FATAL_ERROR_CODES = new Set([\n\t\"PROMPT_FAILED\",\n\t\"PROMPT_QUEUED\",\n\t\"SESSION_REPLACED\",\n\t\"PERMISSION_UNKNOWN_REQUEST\",\n\t\"PERMISSION_INVALID_OPTION\",\n\t\"PERMISSION_ALREADY_RESOLVED\",\n\t\"PERMISSION_NOT_ATTACHED\",\n\t\"PERMISSION_READ_ONLY\",\n\t\"PERMISSION_NOT_CAPABLE\",\n]);\n\n/**\n * Whether an `error` frame from the server should end the attached client.\n *\n * Uncoded frames stay fatal: they report protocol or attach failures.\n */\nexport function isFatalAttachError(code?: string): boolean {\n\treturn code === undefined || !NON_FATAL_ERROR_CODES.has(code);\n}\n\n/**\n * Codes that ride the `error` channel while reporting something that went RIGHT.\n *\n * The socket wire has one server→client channel for out-of-band messages, so\n * R32-FLEET.7's \"your prompt was queued\" arrives as an `error` frame. Printing\n * it in red under an \"Error:\" heading would tell the operator their prompt\n * failed at the exact moment it did not.\n */\nconst NOTICE_ERROR_CODES = new Set([\"PROMPT_QUEUED\"]);\n\n/** Whether an `error` frame is a notice rather than a failure. */\nexport function isAttachNotice(code?: string): boolean {\n\treturn code !== undefined && NOTICE_ERROR_CODES.has(code);\n}\n\n/**\n * Resolve a typed line against the options an ask actually offered.\n *\n * Three spellings are accepted, and all three name an OFFERED option: its id, its label, or its\n * 1-based position in the rendered list. Nothing else resolves — there is deliberately no\n * \"y\"/\"yes\" fallback, no prefix match and no default, because every one of those invents an\n * option the session did not offer and the whole point of answering by id is that the ask\n * decides what may happen, not the renderer.\n *\n * Id and label are tried BEFORE the ordinal, so an ask that offers an option literally called\n * \"1\" is answered by naming it rather than by whatever happens to sit first in the list.\n *\n * Exported for the option-matching tests; `runAttachMode` is the only production caller.\n */\nexport function matchPermissionAnswer(\n\tline: string,\n\toptions: readonly PermissionOption[],\n): PermissionOption | undefined {\n\tconst typed = line.trim();\n\tif (typed === \"\") return undefined;\n\n\tconst folded = typed.toLowerCase();\n\tconst named = options.find(\n\t\t(option) => option.id.toLowerCase() === folded || option.label.trim().toLowerCase() === folded,\n\t);\n\tif (named !== undefined) return named;\n\n\tif (!/^\\d+$/.test(typed)) return undefined;\n\tconst ordinal = Number.parseInt(typed, 10);\n\tif (ordinal < 1 || ordinal > options.length) return undefined;\n\treturn options[ordinal - 1];\n}\n\n/** The one-line \"that was not one of the choices\" reminder, listing what IS on offer. */\nexport function permissionAnswerReminder(options: readonly PermissionOption[]): string {\n\tconst offered = options.map((option, index) => `${index + 1}) ${option.label} [${option.id}]`).join(\" \");\n\treturn `Not one of the offered answers — nothing was sent. Answer with: ${offered}`;\n}\n\n/**\n * Render one permission ask from its TYPED fields.\n *\n * Deliberately NOT built from the legacy `title`/`message` prose: that sentence is\n * `${toolName}: ${reason}`, which cannot say which directory the command would run in or what\n * the command actually is, and a human approving a `bash` call needs both. The typed fields are\n * already neutralized and bounded where the frame was CONSTRUCTED (`safe-text.ts`), so nothing\n * here re-sanitizes them — doing so twice is how a doubly-escaped command stops being the\n * command the human is deciding about.\n *\n * NOTE ON `reason`: the socket frame carries no dedicated field for it. The permission gate\n * folds it into `message` as `${toolName}: ${reason}`, so that field is rendered under its own\n * name, on its own line, AFTER the typed facts rather than instead of them.\n *\n * Returned as lines rather than printed so the shape is testable without a socket.\n */\nexport function renderPermissionAsk(message: PermissionRequestMessage): string[] {\n\tconst lines: string[] = [];\n\tlines.push(\"\");\n\tlines.push(chalk.bold.yellow(\"Permission required\"));\n\tlines.push(` Tool: ${message.toolName}`);\n\tlines.push(` Directory: ${message.cwd}`);\n\tif (message.command !== undefined) {\n\t\tlines.push(` Command: ${message.command}`);\n\t}\n\tif (message.path !== undefined) {\n\t\tlines.push(` Path: ${message.path}`);\n\t}\n\tif (message.operation !== undefined) {\n\t\tlines.push(` Operation: ${message.operation}`);\n\t}\n\tif (message.message !== \"\") {\n\t\tlines.push(` Reason: ${message.message}`);\n\t}\n\tif (message.truncated) {\n\t\t// Said out loud: a decision made on an elided string is a decision made on less than the\n\t\t// whole truth, and the human is entitled to know that before answering.\n\t\tlines.push(chalk.yellow(\" (some fields were too long and were shortened for display)\"));\n\t}\n\tfor (const [index, option] of message.options.entries()) {\n\t\tlines.push(` ${index + 1}) ${option.label} [${option.id}]`);\n\t}\n\tlines.push(chalk.dim(\"Type the number, the label or the id to answer. Anything else is not sent.\"));\n\treturn lines;\n}\n\n/** How a settled ask is reported back to the operator, naming who actually decided it. */\nexport function renderPermissionResolution(message: PermissionResolvedMessage): string {\n\tconst who = message.clientId === null ? message.surface : `${message.surface} (${message.clientId})`;\n\tconst chosen = message.chosenOptionId === null ? \"\" : ` [${message.chosenOptionId}]`;\n\treturn `Permission ${message.decision}${chosen} — answered on ${who}`;\n}\n\n/**\n * Run attach mode - connect to an existing socket session.\n *\n * @param sessionId - Session ID to attach to\n */\nexport async function runAttachMode(sessionId: string): Promise<void> {\n\tconst agentDir = getAgentDir();\n\tconst socketDir = path.join(agentDir, \"sockets\");\n\n\tlet socketPath: string;\n\ttry {\n\t\tsocketPath = resolveAttachSocketPath(sessionId, socketDir);\n\t} catch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"Invalid session id\";\n\t\tconsole.error(chalk.red(`Invalid --attach value: ${sessionId}`));\n\t\tconsole.error(chalk.dim(message));\n\t\tconsole.error(chalk.dim(`\\nList running sessions with: ${APP_NAME} --list-sessions\\n`));\n\t\tprocess.exit(1);\n\t}\n\n\tconsole.log(chalk.dim(`Attaching to session ${chalk.cyan(sessionId)}...`));\n\n\tconst client = new SocketClient({\n\t\tsocketPath,\n\t\tmode: \"read-write\",\n\t});\n\n\t/**\n\t * Asks this client has been shown and that nobody has settled yet, oldest first.\n\t *\n\t * A list rather than a single slot because the session may legitimately have several asks in\n\t * flight, and because a REPLAY after reconnect re-sends everything still pending: keying by\n\t * `requestId` is what makes the same ask arriving twice re-render once instead of queueing a\n\t * phantom second dialog whose answer would be refused as `PERMISSION_ALREADY_RESOLVED`.\n\t *\n\t * Only the head is answerable. Answer mode ends for an ask when its `permission_resolved`\n\t * arrives — never when this client sends an answer, because the answer may be refused, and a\n\t * client that dropped out of answer mode on send would forward the operator's second attempt\n\t * to the model as a chat prompt.\n\t */\n\tconst pendingAsks: PermissionRequestMessage[] = [];\n\n\t// Handle session metadata\n\tclient.onMetadata((sessionId, cwd, createdAt) => {\n\t\tconsole.log(chalk.dim(`Connected to session ${chalk.cyan(sessionId)}`));\n\t\tconsole.log(chalk.dim(`CWD: ${cwd}`));\n\t\tconsole.log(chalk.dim(`Created: ${createdAt.toLocaleString()}`));\n\t\tconsole.log(chalk.dim(`\\nType messages to send input, Ctrl+D to detach\\n`));\n\t});\n\n\t// Handle output from session\n\tclient.onOutput((data, stream) => {\n\t\tif (stream === \"stderr\") {\n\t\t\tprocess.stderr.write(chalk.red(data));\n\t\t} else {\n\t\t\tprocess.stdout.write(data);\n\t\t}\n\t});\n\n\t// Handle input echo from other clients\n\tclient.onInputEcho((data, clientId) => {\n\t\t// Show who typed what (tmux-style)\n\t\tconsole.log(chalk.dim(`[${clientId}] `) + chalk.yellow(data));\n\t});\n\n\t// Handle other clients joining/leaving\n\tclient.onClientJoined((clientId, mode) => {\n\t\tconsole.log(chalk.dim(`\\n[${clientId} joined (${mode})]\\n`));\n\t});\n\n\tclient.onClientLeft((clientId) => {\n\t\tconsole.log(chalk.dim(`\\n[${clientId} left]\\n`));\n\t});\n\n\t// A permission ask raised by the session. Printed on its own, never spliced into the output\n\t// stream: the output stream is the agent talking, and this is the session asking THIS human a\n\t// question it will block on until somebody answers.\n\tclient.onPermissionRequest((message) => {\n\t\tconst known = pendingAsks.findIndex((ask) => ask.requestId === message.requestId);\n\t\tif (known >= 0) {\n\t\t\t// A replay of something already outstanding (a reconnect shows every pending ask again).\n\t\t\t// Refresh what is on file and re-render only if it is the one being answered right now.\n\t\t\tpendingAsks[known] = message;\n\t\t\tif (known === 0) {\n\t\t\t\tfor (const line of renderPermissionAsk(message)) console.log(line);\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\n\t\tpendingAsks.push(message);\n\t\tif (pendingAsks.length === 1) {\n\t\t\tfor (const line of renderPermissionAsk(message)) console.log(line);\n\t\t\treturn;\n\t\t}\n\t\tconsole.log(chalk.dim(`[${pendingAsks.length - 1} more permission ask(s) waiting]`));\n\t});\n\n\t// How an ask ended, whoever ended it. This is R34-PERM.2's echo arriving at this surface: when\n\t// a phone answered first, the operator sitting here must be told that, not left holding a\n\t// dialog that has already been decided somewhere else.\n\tclient.onPermissionResolved((message) => {\n\t\tconst index = pendingAsks.findIndex((ask) => ask.requestId === message.requestId);\n\t\tconsole.log(chalk.cyan(`\\n${renderPermissionResolution(message)}\\n`));\n\t\tif (index < 0) return;\n\t\tpendingAsks.splice(index, 1);\n\t\tconst next = pendingAsks[0];\n\t\tif (index === 0 && next !== undefined) {\n\t\t\tfor (const line of renderPermissionAsk(next)) console.log(line);\n\t\t}\n\t});\n\n\t// Handle errors\n\tclient.onError((message, code) => {\n\t\tif (isAttachNotice(code)) {\n\t\t\tconsole.log(chalk.dim(`\\n[${message}]\\n`));\n\t\t\treturn;\n\t\t}\n\t\tconsole.error(chalk.red(`\\nError: ${message}\\n`));\n\t\tif (isFatalAttachError(code)) {\n\t\t\tprocess.exit(1);\n\t\t}\n\t});\n\n\t// Handle disconnect\n\tclient.onDisconnect(() => {\n\t\tconsole.log(chalk.dim(\"\\nDisconnected from session.\\n\"));\n\t\tprocess.exit(0);\n\t});\n\n\t// Connect to socket\n\ttry {\n\t\tawait client.connect();\n\t} catch (err) {\n\t\tconsole.error(chalk.red(`Failed to connect: ${err instanceof Error ? err.message : \"Unknown error\"}`));\n\t\tconsole.error(chalk.dim(`\\nSocket path: ${socketPath}`));\n\t\tconsole.error(chalk.dim(`\\nCheck if the session is running with: draht --list-sessions\\n`));\n\t\tprocess.exit(1);\n\t}\n\n\t// Set up readline for input\n\tconst rl = createInterface({\n\t\tinput: process.stdin,\n\t\toutput: process.stdout,\n\t\tprompt: chalk.dim(\"> \"),\n\t});\n\n\trl.prompt();\n\n\trl.on(\"line\", (line) => {\n\t\tconst ask = pendingAsks[0];\n\t\tif (ask !== undefined) {\n\t\t\t// ANSWER MODE. The session is blocked on a decision, so this line is a decision or it\n\t\t\t// is nothing — it is never forwarded as a prompt. A line that names no offered option\n\t\t\t// is refused HERE, locally, and costs the ask nothing: bouncing it off the session\n\t\t\t// would either be rejected there anyway or, worse, land in the model's context as a\n\t\t\t// chat message the human meant as an answer.\n\t\t\tconst option = matchPermissionAnswer(line, ask.options);\n\t\t\tif (option === undefined) {\n\t\t\t\tconsole.log(chalk.yellow(permissionAnswerReminder(ask.options)));\n\t\t\t\trl.prompt();\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tclient.sendPermissionResponse(ask.requestId, option.id);\n\t\t\tconsole.log(chalk.dim(`Answered \"${option.label}\" — waiting for the session to confirm...`));\n\t\t\trl.prompt();\n\t\t\treturn;\n\t\t}\n\n\t\tif (line.trim()) {\n\t\t\tclient.sendInput(`${line}\\n`);\n\t\t}\n\t\trl.prompt();\n\t});\n\n\trl.on(\"close\", () => {\n\t\tclient.disconnect();\n\t\tprocess.exit(0);\n\t});\n\n\t// Handle Ctrl+C\n\tprocess.on(\"SIGINT\", () => {\n\t\tclient.disconnect();\n\t\tprocess.exit(0);\n\t});\n}\n"]}
|
|
@@ -9,7 +9,7 @@ export async function selectConfig(options) {
|
|
|
9
9
|
// Initialize theme before showing TUI
|
|
10
10
|
initTheme(options.settingsManager.getTheme(), true);
|
|
11
11
|
return new Promise((resolve) => {
|
|
12
|
-
const ui = new TUI(new ProcessTerminal());
|
|
12
|
+
const ui = new TUI(new ProcessTerminal(), undefined, options.agentDir);
|
|
13
13
|
let resolved = false;
|
|
14
14
|
const selector = new ConfigSelectorComponent(options.resolvedPaths, options.settingsManager, options.cwd, options.agentDir, () => {
|
|
15
15
|
if (!resolved) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-selector.js","sourceRoot":"","sources":["../../src/cli/config-selector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAA4B,MAAM,oDAAoD,CAAC;AACvH,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAWlF,sDAAsD;AACtD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAA8B;IAChE,sCAAsC;IACtC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;IAEpD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config-selector.js","sourceRoot":"","sources":["../../src/cli/config-selector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAA4B,MAAM,oDAAoD,CAAC;AACvH,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAWlF,sDAAsD;AACtD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAA8B;IAChE,sCAAsC;IACtC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;IAEpD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,IAAI,eAAe,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvE,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAC3C,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,QAAQ,EAChB,GAAG,EAAE;YACJ,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,QAAQ,GAAG,IAAI,CAAC;gBAChB,EAAE,CAAC,IAAI,EAAE,CAAC;gBACV,gBAAgB,EAAE,CAAC;gBACnB,OAAO,EAAE,CAAC;YACX,CAAC;QACF,CAAC,EACD,GAAG,EAAE;YACJ,EAAE,CAAC,IAAI,EAAE,CAAC;YACV,gBAAgB,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC,EACD,GAAG,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,EACxB,EAAE,CAAC,QAAQ,CAAC,IAAI,EAChB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,oBAAoB,CAC5B,CAAC;QAEF,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACtB,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;QACxC,EAAE,CAAC,KAAK,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACJ,CAAC","sourcesContent":["/**\n * TUI config selector for `pi config` command\n */\n\nimport { ProcessTerminal, TUI } from \"@draht/tui\";\nimport type { SettingsManager } from \"../core/settings-manager.ts\";\nimport { ConfigSelectorComponent, type ScopedResolvedPaths } from \"../modes/interactive/components/config-selector.ts\";\nimport { initTheme, stopThemeWatcher } from \"../modes/interactive/theme/theme.ts\";\n\nexport interface ConfigSelectorOptions {\n\tresolvedPaths: ScopedResolvedPaths;\n\tsettingsManager: SettingsManager;\n\tcwd: string;\n\tagentDir: string;\n\twriteScope: \"global\" | \"project\";\n\tprojectModeAvailable: boolean;\n}\n\n/** Show TUI config selector and return when closed */\nexport async function selectConfig(options: ConfigSelectorOptions): Promise<void> {\n\t// Initialize theme before showing TUI\n\tinitTheme(options.settingsManager.getTheme(), true);\n\n\treturn new Promise((resolve) => {\n\t\tconst ui = new TUI(new ProcessTerminal(), undefined, options.agentDir);\n\t\tlet resolved = false;\n\n\t\tconst selector = new ConfigSelectorComponent(\n\t\t\toptions.resolvedPaths,\n\t\t\toptions.settingsManager,\n\t\t\toptions.cwd,\n\t\t\toptions.agentDir,\n\t\t\t() => {\n\t\t\t\tif (!resolved) {\n\t\t\t\t\tresolved = true;\n\t\t\t\t\tui.stop();\n\t\t\t\t\tstopThemeWatcher();\n\t\t\t\t\tresolve();\n\t\t\t\t}\n\t\t\t},\n\t\t\t() => {\n\t\t\t\tui.stop();\n\t\t\t\tstopThemeWatcher();\n\t\t\t\tprocess.exit(0);\n\t\t\t},\n\t\t\t() => ui.requestRender(),\n\t\t\tui.terminal.rows,\n\t\t\toptions.writeScope,\n\t\t\toptions.projectModeAvailable,\n\t\t);\n\n\t\tui.addChild(selector);\n\t\tui.setFocus(selector.getResourceList());\n\t\tui.start();\n\t});\n}\n"]}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { ModelRuntime } from "../core/model-runtime.ts";
|
|
2
|
+
import type { Args } from "./args.ts";
|
|
3
|
+
export type CredentialPrintKind = "api_key" | "bearer_token";
|
|
4
|
+
export interface CredentialPrintCommand {
|
|
5
|
+
kind: CredentialPrintKind;
|
|
6
|
+
args: string[];
|
|
7
|
+
minExpiryMs?: number;
|
|
8
|
+
}
|
|
9
|
+
export declare class CredentialPrintError extends Error {
|
|
10
|
+
}
|
|
11
|
+
export declare function isCredentialPrintHelp(args: string[]): boolean;
|
|
12
|
+
export declare function printCredentialPrintHelp(): void;
|
|
13
|
+
/** Parse the small, extensible `auth` command surface before normal startup. */
|
|
14
|
+
export declare function parseCredentialPrintCommand(args: string[]): CredentialPrintCommand | undefined;
|
|
15
|
+
export declare function validateCredentialPrintArgs(args: Args): void;
|
|
16
|
+
/**
|
|
17
|
+
* Resolve one request credential for a specific provider/model pair.
|
|
18
|
+
*
|
|
19
|
+
* This intentionally calls ModelRuntime.getAuth(), which refreshes and persists
|
|
20
|
+
* OAuth credentials with less than five minutes remaining through the normal request-auth path.
|
|
21
|
+
*/
|
|
22
|
+
export declare function resolveCredentialForPrint(args: Args, modelRuntime: ModelRuntime, kind: CredentialPrintKind, minExpiryMs?: number): Promise<string>;
|
|
23
|
+
//# sourceMappingURL=credential-print.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credential-print.d.ts","sourceRoot":"","sources":["../../src/cli/credential-print.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,cAAc,CAAC;AAI7D,MAAM,WAAW,sBAAsB;IACtC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAI7D;AAED,wBAAgB,wBAAwB,IAAI,IAAI,CAM/C;AAED,gFAAgF;AAChF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,sBAAsB,GAAG,SAAS,CA+B9F;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAU5D;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC9C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,mBAAmB,EACzB,WAAW,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA+DjB"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import { APP_NAME } from "../config.js";
|
|
2
|
+
import { resolveCliModel } from "../core/model-resolver.js";
|
|
3
|
+
const DEFAULT_BEARER_TOKEN_MIN_EXPIRY_MS = 30 * 60_000;
|
|
4
|
+
export class CredentialPrintError extends Error {
|
|
5
|
+
}
|
|
6
|
+
export function isCredentialPrintHelp(args) {
|
|
7
|
+
return (args[0] === "auth" && (args[1] === undefined || args[1] === "help" || args[1] === "--help" || args[1] === "-h"));
|
|
8
|
+
}
|
|
9
|
+
export function printCredentialPrintHelp() {
|
|
10
|
+
console.log(`Usage:
|
|
11
|
+
${APP_NAME} auth print-api-key --model <model> [--provider <provider>]
|
|
12
|
+
${APP_NAME} auth print-bearer-token --model <model> [--provider <provider>] [--min-expiry <duration>]
|
|
13
|
+
|
|
14
|
+
Prints the configured credential alone on stdout. Provider inference uses configured credentials; specify --provider to select explicitly. Bearer tokens have a 30-minute minimum expiry by default. --min-expiry accepts ms, s, m, or h (for example, 30m).`);
|
|
15
|
+
}
|
|
16
|
+
/** Parse the small, extensible `auth` command surface before normal startup. */
|
|
17
|
+
export function parseCredentialPrintCommand(args) {
|
|
18
|
+
if (args[0] !== "auth")
|
|
19
|
+
return undefined;
|
|
20
|
+
const kind = args[1] === "print-api-key" ? "api_key" : args[1] === "print-bearer-token" ? "bearer_token" : undefined;
|
|
21
|
+
if (!kind) {
|
|
22
|
+
throw new CredentialPrintError(`Unknown auth command "${args[1] ?? ""}". Use "${APP_NAME} auth print-api-key" or "${APP_NAME} auth print-bearer-token".`);
|
|
23
|
+
}
|
|
24
|
+
const commandArgs = [];
|
|
25
|
+
let minExpiryMs;
|
|
26
|
+
for (let index = 2; index < args.length; index++) {
|
|
27
|
+
if (args[index] !== "--min-expiry") {
|
|
28
|
+
commandArgs.push(args[index]);
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
if (kind !== "bearer_token") {
|
|
32
|
+
throw new CredentialPrintError("--min-expiry is only supported by print-bearer-token");
|
|
33
|
+
}
|
|
34
|
+
const value = args[++index];
|
|
35
|
+
const match = value ? /^(\d+)(ms|s|m|h)$/iu.exec(value) : undefined;
|
|
36
|
+
if (!match) {
|
|
37
|
+
throw new CredentialPrintError("--min-expiry must use a duration such as 30m or 1h");
|
|
38
|
+
}
|
|
39
|
+
const amount = Number(match[1]);
|
|
40
|
+
const unit = match[2];
|
|
41
|
+
minExpiryMs = amount * (unit === "ms" ? 1 : unit === "s" ? 1_000 : unit === "m" ? 60_000 : 3_600_000);
|
|
42
|
+
}
|
|
43
|
+
return minExpiryMs === undefined ? { kind, args: commandArgs } : { kind, args: commandArgs, minExpiryMs };
|
|
44
|
+
}
|
|
45
|
+
export function validateCredentialPrintArgs(args) {
|
|
46
|
+
if (!args.model?.trim()) {
|
|
47
|
+
throw new CredentialPrintError("Credential printing requires --model <model>");
|
|
48
|
+
}
|
|
49
|
+
if (args.apiKey !== undefined) {
|
|
50
|
+
throw new CredentialPrintError("Credential printing reads configured credentials; --api-key is not supported");
|
|
51
|
+
}
|
|
52
|
+
if (args.messages.length > 0 || args.fileArgs.length > 0 || args.unknownFlags.size > 0) {
|
|
53
|
+
throw new CredentialPrintError("Credential printing only accepts --provider and --model");
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Resolve one request credential for a specific provider/model pair.
|
|
58
|
+
*
|
|
59
|
+
* This intentionally calls ModelRuntime.getAuth(), which refreshes and persists
|
|
60
|
+
* OAuth credentials with less than five minutes remaining through the normal request-auth path.
|
|
61
|
+
*/
|
|
62
|
+
export async function resolveCredentialForPrint(args, modelRuntime, kind, minExpiryMs) {
|
|
63
|
+
validateCredentialPrintArgs(args);
|
|
64
|
+
const credentialTypes = new Map((await modelRuntime.listCredentials()).map((credential) => [credential.providerId, credential.type]));
|
|
65
|
+
const models = [];
|
|
66
|
+
if (args.provider) {
|
|
67
|
+
const resolved = resolveCliModel({ cliProvider: args.provider, cliModel: args.model, modelRuntime });
|
|
68
|
+
if (resolved.error || !resolved.model) {
|
|
69
|
+
throw new CredentialPrintError(resolved.error ?? "Unable to resolve the requested provider/model");
|
|
70
|
+
}
|
|
71
|
+
models.push(resolved.model);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
for (const provider of modelRuntime.getProviders()) {
|
|
75
|
+
if (!credentialTypes.has(provider.id))
|
|
76
|
+
continue;
|
|
77
|
+
const resolved = resolveCliModel({ cliProvider: provider.id, cliModel: args.model, modelRuntime });
|
|
78
|
+
if (resolved.model && !resolved.error && !resolved.warning?.includes("Using custom model id")) {
|
|
79
|
+
models.push(resolved.model);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
if (models.length === 0) {
|
|
83
|
+
throw new CredentialPrintError(`Model "${args.model}" not found. Use --list-models to see available models.`);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
const credentials = [];
|
|
87
|
+
for (const model of models) {
|
|
88
|
+
const type = credentialTypes.get(model.provider);
|
|
89
|
+
if (kind === "api_key" && type === "oauth")
|
|
90
|
+
continue;
|
|
91
|
+
if (kind === "bearer_token" && type !== "oauth")
|
|
92
|
+
continue;
|
|
93
|
+
const auth = await modelRuntime.getAuth(model, kind === "bearer_token"
|
|
94
|
+
? { minOAuthValidityMs: minExpiryMs ?? DEFAULT_BEARER_TOKEN_MIN_EXPIRY_MS }
|
|
95
|
+
: undefined);
|
|
96
|
+
const authorization = Object.entries(auth?.auth.headers ?? {}).find(([name]) => name.toLowerCase() === "authorization")?.[1];
|
|
97
|
+
const bearerToken = typeof authorization === "string" ? /^Bearer\s+(.+)$/iu.exec(authorization)?.[1] : undefined;
|
|
98
|
+
const value = kind === "bearer_token" ? (auth?.auth.apiKey ?? bearerToken) : auth?.auth.apiKey;
|
|
99
|
+
if (value)
|
|
100
|
+
credentials.push({ providerId: model.provider, value });
|
|
101
|
+
}
|
|
102
|
+
if (credentials.length === 1)
|
|
103
|
+
return credentials[0].value;
|
|
104
|
+
if (credentials.length === 0) {
|
|
105
|
+
const providerId = models[0]?.provider;
|
|
106
|
+
const type = providerId ? credentialTypes.get(providerId) : undefined;
|
|
107
|
+
if (args.provider && kind === "api_key" && type === "oauth") {
|
|
108
|
+
throw new CredentialPrintError(`Provider "${providerId}" is configured with OAuth, not an API key`);
|
|
109
|
+
}
|
|
110
|
+
if (args.provider && kind === "bearer_token" && type !== "oauth") {
|
|
111
|
+
throw new CredentialPrintError(`Provider "${providerId}" is not configured with an OAuth bearer token`);
|
|
112
|
+
}
|
|
113
|
+
throw new CredentialPrintError(`No usable ${kind === "api_key" ? "API key" : "OAuth bearer token"} is configured`);
|
|
114
|
+
}
|
|
115
|
+
throw new CredentialPrintError(`Model "${args.model}" has multiple configured providers (${credentials.map(({ providerId }) => providerId).join(", ")}). Specify --provider.`);
|
|
116
|
+
}
|
|
117
|
+
//# sourceMappingURL=credential-print.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credential-print.js","sourceRoot":"","sources":["../../src/cli/credential-print.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Api, CredentialInfo, Model } from \"@draht/ai\";\nimport { APP_NAME } from \"../config.ts\";\nimport { resolveCliModel } from \"../core/model-resolver.ts\";\nimport type { ModelRuntime } from \"../core/model-runtime.ts\";\nimport type { Args } from \"./args.ts\";\n\nexport type CredentialPrintKind = \"api_key\" | \"bearer_token\";\n\nconst DEFAULT_BEARER_TOKEN_MIN_EXPIRY_MS = 30 * 60_000;\n\nexport interface CredentialPrintCommand {\n\tkind: CredentialPrintKind;\n\targs: string[];\n\tminExpiryMs?: number;\n}\n\nexport class CredentialPrintError extends Error {}\n\nexport function isCredentialPrintHelp(args: string[]): boolean {\n\treturn (\n\t\targs[0] === \"auth\" && (args[1] === undefined || args[1] === \"help\" || args[1] === \"--help\" || args[1] === \"-h\")\n\t);\n}\n\nexport function printCredentialPrintHelp(): void {\n\tconsole.log(`Usage:\n ${APP_NAME} auth print-api-key --model <model> [--provider <provider>]\n ${APP_NAME} auth print-bearer-token --model <model> [--provider <provider>] [--min-expiry <duration>]\n\nPrints the configured credential alone on stdout. Provider inference uses configured credentials; specify --provider to select explicitly. Bearer tokens have a 30-minute minimum expiry by default. --min-expiry accepts ms, s, m, or h (for example, 30m).`);\n}\n\n/** Parse the small, extensible `auth` command surface before normal startup. */\nexport function parseCredentialPrintCommand(args: string[]): CredentialPrintCommand | undefined {\n\tif (args[0] !== \"auth\") return undefined;\n\n\tconst kind = args[1] === \"print-api-key\" ? \"api_key\" : args[1] === \"print-bearer-token\" ? \"bearer_token\" : undefined;\n\tif (!kind) {\n\t\tthrow new CredentialPrintError(\n\t\t\t`Unknown auth command \"${args[1] ?? \"\"}\". Use \"${APP_NAME} auth print-api-key\" or \"${APP_NAME} auth print-bearer-token\".`,\n\t\t);\n\t}\n\n\tconst commandArgs: string[] = [];\n\tlet minExpiryMs: number | undefined;\n\tfor (let index = 2; index < args.length; index++) {\n\t\tif (args[index] !== \"--min-expiry\") {\n\t\t\tcommandArgs.push(args[index]);\n\t\t\tcontinue;\n\t\t}\n\t\tif (kind !== \"bearer_token\") {\n\t\t\tthrow new CredentialPrintError(\"--min-expiry is only supported by print-bearer-token\");\n\t\t}\n\t\tconst value = args[++index];\n\t\tconst match = value ? /^(\\d+)(ms|s|m|h)$/iu.exec(value) : undefined;\n\t\tif (!match) {\n\t\t\tthrow new CredentialPrintError(\"--min-expiry must use a duration such as 30m or 1h\");\n\t\t}\n\t\tconst amount = Number(match[1]);\n\t\tconst unit = match[2];\n\t\tminExpiryMs = amount * (unit === \"ms\" ? 1 : unit === \"s\" ? 1_000 : unit === \"m\" ? 60_000 : 3_600_000);\n\t}\n\n\treturn minExpiryMs === undefined ? { kind, args: commandArgs } : { kind, args: commandArgs, minExpiryMs };\n}\n\nexport function validateCredentialPrintArgs(args: Args): void {\n\tif (!args.model?.trim()) {\n\t\tthrow new CredentialPrintError(\"Credential printing requires --model <model>\");\n\t}\n\tif (args.apiKey !== undefined) {\n\t\tthrow new CredentialPrintError(\"Credential printing reads configured credentials; --api-key is not supported\");\n\t}\n\tif (args.messages.length > 0 || args.fileArgs.length > 0 || args.unknownFlags.size > 0) {\n\t\tthrow new CredentialPrintError(\"Credential printing only accepts --provider and --model\");\n\t}\n}\n\n/**\n * Resolve one request credential for a specific provider/model pair.\n *\n * This intentionally calls ModelRuntime.getAuth(), which refreshes and persists\n * OAuth credentials with less than five minutes remaining through the normal request-auth path.\n */\nexport async function resolveCredentialForPrint(\n\targs: Args,\n\tmodelRuntime: ModelRuntime,\n\tkind: CredentialPrintKind,\n\tminExpiryMs?: number,\n): Promise<string> {\n\tvalidateCredentialPrintArgs(args);\n\n\tconst credentialTypes = new Map<string, CredentialInfo[\"type\"]>(\n\t\t(await modelRuntime.listCredentials()).map((credential) => [credential.providerId, credential.type]),\n\t);\n\tconst models: Model<Api>[] = [];\n\tif (args.provider) {\n\t\tconst resolved = resolveCliModel({ cliProvider: args.provider, cliModel: args.model, modelRuntime });\n\t\tif (resolved.error || !resolved.model) {\n\t\t\tthrow new CredentialPrintError(resolved.error ?? \"Unable to resolve the requested provider/model\");\n\t\t}\n\t\tmodels.push(resolved.model);\n\t} else {\n\t\tfor (const provider of modelRuntime.getProviders()) {\n\t\t\tif (!credentialTypes.has(provider.id)) continue;\n\t\t\tconst resolved = resolveCliModel({ cliProvider: provider.id, cliModel: args.model, modelRuntime });\n\t\t\tif (resolved.model && !resolved.error && !resolved.warning?.includes(\"Using custom model id\")) {\n\t\t\t\tmodels.push(resolved.model);\n\t\t\t}\n\t\t}\n\t\tif (models.length === 0) {\n\t\t\tthrow new CredentialPrintError(`Model \"${args.model}\" not found. Use --list-models to see available models.`);\n\t\t}\n\t}\n\n\tconst credentials: Array<{ providerId: string; value: string }> = [];\n\tfor (const model of models) {\n\t\tconst type = credentialTypes.get(model.provider);\n\t\tif (kind === \"api_key\" && type === \"oauth\") continue;\n\t\tif (kind === \"bearer_token\" && type !== \"oauth\") continue;\n\n\t\tconst auth = await modelRuntime.getAuth(\n\t\t\tmodel,\n\t\t\tkind === \"bearer_token\"\n\t\t\t\t? { minOAuthValidityMs: minExpiryMs ?? DEFAULT_BEARER_TOKEN_MIN_EXPIRY_MS }\n\t\t\t\t: undefined,\n\t\t);\n\t\tconst authorization = Object.entries(auth?.auth.headers ?? {}).find(\n\t\t\t([name]) => name.toLowerCase() === \"authorization\",\n\t\t)?.[1];\n\t\tconst bearerToken = typeof authorization === \"string\" ? /^Bearer\\s+(.+)$/iu.exec(authorization)?.[1] : undefined;\n\t\tconst value = kind === \"bearer_token\" ? (auth?.auth.apiKey ?? bearerToken) : auth?.auth.apiKey;\n\t\tif (value) credentials.push({ providerId: model.provider, value });\n\t}\n\n\tif (credentials.length === 1) return credentials[0].value;\n\tif (credentials.length === 0) {\n\t\tconst providerId = models[0]?.provider;\n\t\tconst type = providerId ? credentialTypes.get(providerId) : undefined;\n\t\tif (args.provider && kind === \"api_key\" && type === \"oauth\") {\n\t\t\tthrow new CredentialPrintError(`Provider \"${providerId}\" is configured with OAuth, not an API key`);\n\t\t}\n\t\tif (args.provider && kind === \"bearer_token\" && type !== \"oauth\") {\n\t\t\tthrow new CredentialPrintError(`Provider \"${providerId}\" is not configured with an OAuth bearer token`);\n\t\t}\n\t\tthrow new CredentialPrintError(\n\t\t\t`No usable ${kind === \"api_key\" ? \"API key\" : \"OAuth bearer token\"} is configured`,\n\t\t);\n\t}\n\tthrow new CredentialPrintError(\n\t\t`Model \"${args.model}\" has multiple configured providers (${credentials.map(({ providerId }) => providerId).join(\", \")}). Specify --provider.`,\n\t);\n}\n"]}
|