funolio-agent 1.0.7 → 1.0.48
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/dist/agent-config.d.ts +9 -1
- package/dist/agent-config.d.ts.map +1 -1
- package/dist/agent-config.js +4 -1
- package/dist/agent-config.js.map +1 -1
- package/dist/approval.d.ts +1 -0
- package/dist/approval.d.ts.map +1 -1
- package/dist/approval.js +12 -0
- package/dist/approval.js.map +1 -1
- package/dist/auth/auto-detect.d.ts +11 -3
- package/dist/auth/auto-detect.d.ts.map +1 -1
- package/dist/auth/auto-detect.js +136 -168
- package/dist/auth/auto-detect.js.map +1 -1
- package/dist/auth/subscription-runtime.js +1 -1
- package/dist/auth/subscription-runtime.js.map +1 -1
- package/dist/auto-organizer.d.ts.map +1 -1
- package/dist/auto-organizer.js +4 -3
- package/dist/auto-organizer.js.map +1 -1
- package/dist/backfill.d.ts.map +1 -1
- package/dist/backfill.js +34 -30
- package/dist/backfill.js.map +1 -1
- package/dist/bot-manager.d.ts +4 -8
- package/dist/bot-manager.d.ts.map +1 -1
- package/dist/bot-manager.js +31 -160
- package/dist/bot-manager.js.map +1 -1
- package/dist/clerk-model.d.ts +15 -7
- package/dist/clerk-model.d.ts.map +1 -1
- package/dist/clerk-model.js +78 -43
- package/dist/clerk-model.js.map +1 -1
- package/dist/cli-session-epoch.d.ts +10 -0
- package/dist/cli-session-epoch.d.ts.map +1 -0
- package/dist/cli-session-epoch.js +61 -0
- package/dist/cli-session-epoch.js.map +1 -0
- package/dist/cli.js +7 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/import-history.js +5 -1
- package/dist/commands/import-history.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +30 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/pool.js +1 -1
- package/dist/commands/pool.js.map +1 -1
- package/dist/commands/setup.d.ts +37 -0
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +146 -43
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +117 -255
- package/dist/commands/start.js.map +1 -1
- package/dist/config-cleanup.d.ts.map +1 -1
- package/dist/config-cleanup.js +2 -1
- package/dist/config-cleanup.js.map +1 -1
- package/dist/config.d.ts +6 -9
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +7 -18
- package/dist/config.js.map +1 -1
- package/dist/context-window.d.ts +33 -5
- package/dist/context-window.d.ts.map +1 -1
- package/dist/context-window.js +122 -21
- package/dist/context-window.js.map +1 -1
- package/dist/eval/orchestrator-front-door-replay.js +1 -1
- package/dist/eval/orchestrator-front-door-replay.js.map +1 -1
- package/dist/eval/policy-detection-replay.js +1 -1
- package/dist/eval/policy-detection-replay.js.map +1 -1
- package/dist/import-parser-core.d.ts.map +1 -1
- package/dist/import-parser-core.js +74 -8
- package/dist/import-parser-core.js.map +1 -1
- package/dist/integration-tokens.d.ts +1 -6
- package/dist/integration-tokens.d.ts.map +1 -1
- package/dist/integration-tokens.js +38 -40
- package/dist/integration-tokens.js.map +1 -1
- package/dist/local-cli-pty-manager.d.ts +50 -0
- package/dist/local-cli-pty-manager.d.ts.map +1 -0
- package/dist/local-cli-pty-manager.js +645 -0
- package/dist/local-cli-pty-manager.js.map +1 -0
- package/dist/local-data.d.ts +89 -6
- package/dist/local-data.d.ts.map +1 -1
- package/dist/local-data.js +600 -63
- package/dist/local-data.js.map +1 -1
- package/dist/local-db.d.ts.map +1 -1
- package/dist/local-db.js +74 -1
- package/dist/local-db.js.map +1 -1
- package/dist/local-funnel.d.ts +0 -7
- package/dist/local-funnel.d.ts.map +1 -1
- package/dist/local-funnel.js +22 -30
- package/dist/local-funnel.js.map +1 -1
- package/dist/local-import-worker.d.ts.map +1 -1
- package/dist/local-import-worker.js +49 -4
- package/dist/local-import-worker.js.map +1 -1
- package/dist/local-memory-search.d.ts +1 -0
- package/dist/local-memory-search.d.ts.map +1 -1
- package/dist/local-memory-search.js +107 -21
- package/dist/local-memory-search.js.map +1 -1
- package/dist/local-server.d.ts +21 -0
- package/dist/local-server.d.ts.map +1 -1
- package/dist/local-server.js +1057 -501
- package/dist/local-server.js.map +1 -1
- package/dist/mcp/bridge-server.d.ts.map +1 -1
- package/dist/mcp/bridge-server.js +2 -1
- package/dist/mcp/bridge-server.js.map +1 -1
- package/dist/mcp/local-memory-server.d.ts +6 -1
- package/dist/mcp/local-memory-server.d.ts.map +1 -1
- package/dist/mcp/local-memory-server.js +38 -13
- package/dist/mcp/local-memory-server.js.map +1 -1
- package/dist/mcp/manager.d.ts +3 -22
- package/dist/mcp/manager.d.ts.map +1 -1
- package/dist/mcp/manager.js +66 -320
- package/dist/mcp/manager.js.map +1 -1
- package/dist/memory-extraction.d.ts +2 -0
- package/dist/memory-extraction.d.ts.map +1 -1
- package/dist/memory-extraction.js +3 -1
- package/dist/memory-extraction.js.map +1 -1
- package/dist/message-loop.d.ts +1 -3
- package/dist/message-loop.d.ts.map +1 -1
- package/dist/message-loop.js +220 -437
- package/dist/message-loop.js.map +1 -1
- package/dist/mqtt-client.d.ts +2 -28
- package/dist/mqtt-client.d.ts.map +1 -1
- package/dist/mqtt-client.js +2 -2
- package/dist/mqtt-client.js.map +1 -1
- package/dist/oauth.d.ts +6 -0
- package/dist/oauth.d.ts.map +1 -1
- package/dist/oauth.js +91 -0
- package/dist/oauth.js.map +1 -1
- package/dist/orchestration/front-door-policy.d.ts +5 -2
- package/dist/orchestration/front-door-policy.d.ts.map +1 -1
- package/dist/orchestration/front-door-policy.js +25 -28
- package/dist/orchestration/front-door-policy.js.map +1 -1
- package/dist/orchestration/orchestrator-blocked-prompt.d.ts +2 -1
- package/dist/orchestration/orchestrator-blocked-prompt.d.ts.map +1 -1
- package/dist/orchestration/orchestrator-blocked-prompt.js +12 -1
- package/dist/orchestration/orchestrator-blocked-prompt.js.map +1 -1
- package/dist/orchestration/orchestrator-final-response-prompt.d.ts +4 -1
- package/dist/orchestration/orchestrator-final-response-prompt.d.ts.map +1 -1
- package/dist/orchestration/orchestrator-final-response-prompt.js +9 -7
- package/dist/orchestration/orchestrator-final-response-prompt.js.map +1 -1
- package/dist/orchestration/orchestrator-operating-prompt.d.ts +11 -0
- package/dist/orchestration/orchestrator-operating-prompt.d.ts.map +1 -1
- package/dist/orchestration/orchestrator-operating-prompt.js +67 -44
- package/dist/orchestration/orchestrator-operating-prompt.js.map +1 -1
- package/dist/orchestration/worker-operating-prompt.d.ts +2 -0
- package/dist/orchestration/worker-operating-prompt.d.ts.map +1 -1
- package/dist/orchestration/worker-operating-prompt.js +41 -2
- package/dist/orchestration/worker-operating-prompt.js.map +1 -1
- package/dist/orchestrator.d.ts +17 -0
- package/dist/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator.js +328 -166
- package/dist/orchestrator.js.map +1 -1
- package/dist/prompt-template.js +3 -3
- package/dist/prompt-template.js.map +1 -1
- package/dist/providers/anthropic.d.ts +0 -5
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +29 -75
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/claude-cli-prompt.d.ts.map +1 -1
- package/dist/providers/claude-cli-prompt.js +22 -6
- package/dist/providers/claude-cli-prompt.js.map +1 -1
- package/dist/providers/claude-cli.d.ts.map +1 -1
- package/dist/providers/claude-cli.js +36 -142
- package/dist/providers/claude-cli.js.map +1 -1
- package/dist/providers/codex-cli.d.ts.map +1 -1
- package/dist/providers/codex-cli.js +148 -74
- package/dist/providers/codex-cli.js.map +1 -1
- package/dist/providers/google.d.ts.map +1 -1
- package/dist/providers/google.js +4 -2
- package/dist/providers/google.js.map +1 -1
- package/dist/providers/index.d.ts +13 -0
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +27 -2
- package/dist/providers/openai.js.map +1 -1
- package/dist/runtime-context.d.ts +10 -0
- package/dist/runtime-context.d.ts.map +1 -0
- package/dist/runtime-context.js +30 -0
- package/dist/runtime-context.js.map +1 -0
- package/dist/storage-mode.d.ts +5 -0
- package/dist/storage-mode.d.ts.map +1 -0
- package/dist/storage-mode.js +21 -0
- package/dist/storage-mode.js.map +1 -0
- package/dist/subagent/queue.d.ts.map +1 -1
- package/dist/subagent/queue.js +1 -0
- package/dist/subagent/queue.js.map +1 -1
- package/dist/summarization-pipeline.d.ts +10 -0
- package/dist/summarization-pipeline.d.ts.map +1 -1
- package/dist/summarization-pipeline.js +147 -34
- package/dist/summarization-pipeline.js.map +1 -1
- package/dist/tool-permissions.d.ts +2 -0
- package/dist/tool-permissions.d.ts.map +1 -0
- package/dist/tool-permissions.js +25 -0
- package/dist/tool-permissions.js.map +1 -0
- package/dist/tools/analyze-image.js +2 -2
- package/dist/tools/analyze-image.js.map +1 -1
- package/dist/tools/edit-file.js +3 -3
- package/dist/tools/edit-file.js.map +1 -1
- package/dist/tools/index.d.ts +7 -8
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +106 -60
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/list-directory.js +7 -4
- package/dist/tools/list-directory.js.map +1 -1
- package/dist/tools/read-file.js +3 -3
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/run-command.js +3 -3
- package/dist/tools/run-command.js.map +1 -1
- package/dist/tools/sandbox.d.ts +10 -5
- package/dist/tools/sandbox.d.ts.map +1 -1
- package/dist/tools/sandbox.js +41 -13
- package/dist/tools/sandbox.js.map +1 -1
- package/dist/tools/search-codebase.js +2 -2
- package/dist/tools/search-codebase.js.map +1 -1
- package/dist/tools/search-local-memory.d.ts.map +1 -1
- package/dist/tools/search-local-memory.js +19 -8
- package/dist/tools/search-local-memory.js.map +1 -1
- package/dist/tools/search-memory.d.ts.map +1 -1
- package/dist/tools/search-memory.js +9 -3
- package/dist/tools/search-memory.js.map +1 -1
- package/dist/tools/spawn-subagent.d.ts.map +1 -1
- package/dist/tools/spawn-subagent.js +1 -0
- package/dist/tools/spawn-subagent.js.map +1 -1
- package/dist/tools/write-file.js +3 -3
- package/dist/tools/write-file.js.map +1 -1
- package/dist/types.d.ts +5 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +0 -3
- package/dist/types.js.map +1 -1
- package/dist/verification/index.js +2 -2
- package/dist/verification/index.js.map +1 -1
- package/dist/wizard-state.d.ts.map +1 -1
- package/dist/wizard-state.js +16 -2
- package/dist/wizard-state.js.map +1 -1
- package/dist/wizard-support.d.ts +2 -2
- package/dist/wizard-support.d.ts.map +1 -1
- package/dist/wizard-support.js +88 -99
- package/dist/wizard-support.js.map +1 -1
- package/dist/workflow-engine.d.ts +9 -3
- package/dist/workflow-engine.d.ts.map +1 -1
- package/dist/workflow-engine.js +378 -82
- package/dist/workflow-engine.js.map +1 -1
- package/package.json +2 -1
package/dist/agent-config.d.ts
CHANGED
|
@@ -16,7 +16,10 @@ export interface AgentLocalConfig {
|
|
|
16
16
|
name: string;
|
|
17
17
|
botId?: string;
|
|
18
18
|
provider: string;
|
|
19
|
+
runtimeProvider?: string;
|
|
19
20
|
model: string;
|
|
21
|
+
runtimeModel?: string;
|
|
22
|
+
accessMode?: string;
|
|
20
23
|
apiKey?: string;
|
|
21
24
|
oauthToken?: string;
|
|
22
25
|
oauthRefreshToken?: string;
|
|
@@ -24,6 +27,7 @@ export interface AgentLocalConfig {
|
|
|
24
27
|
workspace?: string;
|
|
25
28
|
permissionMode?: 'autopilot' | 'approve-destructive' | 'approve-all';
|
|
26
29
|
enabledTools?: string[];
|
|
30
|
+
enabledMcpTools?: string[];
|
|
27
31
|
systemPrompt?: string;
|
|
28
32
|
maxToolCallsPerMessage?: number;
|
|
29
33
|
maxTokensPerMessage?: number;
|
|
@@ -40,5 +44,9 @@ export declare function deleteAgentConfig(name: string): void;
|
|
|
40
44
|
/**
|
|
41
45
|
* Convert a ProviderConfig + agent name into an AgentLocalConfig
|
|
42
46
|
*/
|
|
43
|
-
export declare function createAgentLocalConfig(name: string, botId: string | undefined, provider: ProviderConfig, workspace?: string
|
|
47
|
+
export declare function createAgentLocalConfig(name: string, botId: string | undefined, provider: ProviderConfig, workspace?: string, options?: {
|
|
48
|
+
runtimeProvider?: string;
|
|
49
|
+
runtimeModel?: string;
|
|
50
|
+
accessMode?: string;
|
|
51
|
+
}): AgentLocalConfig;
|
|
44
52
|
//# sourceMappingURL=agent-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-config.d.ts","sourceRoot":"","sources":["../src/agent-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG/C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,WAAW,GAAG,qBAAqB,GAAG,aAAa,CAAC;IACrE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB;AAKD,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAMrC;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAQrE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAS5E;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAKpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,cAAc,EACxB,SAAS,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"agent-config.d.ts","sourceRoot":"","sources":["../src/agent-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG/C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,WAAW,GAAG,qBAAqB,GAAG,aAAa,CAAC;IACrE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB;AAKD,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAMrC;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAQrE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAS5E;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAKpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,cAAc,EACxB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IACR,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,gBAAgB,CAiBlB"}
|
package/dist/agent-config.js
CHANGED
|
@@ -108,12 +108,15 @@ function deleteAgentConfig(name) {
|
|
|
108
108
|
/**
|
|
109
109
|
* Convert a ProviderConfig + agent name into an AgentLocalConfig
|
|
110
110
|
*/
|
|
111
|
-
function createAgentLocalConfig(name, botId, provider, workspace) {
|
|
111
|
+
function createAgentLocalConfig(name, botId, provider, workspace, options) {
|
|
112
112
|
return {
|
|
113
113
|
name,
|
|
114
114
|
botId,
|
|
115
115
|
provider: provider.id,
|
|
116
|
+
runtimeProvider: options?.runtimeProvider,
|
|
116
117
|
model: provider.defaultModel,
|
|
118
|
+
runtimeModel: options?.runtimeModel,
|
|
119
|
+
accessMode: options?.accessMode,
|
|
117
120
|
apiKey: provider.apiKey,
|
|
118
121
|
oauthToken: provider.oauthToken,
|
|
119
122
|
oauthRefreshToken: provider.oauthRefreshToken,
|
package/dist/agent-config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-config.js","sourceRoot":"","sources":["../src/agent-config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"agent-config.js","sourceRoot":"","sources":["../src/agent-config.ts"],"names":[],"mappings":"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"}
|
package/dist/approval.d.ts
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import { EventEmitter } from 'events';
|
|
14
14
|
export type PermissionMode = 'autopilot' | 'approve-destructive' | 'approve-all';
|
|
15
|
+
export declare function normalizePermissionMode(value: string | null | undefined): PermissionMode;
|
|
15
16
|
export interface ApprovalResult {
|
|
16
17
|
approved: boolean;
|
|
17
18
|
reason?: string;
|
package/dist/approval.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval.d.ts","sourceRoot":"","sources":["../src/approval.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMtC,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,qBAAqB,GAAG,aAAa,CAAC;AA+
|
|
1
|
+
{"version":3,"file":"approval.d.ts","sourceRoot":"","sources":["../src/approval.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMtC,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,qBAAqB,GAAG,aAAa,CAAC;AAEjF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,cAAc,CAMxF;AA+BD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAID,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,aAAa,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAwCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CASnD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAQtD;AAED,wBAAgB,eAAe,IAAI,IAAI,CAGtC;AAID;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,cAAc,CAoChB;AAID,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAuBvF;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,aAAa,CAErE;AAID,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,CAAC;AAE1F,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,OAAO,CAGV;IAEL,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,cAAc,CAAS;gBAEnB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,SAAU;IAO1E;;;OAGG;IACG,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,sBAAsB,GACxC,OAAO,CAAC,cAAc,CAAC;IAoC1B;;;OAGG;IACH,cAAc,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAsBhD;;OAEG;IACH,SAAS,IAAI,IAAI;IAQjB;;OAEG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAMzC,IAAI,YAAY,IAAI,MAAM,CAEzB;CACF"}
|
package/dist/approval.js
CHANGED
|
@@ -46,6 +46,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
46
46
|
})();
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
48
|
exports.ApprovalManager = void 0;
|
|
49
|
+
exports.normalizePermissionMode = normalizePermissionMode;
|
|
49
50
|
exports.rememberTool = rememberTool;
|
|
50
51
|
exports.isRemembered = isRemembered;
|
|
51
52
|
exports.clearRemembered = clearRemembered;
|
|
@@ -57,6 +58,16 @@ const crypto = __importStar(require("crypto"));
|
|
|
57
58
|
const fs = __importStar(require("fs"));
|
|
58
59
|
const path = __importStar(require("path"));
|
|
59
60
|
const os = __importStar(require("os"));
|
|
61
|
+
function normalizePermissionMode(value) {
|
|
62
|
+
const normalized = String(value || '').trim().toLowerCase();
|
|
63
|
+
if (normalized === 'approve-all')
|
|
64
|
+
return 'approve-all';
|
|
65
|
+
if (normalized === 'approve-destructive')
|
|
66
|
+
return 'approve-destructive';
|
|
67
|
+
if (normalized === 'autopilot' || normalized === 'auto')
|
|
68
|
+
return 'autopilot';
|
|
69
|
+
return 'autopilot';
|
|
70
|
+
}
|
|
60
71
|
/** Tools that modify state — require approval in approve-destructive mode */
|
|
61
72
|
const DESTRUCTIVE_TOOLS = new Set([
|
|
62
73
|
'write_file',
|
|
@@ -153,6 +164,7 @@ function clearRemembered() {
|
|
|
153
164
|
* tools that need the async MQTT approval flow.
|
|
154
165
|
*/
|
|
155
166
|
function checkPermission(toolName, permissionMode, enabledTools) {
|
|
167
|
+
permissionMode = normalizePermissionMode(permissionMode);
|
|
156
168
|
// Check if tool is enabled
|
|
157
169
|
if (enabledTools && enabledTools.length > 0 && !enabledTools.includes(toolName)) {
|
|
158
170
|
return {
|
package/dist/approval.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval.js","sourceRoot":"","sources":["../src/approval.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"approval.js","sourceRoot":"","sources":["../src/approval.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,20 @@ export interface ResolvedAuth {
|
|
|
5
5
|
apiKey: string;
|
|
6
6
|
source: 'oauth' | 'api-key' | 'env';
|
|
7
7
|
credential?: OAuthCredential;
|
|
8
|
+
authMode?: 'api-key' | 'oauth-bearer';
|
|
9
|
+
baseUrl?: string;
|
|
10
|
+
apiStyle?: 'openai-chat-completions' | 'codex-chatgpt-responses';
|
|
8
11
|
expired?: boolean;
|
|
9
12
|
error?: string;
|
|
10
13
|
}
|
|
11
14
|
/**
|
|
12
15
|
* Resolve the best available authentication method.
|
|
13
|
-
*
|
|
16
|
+
*
|
|
17
|
+
* Priority:
|
|
18
|
+
* 1. Explicit API key (from config.apiKey)
|
|
19
|
+
* 2. OAuth/subscription token from config
|
|
20
|
+
* 3. Local OAuth credentials on disk
|
|
21
|
+
* 4. Environment variable API key
|
|
14
22
|
*/
|
|
15
23
|
export declare function resolveAuth(config: {
|
|
16
24
|
provider?: string;
|
|
@@ -21,8 +29,8 @@ export declare function resolveAuth(config: {
|
|
|
21
29
|
oauthExpiresAt?: number;
|
|
22
30
|
}): Promise<ResolvedAuth | null>;
|
|
23
31
|
/**
|
|
24
|
-
* Ensure the
|
|
25
|
-
*
|
|
32
|
+
* Ensure the auth is still valid. For API keys, this is a no-op passthrough.
|
|
33
|
+
* OAuth token refresh has been removed.
|
|
26
34
|
*/
|
|
27
35
|
export declare function ensureFreshToken(auth: ResolvedAuth): Promise<ResolvedAuth>;
|
|
28
36
|
//# sourceMappingURL=auto-detect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-detect.d.ts","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"auto-detect.d.ts","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA0D,MAAM,qBAAqB,CAAC;AAK9G,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,GAAG,SAAS,GAAG,KAAK,CAAC;IACpC,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,GAAG,cAAc,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,yBAAyB,GAAG,yBAAyB,CAAC;IACjE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAuGD;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAkF/B;AAID;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA+BhF"}
|
package/dist/auth/auto-detect.js
CHANGED
|
@@ -1,212 +1,181 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
3
|
exports.resolveAuth = resolveAuth;
|
|
37
4
|
exports.ensureFreshToken = ensureFreshToken;
|
|
38
5
|
const credential_reader_1 = require("./credential-reader");
|
|
39
6
|
const token_refresh_1 = require("./token-refresh");
|
|
40
|
-
const fs = __importStar(require("fs"));
|
|
41
|
-
const path = __importStar(require("path"));
|
|
42
|
-
const os = __importStar(require("os"));
|
|
43
7
|
// ── Default Models ──────────────────────────────────────────────────────────
|
|
44
8
|
const DEFAULT_MODELS = {
|
|
45
9
|
anthropic: 'claude-sonnet-4-5',
|
|
46
10
|
openai: 'gpt-4o',
|
|
47
11
|
'google-gemini': 'gemini-2.5-flash',
|
|
48
12
|
};
|
|
13
|
+
function normalizeProvider(provider) {
|
|
14
|
+
const normalized = (provider || 'anthropic').trim().toLowerCase();
|
|
15
|
+
if (normalized === 'claude-cli' || normalized === 'anthropic')
|
|
16
|
+
return 'anthropic';
|
|
17
|
+
if (normalized === 'codex-cli' || normalized === 'openai')
|
|
18
|
+
return 'openai';
|
|
19
|
+
return 'google-gemini';
|
|
20
|
+
}
|
|
21
|
+
function normalizeModel(provider, model) {
|
|
22
|
+
const normalizedProvider = normalizeProvider(provider);
|
|
23
|
+
return model || DEFAULT_MODELS[normalizedProvider] || 'claude-sonnet-4-5';
|
|
24
|
+
}
|
|
25
|
+
// ── Environment API Key Detection ───────────────────────────────────────────
|
|
26
|
+
function getEnvApiKey(provider) {
|
|
27
|
+
switch (normalizeProvider(provider)) {
|
|
28
|
+
case 'anthropic': return process.env.ANTHROPIC_API_KEY;
|
|
29
|
+
case 'openai': return process.env.OPENAI_API_KEY;
|
|
30
|
+
case 'google-gemini': return process.env.GOOGLE_API_KEY;
|
|
31
|
+
default: return undefined;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
function readProviderCredentials(provider) {
|
|
35
|
+
switch (normalizeProvider(provider)) {
|
|
36
|
+
case 'anthropic': return (0, credential_reader_1.readClaudeCredentials)();
|
|
37
|
+
case 'openai': return (0, credential_reader_1.readCodexCredentials)();
|
|
38
|
+
default: return null;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function buildOAuthRuntime(provider) {
|
|
42
|
+
switch (normalizeProvider(provider)) {
|
|
43
|
+
case 'anthropic':
|
|
44
|
+
return {
|
|
45
|
+
provider: 'anthropic',
|
|
46
|
+
authMode: 'oauth-bearer',
|
|
47
|
+
};
|
|
48
|
+
case 'openai':
|
|
49
|
+
return {
|
|
50
|
+
provider: 'openai',
|
|
51
|
+
authMode: 'api-key',
|
|
52
|
+
baseUrl: 'https://chatgpt.com/backend-api/codex',
|
|
53
|
+
apiStyle: 'codex-chatgpt-responses',
|
|
54
|
+
};
|
|
55
|
+
default:
|
|
56
|
+
return {
|
|
57
|
+
provider: normalizeProvider(provider),
|
|
58
|
+
authMode: 'api-key',
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
function mergeCredential(provider, oauthToken, oauthRefreshToken, oauthExpiresAt) {
|
|
63
|
+
if (!oauthToken)
|
|
64
|
+
return null;
|
|
65
|
+
const normalizedProvider = normalizeProvider(provider);
|
|
66
|
+
const detected = readProviderCredentials(provider);
|
|
67
|
+
return {
|
|
68
|
+
provider: normalizedProvider,
|
|
69
|
+
accessToken: oauthToken,
|
|
70
|
+
refreshToken: oauthRefreshToken || detected?.refreshToken || '',
|
|
71
|
+
expiresAt: oauthExpiresAt || detected?.expiresAt || 0,
|
|
72
|
+
...(detected?.accountId ? { accountId: detected.accountId } : {}),
|
|
73
|
+
...(detected?.idToken ? { idToken: detected.idToken } : {}),
|
|
74
|
+
...(detected?.projectId ? { projectId: detected.projectId } : {}),
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
function buildResolvedOauth(provider, model, credential) {
|
|
78
|
+
const runtime = buildOAuthRuntime(provider);
|
|
79
|
+
return {
|
|
80
|
+
provider: runtime.provider,
|
|
81
|
+
model,
|
|
82
|
+
apiKey: credential.accessToken,
|
|
83
|
+
source: 'oauth',
|
|
84
|
+
credential,
|
|
85
|
+
authMode: runtime.authMode,
|
|
86
|
+
...(runtime.baseUrl ? { baseUrl: runtime.baseUrl } : {}),
|
|
87
|
+
...(runtime.apiStyle ? { apiStyle: runtime.apiStyle } : {}),
|
|
88
|
+
};
|
|
89
|
+
}
|
|
49
90
|
// ── resolveAuth ─────────────────────────────────────────────────────────────
|
|
50
91
|
/**
|
|
51
92
|
* Resolve the best available authentication method.
|
|
52
|
-
*
|
|
93
|
+
*
|
|
94
|
+
* Priority:
|
|
95
|
+
* 1. Explicit API key (from config.apiKey)
|
|
96
|
+
* 2. OAuth/subscription token from config
|
|
97
|
+
* 3. Local OAuth credentials on disk
|
|
98
|
+
* 4. Environment variable API key
|
|
53
99
|
*/
|
|
54
100
|
async function resolveAuth(config) {
|
|
101
|
+
const requestedProvider = config.provider || 'anthropic';
|
|
102
|
+
const provider = normalizeProvider(requestedProvider);
|
|
103
|
+
const model = normalizeModel(requestedProvider, config.model);
|
|
55
104
|
// 1. Explicit API key takes priority (BYOK)
|
|
56
105
|
if (config.apiKey) {
|
|
57
|
-
const provider = config.provider || 'anthropic';
|
|
58
106
|
console.log(`[auto-detect] Using explicit API key (source: api-key, provider: ${provider})`);
|
|
59
107
|
return {
|
|
60
108
|
provider,
|
|
61
|
-
model
|
|
109
|
+
model,
|
|
62
110
|
apiKey: config.apiKey,
|
|
63
111
|
source: 'api-key',
|
|
64
112
|
};
|
|
65
113
|
}
|
|
66
|
-
// 2.
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const credential = {
|
|
71
|
-
provider: provider,
|
|
72
|
-
accessToken: config.oauthToken,
|
|
73
|
-
refreshToken: config.oauthRefreshToken || '',
|
|
74
|
-
expiresAt: config.oauthExpiresAt || 0,
|
|
75
|
-
};
|
|
76
|
-
// If token is expired OR has no expiry info, and no refresh token in config,
|
|
77
|
-
// try to find one from CLI credentials (which track expiry properly)
|
|
78
|
-
if (!credential.refreshToken && ((0, credential_reader_1.isExpired)(credential) || !credential.expiresAt)) {
|
|
79
|
-
console.log(`[auto-detect] Config OAuth token expired with no refresh token — checking CLI credentials...`);
|
|
80
|
-
const cliCreds = detectClaudeCodeCredentials();
|
|
81
|
-
if (cliCreds?.refreshToken) {
|
|
82
|
-
console.log(`[auto-detect] Found refresh token in Claude Code credentials`);
|
|
83
|
-
credential.refreshToken = cliCreds.refreshToken;
|
|
84
|
-
credential.expiresAt = cliCreds.expiresAt || credential.expiresAt;
|
|
85
|
-
// Use CLI access token if it's newer
|
|
86
|
-
if (cliCreds.accessToken && (!(0, credential_reader_1.isExpired)(cliCreds) || cliCreds.expiresAt > credential.expiresAt)) {
|
|
87
|
-
credential.accessToken = cliCreds.accessToken;
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
// Refresh if expired (or if we just imported CLI expiry that shows it's expired)
|
|
92
|
-
if (credential.refreshToken && ((0, credential_reader_1.isExpired)(credential) || (credential.expiresAt > 0 && Date.now() >= credential.expiresAt))) {
|
|
114
|
+
// 2. Explicit OAuth/subscription token from config
|
|
115
|
+
const configCredential = mergeCredential(requestedProvider, config.oauthToken, config.oauthRefreshToken, config.oauthExpiresAt);
|
|
116
|
+
if (configCredential) {
|
|
117
|
+
if (configCredential.refreshToken && (0, credential_reader_1.isExpired)(configCredential)) {
|
|
93
118
|
try {
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
credential.refreshToken = result.credential.refreshToken;
|
|
97
|
-
credential.expiresAt = result.credential.expiresAt;
|
|
98
|
-
// Persist the refresh token back to config so we don't lose it
|
|
99
|
-
try {
|
|
100
|
-
const configPath = path.join(os.homedir(), '.funolio', 'config.json');
|
|
101
|
-
if (fs.existsSync(configPath)) {
|
|
102
|
-
const cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
|
|
103
|
-
const idx = cfg.providers?.findIndex((p) => p.id === provider);
|
|
104
|
-
if (idx >= 0 && cfg.providers[idx]) {
|
|
105
|
-
cfg.providers[idx].oauthToken = credential.accessToken;
|
|
106
|
-
cfg.providers[idx].oauthRefreshToken = credential.refreshToken;
|
|
107
|
-
cfg.providers[idx].oauthExpiresAt = credential.expiresAt;
|
|
108
|
-
fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
|
|
109
|
-
console.log(`[auto-detect] Persisted refreshed tokens to config`);
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
catch (writeErr) {
|
|
114
|
-
console.warn(`[auto-detect] Failed to persist refreshed tokens:`, writeErr);
|
|
115
|
-
}
|
|
119
|
+
const refreshed = await (0, token_refresh_1.refreshToken)(configCredential);
|
|
120
|
+
return buildResolvedOauth(requestedProvider, model, refreshed.credential);
|
|
116
121
|
}
|
|
117
|
-
catch {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
error: `OAuth token expired for ${provider}. Run \`funolio-agent configure\` to re-authenticate.`,
|
|
127
|
-
};
|
|
122
|
+
catch (err) {
|
|
123
|
+
if (err instanceof token_refresh_1.TokenRefreshError) {
|
|
124
|
+
return {
|
|
125
|
+
...buildResolvedOauth(requestedProvider, model, configCredential),
|
|
126
|
+
expired: true,
|
|
127
|
+
error: `OAuth token refresh failed for ${provider}${err.httpStatus ? ` (HTTP ${err.httpStatus})` : ''}: ${err.message}`,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
throw err;
|
|
128
131
|
}
|
|
129
132
|
}
|
|
130
|
-
console.log(`[auto-detect]
|
|
131
|
-
return
|
|
132
|
-
provider,
|
|
133
|
-
model,
|
|
134
|
-
apiKey: credential.accessToken,
|
|
135
|
-
source: 'oauth',
|
|
136
|
-
credential,
|
|
137
|
-
};
|
|
133
|
+
console.log(`[auto-detect] Using OAuth/subscription token (provider: ${provider})`);
|
|
134
|
+
return buildResolvedOauth(requestedProvider, model, configCredential);
|
|
138
135
|
}
|
|
139
|
-
// 3.
|
|
140
|
-
const
|
|
141
|
-
if (
|
|
142
|
-
|
|
143
|
-
const model = config.model || DEFAULT_MODELS[provider] || 'claude-sonnet-4-5';
|
|
144
|
-
// Refresh if expired
|
|
145
|
-
if ((0, credential_reader_1.isExpired)(claudeCodeAuth) && claudeCodeAuth.refreshToken) {
|
|
136
|
+
// 3. Local OAuth credentials on disk
|
|
137
|
+
const detectedCredential = readProviderCredentials(requestedProvider);
|
|
138
|
+
if (detectedCredential?.accessToken) {
|
|
139
|
+
if (detectedCredential.refreshToken && (0, credential_reader_1.isExpired)(detectedCredential)) {
|
|
146
140
|
try {
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
claudeCodeAuth.refreshToken = result.credential.refreshToken;
|
|
150
|
-
claudeCodeAuth.expiresAt = result.credential.expiresAt;
|
|
141
|
+
const refreshed = await (0, token_refresh_1.refreshToken)(detectedCredential);
|
|
142
|
+
return buildResolvedOauth(requestedProvider, model, refreshed.credential);
|
|
151
143
|
}
|
|
152
|
-
catch {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
error: `Claude Code OAuth token expired and refresh failed. Run \`claude login\` to re-authenticate.`,
|
|
162
|
-
};
|
|
144
|
+
catch (err) {
|
|
145
|
+
if (err instanceof token_refresh_1.TokenRefreshError) {
|
|
146
|
+
return {
|
|
147
|
+
...buildResolvedOauth(requestedProvider, model, detectedCredential),
|
|
148
|
+
expired: true,
|
|
149
|
+
error: `OAuth token refresh failed for ${provider}${err.httpStatus ? ` (HTTP ${err.httpStatus})` : ''}: ${err.message}`,
|
|
150
|
+
};
|
|
151
|
+
}
|
|
152
|
+
throw err;
|
|
163
153
|
}
|
|
164
154
|
}
|
|
165
|
-
console.log(`[auto-detect]
|
|
155
|
+
console.log(`[auto-detect] Using local OAuth credentials (provider: ${provider})`);
|
|
156
|
+
return buildResolvedOauth(requestedProvider, model, detectedCredential);
|
|
157
|
+
}
|
|
158
|
+
// 4. Check environment variable API keys
|
|
159
|
+
const envKey = getEnvApiKey(provider);
|
|
160
|
+
if (envKey) {
|
|
161
|
+
console.log(`[auto-detect] Using environment variable API key (source: env, provider: ${provider})`);
|
|
166
162
|
return {
|
|
167
163
|
provider,
|
|
168
164
|
model,
|
|
169
|
-
apiKey:
|
|
170
|
-
source: '
|
|
171
|
-
credential: claudeCodeAuth,
|
|
165
|
+
apiKey: envKey,
|
|
166
|
+
source: 'env',
|
|
172
167
|
};
|
|
173
168
|
}
|
|
174
|
-
|
|
169
|
+
// No API key found — CLI providers handle their own auth, so returning null
|
|
170
|
+
// is expected for claude-cli / codex-cli. For API-based providers, this
|
|
171
|
+
// means the user needs to configure an API key.
|
|
172
|
+
console.log(`[auto-detect] No API key found for provider: ${provider}`);
|
|
175
173
|
return null;
|
|
176
174
|
}
|
|
177
|
-
// ── Claude Code Credential Detection ────────────────────────────────────────
|
|
178
|
-
/**
|
|
179
|
-
* Detect OAuth credentials from Claude Code's local credential files.
|
|
180
|
-
* Checks ~/.claude/.credentials.json for claudeAiOauth tokens.
|
|
181
|
-
*/
|
|
182
|
-
function detectClaudeCodeCredentials() {
|
|
183
|
-
try {
|
|
184
|
-
const credPath = path.join(os.homedir(), '.claude', '.credentials.json');
|
|
185
|
-
if (!fs.existsSync(credPath))
|
|
186
|
-
return null;
|
|
187
|
-
const raw = JSON.parse(fs.readFileSync(credPath, 'utf-8'));
|
|
188
|
-
const oauth = raw?.claudeAiOauth;
|
|
189
|
-
if (!oauth?.accessToken?.startsWith('sk-ant-oat01-'))
|
|
190
|
-
return null;
|
|
191
|
-
const credential = {
|
|
192
|
-
provider: 'anthropic',
|
|
193
|
-
accessToken: oauth.accessToken,
|
|
194
|
-
refreshToken: oauth.refreshToken || '',
|
|
195
|
-
expiresAt: oauth.expiresAt || 0,
|
|
196
|
-
};
|
|
197
|
-
if ((0, credential_reader_1.isExpired)(credential)) {
|
|
198
|
-
console.log('[auto-detect] Claude Code OAuth token is expired, will attempt refresh');
|
|
199
|
-
}
|
|
200
|
-
return credential;
|
|
201
|
-
}
|
|
202
|
-
catch {
|
|
203
|
-
return null;
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
175
|
// ── ensureFreshToken ────────────────────────────────────────────────────────
|
|
207
176
|
/**
|
|
208
|
-
* Ensure the
|
|
209
|
-
*
|
|
177
|
+
* Ensure the auth is still valid. For API keys, this is a no-op passthrough.
|
|
178
|
+
* OAuth token refresh has been removed.
|
|
210
179
|
*/
|
|
211
180
|
async function ensureFreshToken(auth) {
|
|
212
181
|
if (auth.source !== 'oauth' || !auth.credential) {
|
|
@@ -219,7 +188,7 @@ async function ensureFreshToken(auth) {
|
|
|
219
188
|
const result = await (0, token_refresh_1.refreshToken)(auth.credential);
|
|
220
189
|
const refreshed = result.credential;
|
|
221
190
|
if (refreshed.accessToken === auth.credential.accessToken) {
|
|
222
|
-
return auth;
|
|
191
|
+
return auth;
|
|
223
192
|
}
|
|
224
193
|
return {
|
|
225
194
|
...auth,
|
|
@@ -229,11 +198,10 @@ async function ensureFreshToken(auth) {
|
|
|
229
198
|
}
|
|
230
199
|
catch (err) {
|
|
231
200
|
if (err instanceof token_refresh_1.TokenRefreshError) {
|
|
232
|
-
console.error(`[auto-detect] Token refresh failed for ${err.provider}: ${err.message}`);
|
|
233
201
|
return {
|
|
234
202
|
...auth,
|
|
235
203
|
expired: true,
|
|
236
|
-
error: `
|
|
204
|
+
error: `OAuth token refresh failed for ${err.provider}${err.httpStatus ? ` (HTTP ${err.httpStatus})` : ''}: ${err.message}`,
|
|
237
205
|
};
|
|
238
206
|
}
|
|
239
207
|
throw err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-detect.js","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auto-detect.js","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":"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"}
|