@kaitranntt/ccs 7.78.1-dev.6 → 7.78.1-dev.8
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/bin/ccsxp-runtime.d.ts +1 -0
- package/dist/bin/ccsxp-runtime.d.ts.map +1 -1
- package/dist/bin/ccsxp-runtime.js +2 -0
- package/dist/bin/ccsxp-runtime.js.map +1 -1
- package/dist/cliproxy/executor/claude-launcher.d.ts.map +1 -1
- package/dist/cliproxy/executor/claude-launcher.js +15 -11
- package/dist/cliproxy/executor/claude-launcher.js.map +1 -1
- package/dist/cliproxy/executor/session-bridge.d.ts +16 -1
- package/dist/cliproxy/executor/session-bridge.d.ts.map +1 -1
- package/dist/cliproxy/executor/session-bridge.js +86 -54
- package/dist/cliproxy/executor/session-bridge.js.map +1 -1
- package/dist/dispatcher/flows/settings-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/settings-flow.js +6 -2
- package/dist/dispatcher/flows/settings-flow.js.map +1 -1
- package/dist/dispatcher/profile-resolver.d.ts.map +1 -1
- package/dist/dispatcher/profile-resolver.js +14 -1
- package/dist/dispatcher/profile-resolver.js.map +1 -1
- package/dist/targets/codex-adapter.d.ts +1 -0
- package/dist/targets/codex-adapter.d.ts.map +1 -1
- package/dist/targets/codex-adapter.js +18 -1
- package/dist/targets/codex-adapter.js.map +1 -1
- package/dist/targets/codex-cliproxy-provider-config.d.ts +16 -0
- package/dist/targets/codex-cliproxy-provider-config.d.ts.map +1 -0
- package/dist/targets/codex-cliproxy-provider-config.js +156 -0
- package/dist/targets/codex-cliproxy-provider-config.js.map +1 -0
- package/dist/targets/target-runtime-compatibility.js +1 -1
- package/dist/targets/target-runtime-compatibility.js.map +1 -1
- package/dist/ui/assets/{accounts-DhGQBR60.js → accounts-ODg4vRYO.js} +1 -1
- package/dist/ui/assets/{alert-dialog-OK7OmKDC.js → alert-dialog-DOkcpleU.js} +1 -1
- package/dist/ui/assets/{api-BUpGea2f.js → api-BT_0qMeR.js} +1 -1
- package/dist/ui/assets/{auth-section-B2NAmUkz.js → auth-section-CeSiLsXy.js} +1 -1
- package/dist/ui/assets/{backups-section-BKBS9Er1.js → backups-section-iVmpYvyb.js} +1 -1
- package/dist/ui/assets/{channels-DLuF45Gi.js → channels-zZKhs8WR.js} +1 -1
- package/dist/ui/assets/{checkbox-D6o6gikg.js → checkbox-C-I3i4Q4.js} +1 -1
- package/dist/ui/assets/{claude-extension-DGgDrDCs.js → claude-extension-BAoBvPvA.js} +1 -1
- package/dist/ui/assets/{cliproxy-Cxgxp4kg.js → cliproxy-IfhUOGN4.js} +1 -1
- package/dist/ui/assets/{cliproxy-ai-providers-DIhU1U0a.js → cliproxy-ai-providers-DyDkgHp7.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-D2liVEy7.js → cliproxy-control-panel-CLsxYShw.js} +1 -1
- package/dist/ui/assets/{codex-BHasRc3P.js → codex-BUQaneEo.js} +5 -2
- package/dist/ui/assets/{confirm-dialog-VGknxJET.js → confirm-dialog-CC1GlhTa.js} +1 -1
- package/dist/ui/assets/{copilot-COk6htNP.js → copilot-BohFv0NM.js} +1 -1
- package/dist/ui/assets/{cursor-CEcSVzsK.js → cursor-C1IOfCtR.js} +1 -1
- package/dist/ui/assets/{droid-69pHafym.js → droid-CZbjGOaK.js} +1 -1
- package/dist/ui/assets/{globalenv-section-C4-uOp5W.js → globalenv-section-Bqi0fVGe.js} +1 -1
- package/dist/ui/assets/{health-Ds3eVp8s.js → health-CiA0mNhQ.js} +1 -1
- package/dist/ui/assets/{index-B-Xsn3pB.js → index-9xFrS28W.js} +1 -1
- package/dist/ui/assets/{index-BPvsFKho.js → index-BB0thfeB.js} +2 -2
- package/dist/ui/assets/{index-BHUMjLhA.js → index-BWwOcbRZ.js} +1 -1
- package/dist/ui/assets/{index-BGagjv0t.js → index-CdqlhnY2.js} +1 -1
- package/dist/ui/assets/{index-7MkuzUnB.js → index-Clx3EIEh.js} +1 -1
- package/dist/ui/assets/{index-DgnGGCqH.js → index-Cp5UeBTW.js} +1 -1
- package/dist/ui/assets/{index-BUKxCopE.js → index-sEOc1fZf.js} +1 -1
- package/dist/ui/assets/{logs-C8Yknto2.js → logs-WziPXnEI.js} +1 -1
- package/dist/ui/assets/{masked-input-DlLOwasV.js → masked-input-dygs7T1G.js} +1 -1
- package/dist/ui/assets/{proxy-status-widget-jPG1h4kb.js → proxy-status-widget-EU0qf73i.js} +1 -1
- package/dist/ui/assets/{raw-json-settings-editor-panel-BELmHBxo.js → raw-json-settings-editor-panel-DV6AQbQf.js} +1 -1
- package/dist/ui/assets/{searchable-select-M153w1S5.js → searchable-select-ZehCX5PV.js} +1 -1
- package/dist/ui/assets/{separator-Cuagv-0z.js → separator-DJy3ImQI.js} +1 -1
- package/dist/ui/assets/{shared-CEP2o-Il.js → shared-CnZ8AED_.js} +1 -1
- package/dist/ui/assets/{table-DlRQZ7sG.js → table-CgmEQVhj.js} +1 -1
- package/dist/ui/assets/{updates-Dfn4zngu.js → updates-C24j_PKK.js} +1 -1
- package/dist/ui/assets/{use-accounts-CUzy8Zo8.js → use-accounts-BG5kGe9H.js} +1 -1
- package/dist/ui/index.html +1 -1
- package/dist/utils/claude-subcommand-detector.d.ts +2 -0
- package/dist/utils/claude-subcommand-detector.d.ts.map +1 -1
- package/dist/utils/claude-subcommand-detector.js +49 -16
- package/dist/utils/claude-subcommand-detector.js.map +1 -1
- package/dist/utils/shell-executor.d.ts.map +1 -1
- package/dist/utils/shell-executor.js +8 -5
- package/dist/utils/shell-executor.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccsxp-runtime.d.ts","sourceRoot":"","sources":["../../src/bin/ccsxp-runtime.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,EAAE,KAAgB,CAAC;AACzB,QAAA,MAAM,IAAI,KAAkB,CAAC;AAC7B,QAAA,MAAQ,eAAe,KAA0C,CAAC;AAClE,QAAA,MAAQ,UAAU,KAAgC,CAAC;AACnD,QAAA,MAAQ,IAAI,KAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"ccsxp-runtime.d.ts","sourceRoot":"","sources":["../../src/bin/ccsxp-runtime.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,EAAE,KAAgB,CAAC;AACzB,QAAA,MAAM,IAAI,KAAkB,CAAC;AAC7B,QAAA,MAAQ,2BAA2B,KAAyD,CAAC;AAC7F,QAAA,MAAQ,eAAe,KAA0C,CAAC;AAClE,QAAA,MAAQ,UAAU,KAAgC,CAAC;AACnD,QAAA,MAAQ,IAAI,KAA2B,CAAC;AAIxC,QAAA,MAAM,uBAAuB,gCAA8B,CAAC;AAC5D,QAAA,MAAM,iCAAiC,QAC6B,CAAC;AAErE,iBAAS,+BAA+B,CAAC,KAAK,EAAE,OAAO,WAEtD;AAED,iBAAS,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,aA0C/C;AAED,iBAAS,qBAAqB,QAO7B;AAOD,QAAA,MAAM,aAAa,KAcf,CAAC"}
|
|
@@ -2,10 +2,12 @@
|
|
|
2
2
|
"use strict";
|
|
3
3
|
const os = require('os');
|
|
4
4
|
const path = require('path');
|
|
5
|
+
const { CCSXP_CLIPROXY_SHORTCUT_ENV } = require('../targets/codex-cliproxy-provider-config');
|
|
5
6
|
const { stripTargetFlag } = require('../targets/target-resolver');
|
|
6
7
|
const { expandPath } = require('../utils/helpers');
|
|
7
8
|
const { fail } = require('../utils/ui');
|
|
8
9
|
process.env.CCS_INTERNAL_ENTRY_TARGET = 'codex';
|
|
10
|
+
process.env[CCSXP_CLIPROXY_SHORTCUT_ENV] = '1';
|
|
9
11
|
const CCSXP_CLIPROXY_OVERRIDE = 'model_provider="cliproxy"';
|
|
10
12
|
const DISALLOWED_CCSXP_CONFIG_KEY_REGEX = /^(model_provider|local_provider|profile)\s*=|^model_providers\./i;
|
|
11
13
|
function isDisallowedCcsxpConfigOverride(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccsxp-runtime.js","sourceRoot":"","sources":["../../src/bin/ccsxp-runtime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ccsxp-runtime.js","sourceRoot":"","sources":["../../src/bin/ccsxp-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-launcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;AAEH,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAYpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-launcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;AAEH,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAYpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAU/D,MAAM,WAAW,mBAAmB;IAClC,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,sEAAsE;IACtE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,+BAA+B;IAC/B,GAAG,EAAE,cAAc,CAAC;IACpB,+BAA+B;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,0EAA0E;IAC1E,kBAAkB,EAAE,gBAAgB,EAAE,CAAC;IACvC,iEAAiE;IACjE,aAAa,EAAE,OAAO,CAAC;IACvB,sCAAsC;IACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,0CAA0C;IAC1C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,8EAA8E;IAC9E,iBAAiB,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACjD,iDAAiD;IACjD,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,4CAA4C;IAC5C,mBAAmB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAChD,8CAA8C;IAC9C,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACpD,yCAAyC;IACzC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,yCAAyC;IACzC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC,CA6GtF"}
|
|
@@ -55,18 +55,21 @@ async function launchClaude(context) {
|
|
|
55
55
|
const settingsPath = cfg.customSettingsPath
|
|
56
56
|
? cfg.customSettingsPath.replace(/^~/, os.homedir())
|
|
57
57
|
: (0, config_generator_1.getProviderSettingsPath)(provider);
|
|
58
|
-
// Assemble final args: image analysis tools → browser tools → web search tools → settings
|
|
59
|
-
const imageAnalysisArgs = imageAnalysisMcpReady
|
|
60
|
-
? (0, image_analysis_1.appendThirdPartyImageAnalysisToolArgs)(claudeArgs)
|
|
61
|
-
: claudeArgs;
|
|
62
|
-
const browserArgs = browserRuntimeEnv
|
|
63
|
-
? (0, browser_1.appendBrowserToolArgs)(imageAnalysisArgs)
|
|
64
|
-
: imageAnalysisArgs;
|
|
65
58
|
// Claude subcommands (agents, doctor, mcp, ...) don't accept `--settings` —
|
|
66
59
|
// its presence flips `agents` into list mode instead of opening the
|
|
67
60
|
// interactive agent view. Provider routing still flows via env vars.
|
|
68
61
|
// Issue #1218.
|
|
69
62
|
const isSubcommand = (0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(claudeArgs);
|
|
63
|
+
const claudeSessionArgs = isSubcommand
|
|
64
|
+
? (0, claude_subcommand_detector_1.stripClaudeSubcommandSessionArgs)(claudeArgs)
|
|
65
|
+
: claudeArgs;
|
|
66
|
+
// Assemble final args: image analysis tools → browser tools → web search tools → settings
|
|
67
|
+
const imageAnalysisArgs = imageAnalysisMcpReady
|
|
68
|
+
? (0, image_analysis_1.appendThirdPartyImageAnalysisToolArgs)(claudeSessionArgs)
|
|
69
|
+
: claudeSessionArgs;
|
|
70
|
+
const browserArgs = browserRuntimeEnv
|
|
71
|
+
? (0, browser_1.appendBrowserToolArgs)(imageAnalysisArgs)
|
|
72
|
+
: imageAnalysisArgs;
|
|
70
73
|
const launchArgs = isSubcommand
|
|
71
74
|
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(browserArgs)
|
|
72
75
|
: ['--settings', settingsPath, ...(0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(browserArgs)];
|
|
@@ -79,12 +82,11 @@ async function launchClaude(context) {
|
|
|
79
82
|
settingsPath,
|
|
80
83
|
claudeConfigDir: inheritedClaudeConfigDir,
|
|
81
84
|
});
|
|
85
|
+
const baseTracedEnv = (0, claude_subcommand_detector_1.stripClaudeCodeFeatureBlockingEnv)({ ...env, ...traceEnv });
|
|
82
86
|
// Strip telemetry-disable env vars for subcommands; otherwise Claude's
|
|
83
87
|
// `agents`/`mcp`/... TUIs silently fall back to non-interactive list mode.
|
|
84
88
|
// Issue #1218.
|
|
85
|
-
const tracedEnv = isSubcommand
|
|
86
|
-
? (0, claude_subcommand_detector_1.stripSubcommandBlockingEnv)({ ...env, ...traceEnv })
|
|
87
|
-
: { ...env, ...traceEnv };
|
|
89
|
+
const tracedEnv = isSubcommand ? (0, claude_subcommand_detector_1.stripSubcommandBlockingEnv)(baseTracedEnv) : baseTracedEnv;
|
|
88
90
|
// Spawn: Windows .cmd/.bat/.ps1 need shell escaping; all others spawn directly
|
|
89
91
|
let claude;
|
|
90
92
|
if (needsShell) {
|
|
@@ -113,8 +115,10 @@ async function launchClaude(context) {
|
|
|
113
115
|
}
|
|
114
116
|
}
|
|
115
117
|
}
|
|
118
|
+
const hasSessionProxy = Boolean(codexReasoningProxy || toolSanitizationProxy || httpsTunnel);
|
|
119
|
+
const backgroundKeepAliveBaseUrl = hasSessionProxy ? tracedEnv.ANTHROPIC_BASE_URL : undefined;
|
|
116
120
|
// Wire cleanup handlers (process exit, SIGINT, SIGTERM, proxy teardown)
|
|
117
|
-
(0, session_bridge_1.setupCleanupHandlers)(claude, sessionId, cfg.port, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose);
|
|
121
|
+
(0, session_bridge_1.setupCleanupHandlers)(claude, sessionId, cfg.port, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose, { backgroundKeepAliveBaseUrl });
|
|
118
122
|
return claude;
|
|
119
123
|
}
|
|
120
124
|
exports.launchClaude = launchClaude;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-launcher.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,iDAAoD;AACpD,uCAAyB;AACzB,+DAA2F;AAC3F,iEAAqE;AACrE,qEAIuC;AACvC,+DAAmF;AACnF,iDAA4D;AAC5D,iEAAgE;AAKhE,qDAAwD;AACxD,6DAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"claude-launcher.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* - Startup lock coordination
|
|
9
9
|
*/
|
|
10
10
|
/// <reference types="node" />
|
|
11
|
+
/// <reference types="node" />
|
|
11
12
|
import { ChildProcess } from 'child_process';
|
|
12
13
|
import { CLIProxyBackend } from '../types';
|
|
13
14
|
export interface ProxySessionResult {
|
|
@@ -15,6 +16,20 @@ export interface ProxySessionResult {
|
|
|
15
16
|
proxy?: ChildProcess;
|
|
16
17
|
shouldSpawn: boolean;
|
|
17
18
|
}
|
|
19
|
+
export interface SessionProxyKeepAliveOptions {
|
|
20
|
+
backgroundKeepAliveBaseUrl?: string;
|
|
21
|
+
keepAlivePollIntervalMs?: number;
|
|
22
|
+
hasBackgroundWorkerUsingBaseUrl?: (baseUrl: string) => boolean;
|
|
23
|
+
}
|
|
24
|
+
export interface ShouldKeepSessionProxiesAliveOptions {
|
|
25
|
+
code: number | null;
|
|
26
|
+
signal: NodeJS.Signals | null;
|
|
27
|
+
backgroundKeepAliveBaseUrl?: string;
|
|
28
|
+
hasBackgroundWorkerUsingBaseUrl: (baseUrl: string) => boolean;
|
|
29
|
+
}
|
|
30
|
+
export declare function hasClaudeBackgroundWorkerUsingBaseUrlInProcessList(processList: string, baseUrl: string): boolean;
|
|
31
|
+
export declare function hasClaudeBackgroundWorkerUsingBaseUrl(baseUrl: string): boolean;
|
|
32
|
+
export declare function shouldKeepSessionProxiesAlive(options: ShouldKeepSessionProxiesAliveOptions): boolean;
|
|
18
33
|
/**
|
|
19
34
|
* Check for existing proxy and handle version mismatch, or determine if new spawn needed
|
|
20
35
|
*/
|
|
@@ -26,5 +41,5 @@ export declare function registerProxySession(port: number, pid: number, backend:
|
|
|
26
41
|
/**
|
|
27
42
|
* Setup cleanup handlers for session unregistration
|
|
28
43
|
*/
|
|
29
|
-
export declare function setupCleanupHandlers(claude: ChildProcess, sessionId: string | undefined, sessionPort: number, codexReasoningProxy: unknown, toolSanitizationProxy: unknown, httpsTunnel: unknown, verbose: boolean): void;
|
|
44
|
+
export declare function setupCleanupHandlers(claude: ChildProcess, sessionId: string | undefined, sessionPort: number, codexReasoningProxy: unknown, toolSanitizationProxy: unknown, httpsTunnel: unknown, verbose: boolean, keepAliveOptions?: SessionProxyKeepAliveOptions): void;
|
|
30
45
|
//# sourceMappingURL=session-bridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-bridge.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG
|
|
1
|
+
{"version":3,"file":"session-bridge.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;;;AAEH,OAAO,EAAE,YAAY,EAAgB,MAAM,eAAe,CAAC;AAG3D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgB3C,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,4BAA4B;IAC3C,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,+BAA+B,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;CAChE;AAED,MAAM,WAAW,oCAAoC;IACnD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IAC9B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,+BAA+B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;CAC/D;AAID,wBAAgB,kDAAkD,CAChE,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAOT;AAED,wBAAgB,qCAAqC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAoB9E;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAWT;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,kBAAkB,CAAC,CA2G7B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,GACf,MAAM,CAWR;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,OAAO,EAC5B,qBAAqB,EAAE,OAAO,EAC9B,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,OAAO,EAChB,gBAAgB,GAAE,4BAAiC,GAClD,IAAI,CAoFN"}
|
|
@@ -32,7 +32,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.setupCleanupHandlers = exports.registerProxySession = exports.checkOrJoinProxy = void 0;
|
|
35
|
+
exports.setupCleanupHandlers = exports.registerProxySession = exports.checkOrJoinProxy = exports.shouldKeepSessionProxiesAlive = exports.hasClaudeBackgroundWorkerUsingBaseUrl = exports.hasClaudeBackgroundWorkerUsingBaseUrlInProcessList = void 0;
|
|
36
|
+
const child_process_1 = require("child_process");
|
|
36
37
|
const ui_1 = require("../../utils/ui");
|
|
37
38
|
const binary_manager_1 = require("../binary-manager");
|
|
38
39
|
const session_tracker_1 = require("../session-tracker");
|
|
@@ -40,6 +41,46 @@ const proxy_detector_1 = require("../proxy/proxy-detector");
|
|
|
40
41
|
const startup_lock_1 = require("../services/startup-lock");
|
|
41
42
|
const platform_commands_1 = require("../../utils/platform-commands");
|
|
42
43
|
const quota_manager_1 = require("../quota/quota-manager");
|
|
44
|
+
const CLAUDE_BG_WORKER_ARGS = ['--bg-spare', '--bg-pty-host'];
|
|
45
|
+
function hasClaudeBackgroundWorkerUsingBaseUrlInProcessList(processList, baseUrl) {
|
|
46
|
+
const envNeedle = `ANTHROPIC_BASE_URL=${baseUrl}`;
|
|
47
|
+
return processList
|
|
48
|
+
.split(/\r?\n/)
|
|
49
|
+
.some((line) => line.includes(envNeedle) && CLAUDE_BG_WORKER_ARGS.some((arg) => line.includes(arg)));
|
|
50
|
+
}
|
|
51
|
+
exports.hasClaudeBackgroundWorkerUsingBaseUrlInProcessList = hasClaudeBackgroundWorkerUsingBaseUrlInProcessList;
|
|
52
|
+
function hasClaudeBackgroundWorkerUsingBaseUrl(baseUrl) {
|
|
53
|
+
if (process.platform === 'win32') {
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
for (const args of [['auxEww'], ['auxeww'], ['eww', '-axo', 'pid=,command=']]) {
|
|
57
|
+
try {
|
|
58
|
+
const processList = (0, child_process_1.execFileSync)('ps', args, {
|
|
59
|
+
encoding: 'utf8',
|
|
60
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
61
|
+
});
|
|
62
|
+
if (hasClaudeBackgroundWorkerUsingBaseUrlInProcessList(processList, baseUrl)) {
|
|
63
|
+
return true;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
exports.hasClaudeBackgroundWorkerUsingBaseUrl = hasClaudeBackgroundWorkerUsingBaseUrl;
|
|
73
|
+
function shouldKeepSessionProxiesAlive(options) {
|
|
74
|
+
if (options.code !== 0 || options.signal) {
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
const baseUrl = options.backgroundKeepAliveBaseUrl;
|
|
78
|
+
if (!baseUrl) {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
return options.hasBackgroundWorkerUsingBaseUrl(baseUrl);
|
|
82
|
+
}
|
|
83
|
+
exports.shouldKeepSessionProxiesAlive = shouldKeepSessionProxiesAlive;
|
|
43
84
|
/**
|
|
44
85
|
* Check for existing proxy and handle version mismatch, or determine if new spawn needed
|
|
45
86
|
*/
|
|
@@ -151,55 +192,63 @@ exports.registerProxySession = registerProxySession;
|
|
|
151
192
|
/**
|
|
152
193
|
* Setup cleanup handlers for session unregistration
|
|
153
194
|
*/
|
|
154
|
-
function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose) {
|
|
195
|
+
function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose, keepAliveOptions = {}) {
|
|
155
196
|
const log = (msg) => {
|
|
156
197
|
if (verbose) {
|
|
157
198
|
console.error(`[cliproxy] ${msg}`);
|
|
158
199
|
}
|
|
159
200
|
};
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
typeof codexReasoningProxy === 'object' &&
|
|
165
|
-
'stop' in codexReasoningProxy) {
|
|
166
|
-
codexReasoningProxy.stop();
|
|
167
|
-
}
|
|
168
|
-
if (toolSanitizationProxy &&
|
|
169
|
-
typeof toolSanitizationProxy === 'object' &&
|
|
170
|
-
'stop' in toolSanitizationProxy) {
|
|
171
|
-
toolSanitizationProxy.stop();
|
|
172
|
-
}
|
|
173
|
-
if (httpsTunnel && typeof httpsTunnel === 'object' && 'stop' in httpsTunnel) {
|
|
174
|
-
httpsTunnel.stop();
|
|
201
|
+
let resourcesStopped = false;
|
|
202
|
+
const stopResource = (resource) => {
|
|
203
|
+
if (resource && typeof resource === 'object' && 'stop' in resource) {
|
|
204
|
+
resource.stop();
|
|
175
205
|
}
|
|
176
|
-
|
|
206
|
+
};
|
|
207
|
+
const stopSessionResources = () => {
|
|
208
|
+
if (resourcesStopped)
|
|
209
|
+
return;
|
|
210
|
+
resourcesStopped = true;
|
|
211
|
+
(0, quota_manager_1.stopQuotaMonitor)();
|
|
212
|
+
stopResource(codexReasoningProxy);
|
|
213
|
+
stopResource(toolSanitizationProxy);
|
|
214
|
+
stopResource(httpsTunnel);
|
|
177
215
|
if (sessionId) {
|
|
178
216
|
(0, session_tracker_1.unregisterSession)(sessionId, sessionPort);
|
|
217
|
+
log(`Session ${sessionId} unregistered, proxy persists for other sessions or future use`);
|
|
179
218
|
}
|
|
219
|
+
};
|
|
220
|
+
const backgroundProbe = keepAliveOptions.hasBackgroundWorkerUsingBaseUrl ?? hasClaudeBackgroundWorkerUsingBaseUrl;
|
|
221
|
+
const startKeepAliveWatcher = (baseUrl) => {
|
|
222
|
+
const timer = setInterval(() => {
|
|
223
|
+
if (backgroundProbe(baseUrl))
|
|
224
|
+
return;
|
|
225
|
+
log('No Claude bg worker is using the session proxy; cleaning up');
|
|
226
|
+
stopSessionResources();
|
|
227
|
+
process.exit(0);
|
|
228
|
+
}, keepAliveOptions.keepAlivePollIntervalMs ?? 30000);
|
|
229
|
+
timer.unref();
|
|
230
|
+
};
|
|
231
|
+
const cleanup = () => {
|
|
232
|
+
log('Parent signal received, cleaning up');
|
|
233
|
+
stopSessionResources();
|
|
180
234
|
claude.kill('SIGTERM');
|
|
181
235
|
};
|
|
182
236
|
claude.on('exit', (code, signal) => {
|
|
183
|
-
(0, quota_manager_1.stopQuotaMonitor)();
|
|
184
237
|
log(`Claude exited: code=${code}, signal=${signal}`);
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
}
|
|
198
|
-
// Unregister this session (proxy keeps running for persistence) - only for local mode
|
|
199
|
-
if (sessionId) {
|
|
200
|
-
(0, session_tracker_1.unregisterSession)(sessionId, sessionPort);
|
|
201
|
-
log(`Session ${sessionId} unregistered, proxy persists for other sessions or future use`);
|
|
238
|
+
const backgroundKeepAliveBaseUrl = keepAliveOptions.backgroundKeepAliveBaseUrl;
|
|
239
|
+
if (shouldKeepSessionProxiesAlive({
|
|
240
|
+
code,
|
|
241
|
+
signal,
|
|
242
|
+
backgroundKeepAliveBaseUrl,
|
|
243
|
+
hasBackgroundWorkerUsingBaseUrl: backgroundProbe,
|
|
244
|
+
}) &&
|
|
245
|
+
backgroundKeepAliveBaseUrl) {
|
|
246
|
+
(0, quota_manager_1.stopQuotaMonitor)();
|
|
247
|
+
log(`Keeping session proxy alive for Claude bg worker: ${backgroundKeepAliveBaseUrl}`);
|
|
248
|
+
startKeepAliveWatcher(backgroundKeepAliveBaseUrl);
|
|
249
|
+
return;
|
|
202
250
|
}
|
|
251
|
+
stopSessionResources();
|
|
203
252
|
if (signal) {
|
|
204
253
|
process.kill(process.pid, signal);
|
|
205
254
|
}
|
|
@@ -208,25 +257,8 @@ function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProx
|
|
|
208
257
|
}
|
|
209
258
|
});
|
|
210
259
|
claude.on('error', (error) => {
|
|
211
|
-
(0, quota_manager_1.stopQuotaMonitor)();
|
|
212
260
|
console.error(require('../../utils/ui').fail(`Claude CLI error: ${error}`));
|
|
213
|
-
|
|
214
|
-
typeof codexReasoningProxy === 'object' &&
|
|
215
|
-
'stop' in codexReasoningProxy) {
|
|
216
|
-
codexReasoningProxy.stop();
|
|
217
|
-
}
|
|
218
|
-
if (toolSanitizationProxy &&
|
|
219
|
-
typeof toolSanitizationProxy === 'object' &&
|
|
220
|
-
'stop' in toolSanitizationProxy) {
|
|
221
|
-
toolSanitizationProxy.stop();
|
|
222
|
-
}
|
|
223
|
-
if (httpsTunnel && typeof httpsTunnel === 'object' && 'stop' in httpsTunnel) {
|
|
224
|
-
httpsTunnel.stop();
|
|
225
|
-
}
|
|
226
|
-
// Unregister session, proxy keeps running (local mode only)
|
|
227
|
-
if (sessionId) {
|
|
228
|
-
(0, session_tracker_1.unregisterSession)(sessionId, sessionPort);
|
|
229
|
-
}
|
|
261
|
+
stopSessionResources();
|
|
230
262
|
process.exit(1);
|
|
231
263
|
});
|
|
232
264
|
process.once('SIGTERM', cleanup);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-bridge.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"session-bridge.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-flow.d.ts","sourceRoot":"","sources":["../../../src/dispatcher/flows/settings-flow.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"settings-flow.d.ts","sourceRoot":"","sources":["../../../src/dispatcher/flows/settings-flow.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAyDH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAEpE,wBAAsB,eAAe,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8VhF"}
|
|
@@ -289,8 +289,11 @@ async function runSettingsFlow(ctx) {
|
|
|
289
289
|
// Claude subcommands reject `--settings` (it flips `agents` to list mode).
|
|
290
290
|
// Routing env vars still flow via proxyEnv. Issue #1218.
|
|
291
291
|
const isSubcommand = (0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(browserArgs);
|
|
292
|
+
const subcommandArgs = isSubcommand
|
|
293
|
+
? (0, claude_subcommand_detector_1.stripClaudeSubcommandSessionArgs)(browserArgs)
|
|
294
|
+
: browserArgs;
|
|
292
295
|
const launchArgs = isSubcommand
|
|
293
|
-
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(
|
|
296
|
+
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(subcommandArgs)
|
|
294
297
|
: [
|
|
295
298
|
'--settings',
|
|
296
299
|
launchSettings.settingsPath,
|
|
@@ -309,8 +312,9 @@ async function runSettingsFlow(ctx) {
|
|
|
309
312
|
// Skip `--settings` for Claude subcommands so the interactive agent view
|
|
310
313
|
// works; env vars from the settings file still flow via envVars. Issue #1218.
|
|
311
314
|
const isSubcommand = (0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(browserArgs);
|
|
315
|
+
const subcommandArgs = isSubcommand ? (0, claude_subcommand_detector_1.stripClaudeSubcommandSessionArgs)(browserArgs) : browserArgs;
|
|
312
316
|
const launchArgs = isSubcommand
|
|
313
|
-
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(
|
|
317
|
+
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(subcommandArgs)
|
|
314
318
|
: ['--settings', expandedSettingsPath, ...(0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(browserArgs)];
|
|
315
319
|
const traceEnv = (0, websearch_manager_1.createWebSearchTraceContext)({
|
|
316
320
|
launcher: 'ccs.settings-profile',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-flow.js","sourceRoot":"","sources":["../../../src/dispatcher/flows/settings-flow.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+DAA6D;AAC7D,4EAAiE;AACjE,iDAAiD;AACjD,qEAIuC;AACvC,qEAOuC;AACvC,+DAIoC;AACpC,iDAK6B;AAC7B,4EAAuE;AACvE,iHAGgE;AAChE,uCAAkD;AAClD,+DAAmG;AACnG,mEAGsC;AACtC,6FAA6F;AAC7F,uFAAsF;AACtF,2CAIuB;AACvB,wFAA2F;AAC3F,uCAIqB;AACrB,iFAAiF;AAG1E,KAAK,UAAU,eAAe,CAAC,GAA2B;IAC/D,MAAM,EACJ,WAAW,EACX,cAAc,EACd,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,yBAAyB,EACzB,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EAAE,uBAAuB,EAC7C,gBAAgB,EAAE,mBAAmB,EACrC,sBAAsB,EAAE,yBAAyB,EACjD,mCAAmC,EACnC,aAAa,GACd,GAAG,GAAG,CAAC;IAER,MAAM,qBAAqB,GACzB,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,8CAA6B,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACvE,MAAM,oBAAoB,GACxB,cAAc,KAAK,QAAQ;QAC3B,qBAAqB,EAAE,eAAe;QACtC,kBAAkB,EAAE,OAAO;QACzB,CAAC,CAAC,MAAM,IAAA,6CAAmC,EAAC,kBAAkB,CAAC;QAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,UAAU,CAAC;IAC3D,IAAI,oBAAoB,EAAE,OAAO,EAAE,CAAC;QAClC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,SAAI,EAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAA,6CAAyB,GAAE,CAAC;QAC5B,IAAI,iBAAiB,EAAE,CAAC;YACtB,IAAA,iCAAuB,GAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,IAAA,0CAAsB,GAAE,CAAC;IAEzB,MAAM,qBAAqB,GACzB,cAAc,KAAK,QAAQ;QACzB,CAAC,CAAC,MAAM,mCAAmC,CAAC;YACxC,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,MAAM,EAAE,cAAc;SACvB,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IACT,IAAI,qBAAqB,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACjE,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EACF,2CAA2C,WAAW,CAAC,IAAI,iBAAiB,qBAAqB,CAAC,aAAa,GAAG,CACnH,CACF,CAAC;IACJ,CAAC;IACD,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,eAAe,CAAC;IACvE,IAAA,+CAA2B,EAAC,wBAAwB,CAAC,CAAC;IACtD,IAAA,gDAA+B,EAAC,wBAAwB,CAAC,CAAC;IAC1D,IACE,iBAAiB;QACjB,wBAAwB;QACxB,CAAC,IAAA,mCAAyB,EAAC,wBAAwB,CAAC,EACpD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,2GAA2G,CAC5G,CAAC;IACJ,CAAC;IAED,MAAM,oBAAoB,GACxB,uBAAuB;QACvB,CAAC,WAAW,CAAC,YAAY;YACvB,CAAC,CAAC,IAAA,oBAAU,EAAC,WAAW,CAAC,YAAY,CAAC;YACtC,CAAC,CAAC,IAAA,gCAAe,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,mBAAmB,IAAI,IAAA,mCAAY,EAAC,oBAAoB,CAAC,CAAC;IAC3E,MAAM,cAAc,GAAG,yBAAyB,IAAI,IAAA,uDAA6B,EAAC,QAAQ,CAAC,CAAC;IAE5F,IAAI,8BAAmD,CAAC;IACxD,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAI,qBAAqB,EAAE,CAAC;YAC1B,IAAA,qEAA8B,EAAC,WAAW,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,8BAA8B,GAAG,CAC/B,wDAAa,mBAAmB,GAAC,CAClC,CAAC,gCAAgC,EAAE,CAAC;YACrC,IAAA,yDAAwB,EAAC;gBACvB,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,YAAY,EAAE,oBAAoB;gBAClC,QAAQ;gBACR,cAAc;gBACd,mBAAmB,EAAE,8BAA8B;aACpD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,IAAA,4CAAkC,EAAC;YACvD,MAAM,EAAE,cAAc;YACtB,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,sBAAsB,EAAE,cAAc,EAAE,QAAQ,IAAI,IAAI;SACzD,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EACF,aAAa,CAAC,MAAM;gBAClB,GAAG,aAAa,EAAE,WAAW,IAAI,cAAc,iCAAiC,CACnF,CACF,CAAC;YACF,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;gBAC7B,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;YAChD,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC;IAC7D,MAAM,uBAAuB,GAAG,IAAA,8CAA2B,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,uBAAuB;QAC/C,CAAC,CAAC,IAAA,6CAA0B,EAAC,cAAc,CAAC;QAC5C,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,WAAW,GAAG,iBAAiB,EAAE,GAAG,IAAI,cAAc,CAAC;IAE7D,IAAI,iBAAiB,EAAE,CAAC;QACtB,KAAK,MAAM,OAAO,IAAI,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YACjD,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,OAAO,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,IAAI,uBAAuB,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;QACnD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,UAAU,GAAG,MAAM,IAAA,kCAAc,EAAC,MAAM,EAAE,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACnF,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,UAAU,CAAC,KAAK,IAAI,2BAA2B,CAAC,CAAC,CAAC;gBACrE,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAClB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBACvC,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,2DAA2D,CAAC,CAAC,CAAC;gBACjF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,WAAW,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;QACnD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,UAAU,GAAG,MAAM,IAAA,sCAAkB,EAAC,MAAM,EAAE,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACvF,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,UAAU,CAAC,KAAK,IAAI,2BAA2B,CAAC,CAAC,CAAC;gBACrE,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAClB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBACvC,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,0DAA0D,CAAC,CAAC,CAAC;gBAChF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IAED,wFAAwF;IACxF,CAAC;QACC,MAAM,eAAe,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;QACvD,IAAI,eAAe,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,MAAM,IAAA,wCAAoB,EAAC,eAAe,CAAC,CAAC;YAC/D,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,UAAU,CAAC,KAAK,IAAI,2BAA2B,CAAC,CAAC,CAAC;gBACrE,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAClB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBACvC,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClB,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EAAC,gDAAgD,WAAW,CAAC,IAAI,WAAW,CAAC,CAClF,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IAED,qFAAqF;IACrF,MAAM,gBAAgB,GAAG,MAAM,IAAA,8DAA+B,EAAC;QAC7D,WAAW;QACX,cAAc;QACd,QAAQ;QACR,cAAc;QACd,qBAAqB;QACrB,8BAA8B;QAC9B,aAAa;QACb,mBAAmB;KACpB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,uCAAmB,GAAE,CAAC;IAE3C,yEAAyE;IACzE,MAAM,eAAe,GAAG,IAAA,yCAAkB,GAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAErE,4DAA4D;IAC5D,IAAI,eAAe,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC1F,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,eAAe,QAAQ,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,sFAAsF;IACtF,0FAA0F;IAC1F,kFAAkF;IAClF,MAAM,kBAAkB,GAAG,IAAA,gCAAe,EAAC,EAAE,GAAG,SAAS,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;IAC7E,MAAM,oBAAoB,GAAsB;QAC9C,GAAG,IAAA,yCAAwB,EAAC,kBAAkB,EAAE,WAAW,CAAC;QAC5D,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,YAAY;QACf,GAAG,gBAAgB;QACnB,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC;QAC5B,gBAAgB,EAAE,UAAU;QAC5B,iCAAiC,EAAE,GAAG;KACvC,CAAC;IAEF,yEAAyE;IACzE,MAAM,OAAO,GAAsB;QACjC,GAAG,kBAAkB;QACrB,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,YAAY;QACf,GAAG,gBAAgB;QACnB,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC;QAC5B,gBAAgB,EAAE,UAAU;KAC7B,CAAC;IAEF,yDAAyD;IACzD,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,aAAa,CAAC;QAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,iCAAiC,cAAc,GAAG,CAAC,CAAC,CAAC;YACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,sBAAsB,GAC1B,WAAW,CAAC,oBAAoB,CAAC;YACjC,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,KAAK,GAAsB;YAC/B,OAAO,EAAE,WAAW,CAAC,IAAI;YACzB,OAAO,EAAE,sBAAsB;YAC/B,MAAM,EAAE,WAAW,CAAC,sBAAsB,CAAC,IAAI,WAAW,CAAC,mBAAmB,CAAC,IAAI,EAAE;YACrF,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC;YACrC,QAAQ,EAAE,IAAA,8BAAoB,EAAC;gBAC7B,QAAQ,EAAE,WAAW,CAAC,oBAAoB,CAAC,IAAI,WAAW,CAAC,gBAAgB,CAAC;gBAC5E,OAAO,EAAE,sBAAsB;gBAC/B,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC;aACtC,CAAC;YACF,iBAAiB,EAAE,wBAAwB;YAC3C,sBAAsB,EAAE,2BAA2B;YACnD,OAAO;SACR,CAAC;QACF,MAAM,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,mBAAmB,EAAE;YAC1E,KAAK;YACL,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,UAAU,EAAE,gBAAgB,IAAI,SAAS;SAC1C,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,gBAAgB,IAAI,SAAS,EAAE,CAAC,CAAC;QACnF,OAAO;IACT,CAAC;IAED,MAAM,iBAAiB,GAAG,qBAAqB;QAC7C,CAAC,CAAC,IAAA,sDAAqC,EAAC,yBAAyB,CAAC;QAClE,CAAC,CAAC,yBAAyB,CAAC;IAC9B,MAAM,WAAW,GAAG,iBAAiB;QACnC,CAAC,CAAC,IAAA,+BAAqB,EAAC,iBAAiB,CAAC;QAC1C,CAAC,CAAC,iBAAiB,CAAC;IACtB,MAAM,mBAAmB,GAAG,IAAA,wCAAgC,EAC1D,WAAW,CAAC,IAAI,EAChB,oBAAoB,EACpB,WAAW,CACZ,CAAC;IACF,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAsB,EAAC,mBAAmB,EAAE;YACnE,QAAQ,EAAE,mBAAmB,CAAC,QAAQ;SACvC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,UAAU,CAAC,KAAK,IAAI,+CAA+C,CAAC,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EACF,4CAA4C,WAAW,CAAC,IAAI,aAAa,UAAU,CAAC,IAAI,EAAE,CAC3F,CACF,CAAC;QAEF,MAAM,QAAQ,GAAG;YACf,GAAG,OAAO;YACV,GAAG,IAAA,iCAAyB,EAC1B,mBAAmB,EACnB,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,SAAS,IAAI,EAAE,EAC1B,wBAAwB,CACzB;SACF,CAAC;QACF,OAAO,QAAQ,CAAC,iBAAiB,CAAC;QAClC,MAAM,cAAc,GAAG,IAAA,gEAAgC,EAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QAExF,2EAA2E;QAC3E,yDAAyD;QACzD,MAAM,YAAY,GAAG,IAAA,yDAA4B,EAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,YAAY;YAC7B,CAAC,CAAC,IAAA,qDAAiC,EAAC,WAAW,CAAC;YAChD,CAAC,CAAC;gBACE,YAAY;gBACZ,cAAc,CAAC,YAAY;gBAC3B,GAAG,IAAA,qDAAiC,EAAC,WAAW,CAAC;aAClD,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,+CAA2B,EAAC;YAC3C,QAAQ,EAAE,4BAA4B;YACtC,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,WAAW,CAAC,IAAI;YACzB,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,YAAY,EAAE,oBAAoB;SACnC,CAAC,CAAC;QAEH,IAAA,2BAAU,EAAC,SAAS,EAAE,UAAU,EAAE,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;QACxF,OAAO;IACT,CAAC;IAED,yEAAyE;IACzE,8EAA8E;IAC9E,MAAM,YAAY,GAAG,IAAA,yDAA4B,EAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,YAAY;QAC7B,CAAC,CAAC,IAAA,qDAAiC,EAAC,WAAW,CAAC;QAChD,CAAC,CAAC,CAAC,YAAY,EAAE,oBAAoB,EAAE,GAAG,IAAA,qDAAiC,EAAC,WAAW,CAAC,CAAC,CAAC;IAC5F,MAAM,QAAQ,GAAG,IAAA,+CAA2B,EAAC;QAC3C,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,WAAW,CAAC,IAAI;QACzB,WAAW,EAAE,WAAW,CAAC,IAAI;QAC7B,YAAY,EAAE,oBAAoB;KACnC,CAAC,CAAC;IAEH,IAAA,2BAAU,EAAC,SAAS,EAAE,UAAU,EAAE,EAAE,GAAG,oBAAoB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;AAC9E,CAAC;AA1VD,0CA0VC"}
|
|
1
|
+
{"version":3,"file":"settings-flow.js","sourceRoot":"","sources":["../../../src/dispatcher/flows/settings-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-resolver.d.ts","sourceRoot":"","sources":["../../src/dispatcher/profile-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAK9D,OAAO,EACL,qCAAqC,EAGtC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAmB,MAAM,4BAA4B,CAAC;AAGhF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAUxF,OAAO,KAAK,eAAe,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAIlE,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACzD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,sBAAsB,CAAC;IACpC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC1C,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,GAAG,SAAS,CAAC;IAC9D,sBAAsB,EAAE,UAAU,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,CAAC;IACrF,+DAA+D;IAC/D,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,6DAA6D;IAC7D,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,wBAAwB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACtD,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,qBAAqB,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAC3D,oBAAoB,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAC1D,kBAAkB,EAAE,UAAU,CAAC,OAAO,qCAAqC,CAAC,GAAG,SAAS,CAAC;IACzF,sFAAsF;IACtF,QAAQ,EAAE,YAAY,CAAC,OAAO,eAAe,CAAC,CAAC;CAChD;
|
|
1
|
+
{"version":3,"file":"profile-resolver.d.ts","sourceRoot":"","sources":["../../src/dispatcher/profile-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAK9D,OAAO,EACL,qCAAqC,EAGtC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAmB,MAAM,4BAA4B,CAAC;AAGhF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAUxF,OAAO,KAAK,eAAe,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAIlE,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACzD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,sBAAsB,CAAC;IACpC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC1C,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,GAAG,SAAS,CAAC;IAC9D,sBAAsB,EAAE,UAAU,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,CAAC;IACrF,+DAA+D;IAC/D,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,6DAA6D;IAC7D,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,wBAAwB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACtD,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,qBAAqB,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAC3D,oBAAoB,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAC1D,kBAAkB,EAAE,UAAU,CAAC,OAAO,qCAAqC,CAAC,GAAG,SAAS,CAAC;IACzF,sFAAsF;IACtF,QAAQ,EAAE,YAAY,CAAC,OAAO,eAAe,CAAC,CAAC;CAChD;AAgBD;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,wBAAwB,GAC5B,OAAO,CAAC,eAAe,CAAC,CA2Q1B"}
|
|
@@ -52,6 +52,16 @@ const droid_command_router_1 = require("../targets/droid-command-router");
|
|
|
52
52
|
const cliproxy_profile_bridge_1 = require("../api/services/cliproxy-profile-bridge");
|
|
53
53
|
const environment_builder_1 = require("./environment-builder");
|
|
54
54
|
const cli_argument_parser_1 = require("./cli-argument-parser");
|
|
55
|
+
function usesImplicitDefaultProfile(cleanArgs) {
|
|
56
|
+
return cleanArgs.length === 0 || cleanArgs[0]?.startsWith('-') === true;
|
|
57
|
+
}
|
|
58
|
+
function buildNativeCodexDefaultProfile() {
|
|
59
|
+
return {
|
|
60
|
+
type: 'default',
|
|
61
|
+
name: 'default',
|
|
62
|
+
message: 'Using native Codex auth; CCS default profile is not applied to Codex target.',
|
|
63
|
+
};
|
|
64
|
+
}
|
|
55
65
|
// ========== Profile and Target Resolver ==========
|
|
56
66
|
/**
|
|
57
67
|
* Resolve profile detection, target type, adapter, binary, and per-target arg normalization.
|
|
@@ -79,7 +89,7 @@ async function resolveProfileAndTarget(ctx) {
|
|
|
79
89
|
// Detect profile (strip --target flags before profile detection)
|
|
80
90
|
const cleanArgs = (0, target_resolver_1.stripTargetFlag)(args);
|
|
81
91
|
const { profile, remainingArgs } = (0, cli_argument_parser_1.detectProfile)(cleanArgs);
|
|
82
|
-
|
|
92
|
+
let profileInfo = detector.detectProfileType(profile);
|
|
83
93
|
let resolvedTarget;
|
|
84
94
|
try {
|
|
85
95
|
resolvedTarget = (0, target_resolver_1.resolveTargetType)(args, profileInfo.target ? { target: profileInfo.target } : undefined);
|
|
@@ -90,6 +100,9 @@ async function resolveProfileAndTarget(ctx) {
|
|
|
90
100
|
// Unreachable; needed so TS knows resolvedTarget is always assigned below
|
|
91
101
|
throw error;
|
|
92
102
|
}
|
|
103
|
+
if (resolvedTarget === 'codex' && usesImplicitDefaultProfile(cleanArgs)) {
|
|
104
|
+
profileInfo = buildNativeCodexDefaultProfile();
|
|
105
|
+
}
|
|
93
106
|
// Detect Claude CLI (needed for claude target and all CLIProxy-derived flows)
|
|
94
107
|
const claudeCliRaw = (0, claude_detector_1.detectClaudeCli)();
|
|
95
108
|
if (resolvedTarget === 'claude' && !claudeCliRaw) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-resolver.js","sourceRoot":"","sources":["../../src/dispatcher/profile-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8DAA2D;AAC3D,4DAA0D;AAC1D,yEAA8D;AAC9D,8CAA8C;AAC9C,oCAA+C;AAC/C,0DAAsD;AACtD,yEAAkE;AAClE,8CAI0B;AAC1B,wCAAgG;AAChG,gEAAgF;AAChF,gFAA6E;AAC7E,0EAAiG;AACjG,qFAAwF;AACxF,+DAA2E;AAC3E,+DAO+B;AA0C/B,oDAAoD;AAEpD;;;;;;;;;GASG;AACI,KAAK,UAAU,uBAAuB,CAC3C,GAA6B;IAE7B,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,GAAG,CAAC;IAE5C,yFAAyF;IACzF,sFAAsF;IACtF,uFAAuF;IACvF,oDAAoD;IACpD,MAAM,qBAAqB,GAAG,wDAAa,0BAA0B,GAAC,CAAC;IACvE,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,OAAO,CAAC;IAC3D,wDAAa,gCAAgC,GAAC,CAAC;IAC/C,wDAAa,0BAA0B,GAAC,CAAC;IACzC,wDAAa,yBAAyB,GAAC,CAAC;IACxC,wDAAa,wCAAwC,GAAC,CAAC;IAEvD,MAAM,QAAQ,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAE5C,iEAAiE;IACjE,MAAM,SAAS,GAAG,IAAA,iCAAe,EAAC,IAAI,CAAC,CAAC;IACxC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAA,mCAAa,EAAC,SAAS,CAAC,CAAC;IAC5D,
|
|
1
|
+
{"version":3,"file":"profile-resolver.js","sourceRoot":"","sources":["../../src/dispatcher/profile-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import type { TargetAdapter, TargetBinaryInfo, TargetCredentials, TargetType } f
|
|
|
5
5
|
export declare class CodexAdapter implements TargetAdapter {
|
|
6
6
|
readonly type: TargetType;
|
|
7
7
|
readonly displayName = "Codex CLI";
|
|
8
|
+
private ccsxpCliproxyEnvKey;
|
|
8
9
|
detectBinary(): TargetBinaryInfo | null;
|
|
9
10
|
prepareCredentials(_creds: TargetCredentials): Promise<void>;
|
|
10
11
|
buildArgs(_profile: string, userArgs: string[], options?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-adapter.d.ts","sourceRoot":"","sources":["../../src/targets/codex-adapter.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAWpD,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACX,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-adapter.d.ts","sourceRoot":"","sources":["../../src/targets/codex-adapter.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAWpD,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACX,MAAM,kBAAkB,CAAC;AAqK1B,qBAAa,YAAa,YAAW,aAAa;IAChD,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAW;IACpC,QAAQ,CAAC,WAAW,eAAe;IACnC,OAAO,CAAC,mBAAmB,CAAmC;IAE9D,YAAY,IAAI,gBAAgB,GAAG,IAAI;IAIjC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAelE,SAAS,CACP,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,iBAAiB,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;KAC/B,GACA,MAAM,EAAE;IA6DX,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,GAAG,MAAM,CAAC,UAAU;IAkB/E,IAAI,CACF,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,gBAAgB,CAAA;KAAE,GACxD,IAAI;IAgGP,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO;CAKvD"}
|