@roackb2/heddle 0.0.31 → 0.0.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +31 -5
- package/dist/examples/programmatic-loop.js +2 -0
- package/dist/examples/programmatic-loop.js.map +1 -1
- package/dist/src/cli/ask.d.ts +1 -0
- package/dist/src/cli/ask.d.ts.map +1 -1
- package/dist/src/cli/ask.js +20 -4
- package/dist/src/cli/ask.js.map +1 -1
- package/dist/src/cli/auth.d.ts +15 -0
- package/dist/src/cli/auth.d.ts.map +1 -0
- package/dist/src/cli/auth.js +79 -0
- package/dist/src/cli/auth.js.map +1 -0
- package/dist/src/cli/chat/App.d.ts +1 -1
- package/dist/src/cli/chat/App.d.ts.map +1 -1
- package/dist/src/cli/chat/App.js +17 -3
- package/dist/src/cli/chat/App.js.map +1 -1
- package/dist/src/cli/chat/hooks/useAgentRun.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useAgentRun.js +20 -6
- package/dist/src/cli/chat/hooks/useAgentRun.js.map +1 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.js +2 -0
- package/dist/src/cli/chat/hooks/usePromptSubmission.js.map +1 -1
- package/dist/src/cli/chat/state/local-commands.d.ts +3 -0
- package/dist/src/cli/chat/state/local-commands.d.ts.map +1 -1
- package/dist/src/cli/chat/state/local-commands.js +47 -0
- package/dist/src/cli/chat/state/local-commands.js.map +1 -1
- package/dist/src/cli/chat/submit.d.ts +1 -0
- package/dist/src/cli/chat/submit.d.ts.map +1 -1
- package/dist/src/cli/chat/submit.js +1 -0
- package/dist/src/cli/chat/submit.js.map +1 -1
- package/dist/src/cli/chat/utils/runtime.d.ts +13 -1
- package/dist/src/cli/chat/utils/runtime.d.ts.map +1 -1
- package/dist/src/cli/chat/utils/runtime.js +24 -3
- package/dist/src/cli/chat/utils/runtime.js.map +1 -1
- package/dist/src/cli/daemon.d.ts +1 -0
- package/dist/src/cli/daemon.d.ts.map +1 -1
- package/dist/src/cli/daemon.js +1 -0
- package/dist/src/cli/daemon.js.map +1 -1
- package/dist/src/cli/heartbeat/worker.d.ts.map +1 -1
- package/dist/src/cli/heartbeat/worker.js +4 -5
- package/dist/src/cli/heartbeat/worker.js.map +1 -1
- package/dist/src/cli/main.js +31 -1
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/remote/control-plane-client.d.ts +11 -4
- package/dist/src/cli/remote/control-plane-client.d.ts.map +1 -1
- package/dist/src/core/agent/post-mutation.d.ts +0 -7
- package/dist/src/core/agent/post-mutation.d.ts.map +1 -1
- package/dist/src/core/agent/post-mutation.js +0 -66
- package/dist/src/core/agent/post-mutation.js.map +1 -1
- package/dist/src/core/agent/progress-reminders.js +4 -4
- package/dist/src/core/agent/progress-reminders.js.map +1 -1
- package/dist/src/core/agent/run-agent.d.ts.map +1 -1
- package/dist/src/core/agent/run-agent.js +48 -63
- package/dist/src/core/agent/run-agent.js.map +1 -1
- package/dist/src/core/auth/openai-oauth.d.ts +64 -0
- package/dist/src/core/auth/openai-oauth.d.ts.map +1 -0
- package/dist/src/core/auth/openai-oauth.js +279 -0
- package/dist/src/core/auth/openai-oauth.js.map +1 -0
- package/dist/src/core/auth/provider-credentials.d.ts +52 -0
- package/dist/src/core/auth/provider-credentials.d.ts.map +1 -0
- package/dist/src/core/auth/provider-credentials.js +151 -0
- package/dist/src/core/auth/provider-credentials.js.map +1 -0
- package/dist/src/core/chat/compaction.js +5 -2
- package/dist/src/core/chat/compaction.js.map +1 -1
- package/dist/src/core/chat/session-submit.d.ts +1 -0
- package/dist/src/core/chat/session-submit.d.ts.map +1 -1
- package/dist/src/core/chat/session-submit.js +16 -5
- package/dist/src/core/chat/session-submit.js.map +1 -1
- package/dist/src/core/chat/storage.js +4 -4
- package/dist/src/core/chat/storage.js.map +1 -1
- package/dist/src/core/chat/trace-summary.d.ts.map +1 -1
- package/dist/src/core/chat/trace-summary.js +2 -0
- package/dist/src/core/chat/trace-summary.js.map +1 -1
- package/dist/src/core/llm/factory.d.ts +3 -0
- package/dist/src/core/llm/factory.d.ts.map +1 -1
- package/dist/src/core/llm/factory.js +11 -2
- package/dist/src/core/llm/factory.js.map +1 -1
- package/dist/src/core/llm/openai-models.d.ts +2 -0
- package/dist/src/core/llm/openai-models.d.ts.map +1 -1
- package/dist/src/core/llm/openai-models.js +29 -1
- package/dist/src/core/llm/openai-models.js.map +1 -1
- package/dist/src/core/llm/openai.d.ts +13 -0
- package/dist/src/core/llm/openai.d.ts.map +1 -1
- package/dist/src/core/llm/openai.js +127 -8
- package/dist/src/core/llm/openai.js.map +1 -1
- package/dist/src/core/prompts/system-prompt.d.ts.map +1 -1
- package/dist/src/core/prompts/system-prompt.js +7 -1
- package/dist/src/core/prompts/system-prompt.js.map +1 -1
- package/dist/src/core/runtime/agent-loop.d.ts.map +1 -1
- package/dist/src/core/runtime/agent-loop.js +20 -2
- package/dist/src/core/runtime/agent-loop.js.map +1 -1
- package/dist/src/core/runtime/api-keys.d.ts +27 -0
- package/dist/src/core/runtime/api-keys.d.ts.map +1 -1
- package/dist/src/core/runtime/api-keys.js +57 -4
- package/dist/src/core/runtime/api-keys.js.map +1 -1
- package/dist/src/core/runtime/default-tools.d.ts +3 -0
- package/dist/src/core/runtime/default-tools.d.ts.map +1 -1
- package/dist/src/core/runtime/default-tools.js +7 -0
- package/dist/src/core/runtime/default-tools.js.map +1 -1
- package/dist/src/core/tools/delete-file.d.ts +7 -0
- package/dist/src/core/tools/delete-file.d.ts.map +1 -0
- package/dist/src/core/tools/delete-file.js +79 -0
- package/dist/src/core/tools/delete-file.js.map +1 -0
- package/dist/src/core/tools/move-file.d.ts +7 -0
- package/dist/src/core/tools/move-file.d.ts.map +1 -0
- package/dist/src/core/tools/move-file.js +82 -0
- package/dist/src/core/tools/move-file.js.map +1 -0
- package/dist/src/core/tools/report-state.js +1 -1
- package/dist/src/core/tools/report-state.js.map +1 -1
- package/dist/src/core/tools/view-image.d.ts +3 -0
- package/dist/src/core/tools/view-image.d.ts.map +1 -1
- package/dist/src/core/tools/view-image.js +197 -14
- package/dist/src/core/tools/view-image.js.map +1 -1
- package/dist/src/core/tools/web-search.d.ts +2 -0
- package/dist/src/core/tools/web-search.d.ts.map +1 -1
- package/dist/src/core/tools/web-search.js +6 -0
- package/dist/src/core/tools/web-search.js.map +1 -1
- package/dist/src/core/trace/format.d.ts.map +1 -1
- package/dist/src/core/trace/format.js +3 -0
- package/dist/src/core/trace/format.js.map +1 -1
- package/dist/src/core/types.d.ts +7 -0
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/index.d.ts +6 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/server/app.d.ts +3 -1
- package/dist/src/server/app.d.ts.map +1 -1
- package/dist/src/server/app.js +1 -0
- package/dist/src/server/app.js.map +1 -1
- package/dist/src/server/features/control-plane/router.d.ts +11 -4
- package/dist/src/server/features/control-plane/router.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/router.js +6 -0
- package/dist/src/server/features/control-plane/router.js.map +1 -1
- package/dist/src/server/features/control-plane/services/ask.d.ts +1 -0
- package/dist/src/server/features/control-plane/services/ask.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/ask.js +6 -3
- package/dist/src/server/features/control-plane/services/ask.js.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts +5 -4
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.js +64 -3
- package/dist/src/server/features/control-plane/services/chat-sessions.js.map +1 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.js +6 -0
- package/dist/src/server/features/control-plane/services/control-plane-state.js.map +1 -1
- package/dist/src/server/features/control-plane/types.d.ts +6 -0
- package/dist/src/server/features/control-plane/types.d.ts.map +1 -1
- package/dist/src/server/router.d.ts +11 -4
- package/dist/src/server/router.d.ts.map +1 -1
- package/dist/src/server/types.d.ts +2 -0
- package/dist/src/server/types.d.ts.map +1 -1
- package/dist/src/web/assets/MonacoDiffViewer-DM8Cy5Xf.js +4 -0
- package/dist/src/web/assets/chunk-DECur_0Z.js +1 -0
- package/dist/src/web/assets/codicon-ngg6Pgfi.ttf +0 -0
- package/dist/src/web/assets/css-ejLFi3lO.js +3 -0
- package/dist/src/web/assets/editor-Br_kD0ds.css +1 -0
- package/dist/src/web/assets/editor.api2-DRhrSk9h.js +872 -0
- package/dist/src/web/assets/editor.worker-DWlYVeeX.js +26 -0
- package/dist/src/web/assets/go-CaScRb1i.js +1 -0
- package/dist/src/web/assets/html-Cft6PSNf.js +1 -0
- package/dist/src/web/assets/{index-CAWhKnGd.css → index-BEeN-RT5.css} +1 -1
- package/dist/src/web/assets/index-BKDg9H_-.js +56 -0
- package/dist/src/web/assets/java-_yhwA1y2.js +1 -0
- package/dist/src/web/assets/javascript-6bpvthJD.js +1 -0
- package/dist/src/web/assets/json.worker-CCzEOxDx.js +58 -0
- package/dist/src/web/assets/jsonMode-yXXGoTnD.js +10 -0
- package/dist/src/web/assets/markdown-wO2PN3EC.js +1 -0
- package/dist/src/web/assets/python-kY56oSAs.js +1 -0
- package/dist/src/web/assets/rust-BOwv_5ZO.js +1 -0
- package/dist/src/web/assets/scss-Cdfe_FFe.js +3 -0
- package/dist/src/web/assets/shell-Dgo0Jcwc.js +1 -0
- package/dist/src/web/assets/typescript-KZ9-zMZK.js +1 -0
- package/dist/src/web/assets/yaml-B3q_s4Yl.js +1 -0
- package/dist/src/web/index.html +3 -2
- package/package.json +2 -1
- package/dist/src/web/assets/index-D35_IzEn.js +0 -55
package/README.md
CHANGED
|
@@ -91,14 +91,36 @@ The control plane also has a phone-oriented layout for checking sessions, readin
|
|
|
91
91
|
npm install -g @roackb2/heddle
|
|
92
92
|
```
|
|
93
93
|
|
|
94
|
-
2.
|
|
94
|
+
2. Configure provider access.
|
|
95
|
+
|
|
96
|
+
For OpenAI, you can either sign in with your own ChatGPT/Codex account:
|
|
97
|
+
|
|
98
|
+
```bash
|
|
99
|
+
heddle auth login openai
|
|
100
|
+
```
|
|
101
|
+
|
|
102
|
+
Or use a Platform API key:
|
|
95
103
|
|
|
96
104
|
```bash
|
|
97
105
|
export OPENAI_API_KEY=your_key_here
|
|
98
|
-
|
|
106
|
+
```
|
|
107
|
+
|
|
108
|
+
If you keep both a stored OpenAI OAuth credential and an API key around for testing, you can explicitly prefer the API key for a run:
|
|
109
|
+
|
|
110
|
+
```bash
|
|
111
|
+
heddle --prefer-api-key
|
|
112
|
+
heddle --prefer-api-key ask "Summarize this repository"
|
|
113
|
+
heddle --prefer-api-key daemon
|
|
114
|
+
```
|
|
115
|
+
|
|
116
|
+
For Anthropic, use an API key:
|
|
117
|
+
|
|
118
|
+
```bash
|
|
99
119
|
export ANTHROPIC_API_KEY=your_key_here
|
|
100
120
|
```
|
|
101
121
|
|
|
122
|
+
OpenAI account sign-in is an experimental, user-selected transport for Heddle. It is not official OpenAI support, and Heddle is not affiliated with, endorsed by, or sponsored by OpenAI. Use of OpenAI services remains subject to OpenAI's terms and policies.
|
|
123
|
+
|
|
102
124
|
3. Move into any repository you want to inspect:
|
|
103
125
|
|
|
104
126
|
```bash
|
|
@@ -125,6 +147,8 @@ heddle daemon
|
|
|
125
147
|
|
|
126
148
|
Open the browser control plane from the daemon output. From there you can use `Overview`, `Sessions`, `Tasks`, and `Workspaces` to inspect the active workspace, continue saved sessions, review changes, and switch to another local project.
|
|
127
149
|
|
|
150
|
+
The terminal chat footer and the control-plane session composer both show the active auth source for the selected model, so you can tell whether a session is using OpenAI account sign-in, API-key mode, or missing credentials.
|
|
151
|
+
|
|
128
152
|
### Try The Learning Loop
|
|
129
153
|
|
|
130
154
|
Heddle gets more useful when it learns a reusable preference and applies it later. In chat, teach it a ticket format:
|
|
@@ -302,9 +326,11 @@ The installed CLI command is `heddle`.
|
|
|
302
326
|
## Requirements
|
|
303
327
|
|
|
304
328
|
- Node.js 20+
|
|
305
|
-
-
|
|
306
|
-
- `OPENAI_API_KEY`
|
|
307
|
-
- `ANTHROPIC_API_KEY`
|
|
329
|
+
- access to at least one supported provider:
|
|
330
|
+
- OpenAI account sign-in with `heddle auth login openai`, or `OPENAI_API_KEY`
|
|
331
|
+
- `ANTHROPIC_API_KEY` for Anthropic models
|
|
332
|
+
|
|
333
|
+
Heddle intentionally does not support Anthropic consumer subscription OAuth. Use Anthropic API-key access unless Anthropic provides an approved third-party auth route.
|
|
308
334
|
|
|
309
335
|
## Optional CyberLoop Integration
|
|
310
336
|
|
|
@@ -94,6 +94,8 @@ function formatTraceEvent(event) {
|
|
|
94
94
|
return `[trace] run.started goal=${JSON.stringify(shorten(event.goal))}`;
|
|
95
95
|
case 'assistant.turn':
|
|
96
96
|
return `[trace] assistant.turn step=${event.step} tools=${event.requestedTools ? event.toolCalls?.map((call) => call.tool).join(',') || 'yes' : 'none'} content=${JSON.stringify(shorten(event.content))}`;
|
|
97
|
+
case 'host.warning':
|
|
98
|
+
return `[trace] host.warning step=${event.step} code=${event.code} message=${JSON.stringify(shorten(event.message))}`;
|
|
97
99
|
case 'tool.approval_requested':
|
|
98
100
|
return `[trace] tool.approval_requested step=${event.step} tool=${event.call.tool}`;
|
|
99
101
|
case 'tool.approval_resolved':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"programmatic-loop.js","sourceRoot":"","sources":["../../examples/programmatic-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"programmatic-loop.js","sourceRoot":"","sources":["../../examples/programmatic-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli/ask.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.d.ts","sourceRoot":"","sources":["../../../src/cli/ask.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAO5E,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC,CAAC;AAEF,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,
|
|
1
|
+
{"version":3,"file":"ask.d.ts","sourceRoot":"","sources":["../../../src/cli/ask.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAO5E,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC,CAAC;AAEF,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,iBA8HxE"}
|
package/dist/src/cli/ask.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
|
-
import { appendMemoryCatalogSystemContext, DEFAULT_OPENAI_MODEL, createLlmAdapter, inferProviderFromModel, runAgentLoop, formatTraceForConsole, createLogger,
|
|
3
|
+
import { appendMemoryCatalogSystemContext, DEFAULT_OPENAI_MODEL, createLlmAdapter, inferProviderFromModel, runAgentLoop, formatTraceForConsole, createLogger, hasProviderCredentialForModel, resolveApiKeyForModel, } from '../index.js';
|
|
4
4
|
import { runMaintenanceForRecordedCandidates } from '../core/memory/maintenance-integration.js';
|
|
5
5
|
import { submitChatSessionPrompt } from '../core/chat/session-submit.js';
|
|
6
6
|
import { createChatSession, readChatSession, readChatSessionCatalog, saveChatSessions } from '../core/chat/storage.js';
|
|
@@ -32,6 +32,7 @@ export async function runAskCli(goal, options = {}) {
|
|
|
32
32
|
model,
|
|
33
33
|
maxSteps,
|
|
34
34
|
apiKey: options.apiKey,
|
|
35
|
+
preferApiKey: options.preferApiKey,
|
|
35
36
|
searchIgnoreDirs: options.searchIgnoreDirs,
|
|
36
37
|
systemContext: options.systemContext,
|
|
37
38
|
targetSessionId: options.sessionId,
|
|
@@ -49,7 +50,11 @@ export async function runAskCli(goal, options = {}) {
|
|
|
49
50
|
sessionStoragePath,
|
|
50
51
|
stateRoot,
|
|
51
52
|
model,
|
|
52
|
-
apiKeyPresent:
|
|
53
|
+
apiKeyPresent: hasProviderCredentialForModel(model, {
|
|
54
|
+
apiKey: options.apiKey,
|
|
55
|
+
apiKeyProvider: 'explicit',
|
|
56
|
+
preferApiKey: options.preferApiKey,
|
|
57
|
+
}),
|
|
53
58
|
});
|
|
54
59
|
if (targetSession) {
|
|
55
60
|
const result = await submitChatSessionPrompt({
|
|
@@ -59,6 +64,7 @@ export async function runAskCli(goal, options = {}) {
|
|
|
59
64
|
sessionId: targetSession.id,
|
|
60
65
|
prompt: goal,
|
|
61
66
|
apiKey: options.apiKey,
|
|
67
|
+
preferApiKey: options.preferApiKey,
|
|
62
68
|
systemContext,
|
|
63
69
|
memoryMaintenanceMode: 'inline',
|
|
64
70
|
leaseOwner: {
|
|
@@ -81,7 +87,11 @@ export async function runAskCli(goal, options = {}) {
|
|
|
81
87
|
].filter((line) => Boolean(line)).join('\n') + '\n');
|
|
82
88
|
return;
|
|
83
89
|
}
|
|
84
|
-
const apiKey =
|
|
90
|
+
const apiKey = resolveApiKeyForModel(model, {
|
|
91
|
+
apiKey: options.apiKey,
|
|
92
|
+
apiKeyProvider: options.apiKey ? 'explicit' : undefined,
|
|
93
|
+
preferApiKey: options.preferApiKey,
|
|
94
|
+
});
|
|
85
95
|
const llm = createLlmAdapter({ model, apiKey });
|
|
86
96
|
const memoryDir = join(stateRoot, 'memory');
|
|
87
97
|
const result = await runAgentLoop({
|
|
@@ -122,12 +132,17 @@ async function runDaemonBackedAsk(options) {
|
|
|
122
132
|
?? await createRemoteSession(client, {
|
|
123
133
|
name: options.createSessionName?.trim() || undefined,
|
|
124
134
|
model: options.model,
|
|
125
|
-
apiKeyPresent:
|
|
135
|
+
apiKeyPresent: hasProviderCredentialForModel(options.model, {
|
|
136
|
+
apiKey: options.apiKey,
|
|
137
|
+
apiKeyProvider: 'explicit',
|
|
138
|
+
preferApiKey: options.preferApiKey,
|
|
139
|
+
}),
|
|
126
140
|
});
|
|
127
141
|
const result = await client.controlPlane.sessionSendPrompt.mutate({
|
|
128
142
|
sessionId,
|
|
129
143
|
prompt: options.goal,
|
|
130
144
|
apiKey: options.apiKey,
|
|
145
|
+
preferApiKey: options.preferApiKey,
|
|
131
146
|
systemContext: options.systemContext,
|
|
132
147
|
memoryMaintenanceMode: 'inline',
|
|
133
148
|
});
|
|
@@ -145,6 +160,7 @@ async function runDaemonBackedAsk(options) {
|
|
|
145
160
|
model: options.model,
|
|
146
161
|
maxSteps: options.maxSteps,
|
|
147
162
|
apiKey: options.apiKey,
|
|
163
|
+
preferApiKey: options.preferApiKey,
|
|
148
164
|
searchIgnoreDirs: options.searchIgnoreDirs,
|
|
149
165
|
systemContext: options.systemContext,
|
|
150
166
|
});
|
package/dist/src/cli/ask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.js","sourceRoot":"","sources":["../../../src/cli/ask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,gCAAgC,EAChC,oBAAoB,EAEpB,gBAAgB,EAChB,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,EACrB,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"ask.js","sourceRoot":"","sources":["../../../src/cli/ask.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { LlmProvider } from '../core/llm/types.js';
|
|
2
|
+
import { type OpenAiOAuthCredential } from '../core/auth/openai-oauth.js';
|
|
3
|
+
export type AuthCliCommand = 'status' | 'logout' | 'login';
|
|
4
|
+
export type AuthCliOptions = {
|
|
5
|
+
storePath?: string;
|
|
6
|
+
openBrowser?: boolean;
|
|
7
|
+
openAiLogin?: () => Promise<OpenAiOAuthCredential>;
|
|
8
|
+
};
|
|
9
|
+
export declare function runAuthCli(command: AuthCliCommand, provider?: string, options?: AuthCliOptions): Promise<void>;
|
|
10
|
+
export declare function formatAuthStatusMessage(storePath?: string): string;
|
|
11
|
+
export declare function loginProviderWithOAuth(provider: LlmProvider, options?: AuthCliOptions & {
|
|
12
|
+
onAuthorizeUrl?: (url: string) => void;
|
|
13
|
+
}): Promise<string>;
|
|
14
|
+
export declare function logoutProvider(provider: LlmProvider, storePath?: string): string;
|
|
15
|
+
//# sourceMappingURL=auth.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/cli/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAA8B,KAAK,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAQtG,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE3D,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACpD,CAAC;AAIF,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,iBAyBxG;AAED,wBAAgB,uBAAuB,CAAC,SAAS,SAAuC,GAAG,MAAM,CAqBhG;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,WAAW,EACrB,OAAO,GAAE,cAAc,GAAG;IAAE,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GACxE,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,SAAuC,GAAG,MAAM,CAK9G"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { runOpenAiBrowserOAuthLogin } from '../core/auth/openai-oauth.js';
|
|
2
|
+
import { listStoredProviderCredentialSummaries, removeStoredProviderCredential, resolveProviderCredentialStorePath, setStoredProviderCredential, } from '../core/auth/provider-credentials.js';
|
|
3
|
+
const SUPPORTED_PROVIDERS = new Set(['openai', 'anthropic', 'google']);
|
|
4
|
+
export async function runAuthCli(command, provider, options = {}) {
|
|
5
|
+
const storePath = options.storePath ?? resolveProviderCredentialStorePath();
|
|
6
|
+
if (command === 'status') {
|
|
7
|
+
process.stdout.write(formatAuthStatusMessage(storePath));
|
|
8
|
+
process.stdout.write('\n');
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
const normalizedProvider = parseProvider(provider);
|
|
12
|
+
if (command === 'login') {
|
|
13
|
+
process.stdout.write('Starting OpenAI ChatGPT/Codex OAuth login...\n');
|
|
14
|
+
process.stdout.write(await loginProviderWithOAuth(normalizedProvider, {
|
|
15
|
+
...options,
|
|
16
|
+
storePath,
|
|
17
|
+
onAuthorizeUrl: (url) => {
|
|
18
|
+
process.stdout.write(`Open this URL to authorize Heddle:\n${url}\n`);
|
|
19
|
+
},
|
|
20
|
+
}));
|
|
21
|
+
process.stdout.write('\n');
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
process.stdout.write(logoutProvider(normalizedProvider, storePath));
|
|
25
|
+
process.stdout.write('\n');
|
|
26
|
+
}
|
|
27
|
+
export function formatAuthStatusMessage(storePath = resolveProviderCredentialStorePath()) {
|
|
28
|
+
const summaries = listStoredProviderCredentialSummaries(storePath);
|
|
29
|
+
const lines = [`Auth store: ${storePath}`];
|
|
30
|
+
if (summaries.length === 0) {
|
|
31
|
+
return [...lines, 'Stored credentials: none'].join('\n');
|
|
32
|
+
}
|
|
33
|
+
lines.push('Stored credentials:');
|
|
34
|
+
for (const summary of summaries) {
|
|
35
|
+
const details = [
|
|
36
|
+
`type=${summary.type}`,
|
|
37
|
+
summary.label ? `label=${summary.label}` : undefined,
|
|
38
|
+
summary.accountId ? `account=${summary.accountId}` : undefined,
|
|
39
|
+
summary.expiresAt ? `expires=${new Date(summary.expiresAt).toISOString()}` : undefined,
|
|
40
|
+
summary.expired === true ? 'expired=true' : undefined,
|
|
41
|
+
`updated=${summary.updatedAt}`,
|
|
42
|
+
].filter(Boolean);
|
|
43
|
+
lines.push(`- ${summary.provider}: ${details.join(' ')}`);
|
|
44
|
+
}
|
|
45
|
+
return lines.join('\n');
|
|
46
|
+
}
|
|
47
|
+
export async function loginProviderWithOAuth(provider, options = {}) {
|
|
48
|
+
const storePath = options.storePath ?? resolveProviderCredentialStorePath();
|
|
49
|
+
if (provider !== 'openai') {
|
|
50
|
+
throw new Error(`OAuth login is not available for ${provider}. Use API keys or supported provider credentials.`);
|
|
51
|
+
}
|
|
52
|
+
const credential = await (options.openAiLogin ?? (() => runOpenAiBrowserOAuthLogin({
|
|
53
|
+
openBrowser: options.openBrowser,
|
|
54
|
+
onAuthorizeUrl: options.onAuthorizeUrl,
|
|
55
|
+
})))();
|
|
56
|
+
setStoredProviderCredential(credential, storePath);
|
|
57
|
+
return [
|
|
58
|
+
'Stored OpenAI OAuth credential.',
|
|
59
|
+
credential.accountId ? `Account: ${credential.accountId}` : undefined,
|
|
60
|
+
`Expires: ${new Date(credential.expiresAt).toISOString()}`,
|
|
61
|
+
].filter((line) => Boolean(line)).join('\n');
|
|
62
|
+
}
|
|
63
|
+
export function logoutProvider(provider, storePath = resolveProviderCredentialStorePath()) {
|
|
64
|
+
const removed = removeStoredProviderCredential(provider, storePath);
|
|
65
|
+
return removed ?
|
|
66
|
+
`Removed stored ${provider} credential.`
|
|
67
|
+
: `No stored ${provider} credential found.`;
|
|
68
|
+
}
|
|
69
|
+
function parseProvider(provider) {
|
|
70
|
+
if (!provider) {
|
|
71
|
+
throw new Error('Usage: heddle auth logout <provider>');
|
|
72
|
+
}
|
|
73
|
+
const normalized = provider.trim().toLowerCase();
|
|
74
|
+
if (!SUPPORTED_PROVIDERS.has(normalized)) {
|
|
75
|
+
throw new Error(`Unsupported auth provider: ${provider}`);
|
|
76
|
+
}
|
|
77
|
+
return normalized;
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/cli/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../src/cli/chat/App.tsx"],"names":[],"mappings":"AA2BA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../src/cli/chat/App.tsx"],"names":[],"mappings":"AA2BA,OAAO,EAA2C,KAAK,iBAAiB,EAAiC,MAAM,oBAAoB,CAAC;AAIpI,wBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,iBAAiB,CAAA;CAAE,2CAE9D"}
|
package/dist/src/cli/chat/App.js
CHANGED
|
@@ -15,6 +15,7 @@ import { usePromptSubmission } from './hooks/usePromptSubmission.js';
|
|
|
15
15
|
import { autocompleteLocalCommand } from './state/local-commands.js';
|
|
16
16
|
import { currentActivityText } from './utils/format.js';
|
|
17
17
|
import { listMentionableFiles } from './utils/file-mentions.js';
|
|
18
|
+
import { resolveProviderCredentialSourceForModel } from './utils/runtime.js';
|
|
18
19
|
const SESSION_TITLE_MODEL = 'gpt-5.1-codex-mini';
|
|
19
20
|
export function App({ runtime }) {
|
|
20
21
|
return _jsx(EmbeddedChatApp, { runtime: runtime });
|
|
@@ -26,7 +27,7 @@ function EmbeddedChatApp({ runtime }) {
|
|
|
26
27
|
const mentionableFiles = useState(() => listMentionableFiles(runtime.workspaceRoot, runtime.searchIgnoreDirs))[0];
|
|
27
28
|
const { sessions, activeSessionId, setActiveSessionId, activeSession, recentSessions, listRecentSessionsMessage, updateSessionById, updateActiveSession, setSessionModel, createSession, renameSession, removeSession, } = useChatSessions({
|
|
28
29
|
sessionCatalogFile: runtime.sessionCatalogFile,
|
|
29
|
-
apiKeyPresent:
|
|
30
|
+
apiKeyPresent: runtime.providerCredentialPresent,
|
|
30
31
|
defaultModel: runtime.model,
|
|
31
32
|
workspaceRoot: runtime.workspaceRoot,
|
|
32
33
|
stateRoot: runtime.stateRoot,
|
|
@@ -56,6 +57,7 @@ function EmbeddedChatApp({ runtime }) {
|
|
|
56
57
|
const compacting = activeSession?.context?.compactionStatus === 'running';
|
|
57
58
|
const activityText = currentActivityText(liveEvents, isRunning, elapsedSeconds, pendingApproval, interruptRequested);
|
|
58
59
|
const contextStatus = formatContextStatus(activeModel, activeSession?.context?.lastRunInputTokens ?? activeSession?.context?.estimatedRequestTokens);
|
|
60
|
+
const authStatus = formatAuthStatus(resolveProviderCredentialSourceForModel(activeModel, runtime));
|
|
59
61
|
const sessionFooter = `session=${activeSession?.id ?? activeSessionId}${activeSession?.name ? ` (${activeSession.name})` : ''}`;
|
|
60
62
|
const renderedStatus = pendingApproval ? 'awaiting approval'
|
|
61
63
|
: compacting ? 'compacting'
|
|
@@ -216,7 +218,7 @@ function EmbeddedChatApp({ runtime }) {
|
|
|
216
218
|
recentSessions,
|
|
217
219
|
activeSessionId,
|
|
218
220
|
activeSession,
|
|
219
|
-
apiKeyPresent:
|
|
221
|
+
apiKeyPresent: runtime.providerCredentialPresent,
|
|
220
222
|
nextLocalId,
|
|
221
223
|
setStatus,
|
|
222
224
|
switchSession,
|
|
@@ -261,7 +263,19 @@ function EmbeddedChatApp({ runtime }) {
|
|
|
261
263
|
: isRunning ? 'Enter to queue'
|
|
262
264
|
: 'Enter to send' }), _jsx(Text, { dimColor: true, children: pendingSubmittedPrompt ? '1 queued'
|
|
263
265
|
: isRunning ? `${elapsedSeconds}s elapsed`
|
|
264
|
-
: '' })] })] })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `model=${activeModel} • ${contextStatus} • ` }), _jsx(Text, { color: drift.color, dimColor: !drift.color, children: `drift=${drift.footer}` }), _jsx(Text, { dimColor: true, children: ` • ${sessionFooter}` })] })] }));
|
|
266
|
+
: '' })] })] })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: `model=${activeModel} • ${authStatus} • ${contextStatus} • ` }), _jsx(Text, { color: drift.color, dimColor: !drift.color, children: `drift=${drift.footer}` }), _jsx(Text, { dimColor: true, children: ` • ${sessionFooter}` })] })] }));
|
|
267
|
+
}
|
|
268
|
+
function formatAuthStatus(source) {
|
|
269
|
+
switch (source.type) {
|
|
270
|
+
case 'explicit-api-key':
|
|
271
|
+
return 'auth=explicit-key';
|
|
272
|
+
case 'env-api-key':
|
|
273
|
+
return `auth=${source.provider}-key`;
|
|
274
|
+
case 'oauth':
|
|
275
|
+
return source.accountId ? `auth=${source.provider}-oauth:${source.accountId.slice(0, 8)}` : `auth=${source.provider}-oauth`;
|
|
276
|
+
case 'missing':
|
|
277
|
+
return `auth=missing-${source.provider}`;
|
|
278
|
+
}
|
|
265
279
|
}
|
|
266
280
|
function formatContextStatus(model, estimatedRequestTokens) {
|
|
267
281
|
if (estimatedRequestTokens === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../../src/cli/chat/App.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../../src/cli/chat/App.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAgentRun.d.ts","sourceRoot":"","sources":["../../../../../src/cli/chat/hooks/useAgentRun.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAC;AASlH,OAAO,KAAK,EAA+B,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAGlG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"useAgentRun.d.ts","sourceRoot":"","sources":["../../../../../src/cli/chat/hooks/useAgentRun.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { DEFAULT_INSPECT_RULES, DEFAULT_MUTATE_RULES, runShellCommand } from '..
|
|
|
6
6
|
import { previewEditFileInput } from '../../../core/tools/edit-file.js';
|
|
7
7
|
import { appendDirectShellHistory, buildConversationMessages, countAssistantSteps, formatChatFailureMessage, formatEditPreviewHistoryMessage, formatPlanHistoryMessage, formatDirectShellResponse, shouldFallbackToMutate, summarizeTrace, summarizeToolCall, toLiveEvent, } from '../utils/format.js';
|
|
8
8
|
import { saveTrace } from '../utils/runtime.js';
|
|
9
|
-
import { resolveApiKeyForModel } from '
|
|
9
|
+
import { formatMissingProviderCredentialMessage, hasProviderCredentialForModel, resolveApiKeyForModel, resolveProviderCredentialSourceForModel, } from '../../../core/runtime/api-keys.js';
|
|
10
10
|
import { acquireSessionLease, getSessionLeaseConflict, releaseSessionLease } from '../../../core/chat/session-lease.js';
|
|
11
11
|
import { createProjectApprovalRuleForCall, describeProjectApprovalRule } from '../state/approval-rules.js';
|
|
12
12
|
import { buildCompactionRunningContext, compactChatHistoryWithArchive, estimateChatHistoryTokens } from '../state/compaction.js';
|
|
@@ -19,18 +19,21 @@ export function useAgentRun(args) {
|
|
|
19
19
|
const projectApprovals = useProjectApprovals(runtime.approvalsFile);
|
|
20
20
|
const activeApiKey = resolveApiKeyForModel(activeModel, runtime);
|
|
21
21
|
const titleApiKey = resolveApiKeyForModel(sessionTitleModel, runtime);
|
|
22
|
-
const
|
|
23
|
-
const
|
|
22
|
+
const activeCredentialSource = useMemo(() => resolveProviderCredentialSourceForModel(activeModel, runtime), [activeModel, runtime]);
|
|
23
|
+
const llm = useMemo(() => createLlmAdapter({ model: activeModel, apiKey: activeApiKey, credentialStorePath: runtime.credentialStorePath }), [activeApiKey, activeModel, runtime.credentialStorePath]);
|
|
24
|
+
const titleLlm = useMemo(() => createLlmAdapter({ model: sessionTitleModel, apiKey: titleApiKey, credentialStorePath: runtime.credentialStorePath }), [runtime.credentialStorePath, sessionTitleModel, titleApiKey]);
|
|
24
25
|
const tools = useMemo(() => {
|
|
25
26
|
return createDefaultAgentTools({
|
|
26
27
|
model: activeModel,
|
|
27
28
|
apiKey: activeApiKey,
|
|
29
|
+
providerCredentialSource: activeCredentialSource,
|
|
30
|
+
credentialStorePath: runtime.credentialStorePath,
|
|
28
31
|
workspaceRoot: runtime.workspaceRoot,
|
|
29
32
|
memoryDir: runtime.memoryDir,
|
|
30
33
|
searchIgnoreDirs: runtime.searchIgnoreDirs,
|
|
31
34
|
includePlanTool: true,
|
|
32
35
|
});
|
|
33
|
-
}, [activeApiKey, activeModel, runtime.memoryDir, runtime.searchIgnoreDirs, runtime.workspaceRoot]);
|
|
36
|
+
}, [activeApiKey, activeCredentialSource, activeModel, runtime.memoryDir, runtime.searchIgnoreDirs, runtime.workspaceRoot]);
|
|
34
37
|
const logger = useMemo(() => createLogger({
|
|
35
38
|
pretty: false,
|
|
36
39
|
level: 'debug',
|
|
@@ -110,8 +113,8 @@ export async function executeAgentTurn(args) {
|
|
|
110
113
|
if (!prompt || state.isRunning) {
|
|
111
114
|
return undefined;
|
|
112
115
|
}
|
|
113
|
-
if (!
|
|
114
|
-
state.setError(
|
|
116
|
+
if (!hasProviderCredentialForModel(llm.info?.model ?? runtime.model, runtime)) {
|
|
117
|
+
state.setError(formatMissingProviderCredentialMessage(llm.info?.model ?? runtime.model));
|
|
115
118
|
state.setStatus('Error');
|
|
116
119
|
return undefined;
|
|
117
120
|
}
|
|
@@ -425,6 +428,16 @@ async function createChatDriftObserver(args) {
|
|
|
425
428
|
if (!options?.enabled) {
|
|
426
429
|
return undefined;
|
|
427
430
|
}
|
|
431
|
+
const llmInfo = llm.info;
|
|
432
|
+
const credentialSource = llmInfo?.provider === 'openai' ?
|
|
433
|
+
resolveProviderCredentialSourceForModel(llmInfo.model, runtime)
|
|
434
|
+
: undefined;
|
|
435
|
+
if (credentialSource?.type === 'oauth') {
|
|
436
|
+
const message = 'CyberLoop drift detection requires OpenAI Platform API-key mode for embeddings; active auth is OpenAI account sign-in.';
|
|
437
|
+
logger.debug({ model: llmInfo?.model, credentialSource: credentialSource.type }, message);
|
|
438
|
+
options.onError?.(new Error(message));
|
|
439
|
+
return undefined;
|
|
440
|
+
}
|
|
428
441
|
try {
|
|
429
442
|
return await createCyberLoopKinematicsObserver({
|
|
430
443
|
goal: prompt,
|
|
@@ -462,6 +475,7 @@ function previousAssistantOutput(session) {
|
|
|
462
475
|
}
|
|
463
476
|
function isNonResponseAssistantMessage(text) {
|
|
464
477
|
return (text.startsWith('Heddle conversational mode.') ||
|
|
478
|
+
text.startsWith('No provider credential detected.') ||
|
|
465
479
|
text.startsWith('No provider API key detected.') ||
|
|
466
480
|
text.startsWith('Enabled CyberLoop semantic drift detection') ||
|
|
467
481
|
text.startsWith('Disabled CyberLoop semantic drift detection') ||
|