@kaitranntt/ccs 8.8.1-dev.10 → 8.8.1-dev.11
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/cliproxy/executor/claude-launcher.d.ts +3 -0
- package/dist/cliproxy/executor/claude-launcher.d.ts.map +1 -1
- package/dist/cliproxy/executor/claude-launcher.js +7 -3
- package/dist/cliproxy/executor/claude-launcher.js.map +1 -1
- package/dist/cliproxy/executor/env-resolver.d.ts +2 -0
- package/dist/cliproxy/executor/env-resolver.d.ts.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +1 -3
- package/dist/cliproxy/executor/env-resolver.js.map +1 -1
- package/dist/cliproxy/executor/index.d.ts.map +1 -1
- package/dist/cliproxy/executor/index.js +7 -5
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/copilot/copilot-executor.d.ts +3 -1
- package/dist/copilot/copilot-executor.d.ts.map +1 -1
- package/dist/copilot/copilot-executor.js +11 -7
- package/dist/copilot/copilot-executor.js.map +1 -1
- package/dist/cursor/cursor-profile-executor.d.ts +3 -1
- package/dist/cursor/cursor-profile-executor.d.ts.map +1 -1
- package/dist/cursor/cursor-profile-executor.js +8 -4
- package/dist/cursor/cursor-profile-executor.js.map +1 -1
- package/dist/delegation/headless-executor.d.ts.map +1 -1
- package/dist/delegation/headless-executor.js +4 -3
- package/dist/delegation/headless-executor.js.map +1 -1
- package/dist/dispatcher/flows/copilot-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/copilot-flow.js +3 -2
- package/dist/dispatcher/flows/copilot-flow.js.map +1 -1
- package/dist/dispatcher/flows/cursor-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/cursor-flow.js +3 -2
- package/dist/dispatcher/flows/cursor-flow.js.map +1 -1
- package/dist/dispatcher/flows/settings-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/settings-flow.js +12 -10
- package/dist/dispatcher/flows/settings-flow.js.map +1 -1
- package/dist/utils/websearch/claude-tool-args.d.ts +1 -1
- package/dist/utils/websearch/claude-tool-args.d.ts.map +1 -1
- package/dist/utils/websearch/claude-tool-args.js +3 -2
- package/dist/utils/websearch/claude-tool-args.js.map +1 -1
- package/dist/utils/websearch/hook-config.d.ts +2 -1
- package/dist/utils/websearch/hook-config.d.ts.map +1 -1
- package/dist/utils/websearch/hook-config.js +1 -2
- package/dist/utils/websearch/hook-config.js.map +1 -1
- package/dist/utils/websearch/hook-env.d.ts +2 -1
- package/dist/utils/websearch/hook-env.d.ts.map +1 -1
- package/dist/utils/websearch/hook-env.js +1 -2
- package/dist/utils/websearch/hook-env.js.map +1 -1
- package/dist/utils/websearch/hook-installer.d.ts +2 -1
- package/dist/utils/websearch/hook-installer.d.ts.map +1 -1
- package/dist/utils/websearch/hook-installer.js +1 -2
- package/dist/utils/websearch/hook-installer.js.map +1 -1
- package/dist/utils/websearch/index.d.ts +2 -0
- package/dist/utils/websearch/index.d.ts.map +1 -1
- package/dist/utils/websearch/index.js +3 -1
- package/dist/utils/websearch/index.js.map +1 -1
- package/dist/utils/websearch/launch-state.d.ts +9 -0
- package/dist/utils/websearch/launch-state.d.ts.map +1 -0
- package/dist/utils/websearch/launch-state.js +15 -0
- package/dist/utils/websearch/launch-state.js.map +1 -0
- package/dist/utils/websearch/mcp-installer.d.ts +6 -5
- package/dist/utils/websearch/mcp-installer.d.ts.map +1 -1
- package/dist/utils/websearch/mcp-installer.js +10 -15
- package/dist/utils/websearch/mcp-installer.js.map +1 -1
- package/dist/utils/websearch/status.d.ts +4 -3
- package/dist/utils/websearch/status.d.ts.map +1 -1
- package/dist/utils/websearch/status.js +7 -10
- package/dist/utils/websearch/status.js.map +1 -1
- package/dist/utils/websearch-manager.d.ts +2 -0
- package/dist/utils/websearch-manager.d.ts.map +1 -1
- package/dist/utils/websearch-manager.js +3 -1
- package/dist/utils/websearch-manager.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
/// <reference types="bun-types" />
|
|
10
10
|
/// <reference types="node" />
|
|
11
11
|
import { ChildProcess } from 'child_process';
|
|
12
|
+
import type { WebSearchLaunchState } from '../../utils/websearch-manager';
|
|
12
13
|
import { CLIProxyProvider, ExecutorConfig } from '../types';
|
|
13
14
|
import { CodexReasoningProxy } from '../ai-providers/codex-reasoning-proxy';
|
|
14
15
|
import { ToolSanitizationProxy } from '../proxy/tool-sanitization-proxy';
|
|
@@ -32,6 +33,8 @@ export interface ClaudeLaunchContext {
|
|
|
32
33
|
sessionId: string | undefined;
|
|
33
34
|
/** Whether image analysis MCP is ready */
|
|
34
35
|
imageAnalysisMcpReady: boolean;
|
|
36
|
+
/** WebSearch state captured when launch provisioning ran */
|
|
37
|
+
webSearchLaunch: WebSearchLaunchState;
|
|
35
38
|
/** Browser runtime environment variables (undefined if browser not active) */
|
|
36
39
|
browserRuntimeEnv: NodeJS.ProcessEnv | undefined;
|
|
37
40
|
/** Inherited Claude config dir for continuity */
|
|
@@ -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;
|
|
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;AASpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAI1E,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;AAW/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,4DAA4D;IAC5D,eAAe,EAAE,oBAAoB,CAAC;IACtC,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,CAqItF"}
|
|
@@ -50,7 +50,7 @@ const claude_subcommand_detector_1 = require("../../utils/claude-subcommand-dete
|
|
|
50
50
|
* @returns The spawned ChildProcess for the Claude CLI.
|
|
51
51
|
*/
|
|
52
52
|
async function launchClaude(context) {
|
|
53
|
-
const { claudeCli, claudeArgs, env, cfg, provider, compositeProviders, skipLocalAuth, sessionId, imageAnalysisMcpReady, browserRuntimeEnv, inheritedClaudeConfigDir, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose, } = context;
|
|
53
|
+
const { claudeCli, claudeArgs, env, cfg, provider, compositeProviders, skipLocalAuth, sessionId, imageAnalysisMcpReady, webSearchLaunch, browserRuntimeEnv, inheritedClaudeConfigDir, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose, } = context;
|
|
54
54
|
const isWindows = process.platform === 'win32';
|
|
55
55
|
const needsShell = isWindows && /\.(cmd|bat|ps1)$/i.test(claudeCli);
|
|
56
56
|
const persistedSettingsPath = cfg.customSettingsPath
|
|
@@ -81,8 +81,12 @@ async function launchClaude(context) {
|
|
|
81
81
|
? (0, browser_1.appendBrowserToolArgs)(imageAnalysisArgs)
|
|
82
82
|
: imageAnalysisArgs;
|
|
83
83
|
const launchArgs = isSubcommand
|
|
84
|
-
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(browserArgs)
|
|
85
|
-
: [
|
|
84
|
+
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(browserArgs, webSearchLaunch.enabled)
|
|
85
|
+
: [
|
|
86
|
+
'--settings',
|
|
87
|
+
settingsPath,
|
|
88
|
+
...(0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(browserArgs, webSearchLaunch.enabled),
|
|
89
|
+
];
|
|
86
90
|
// Inject web search trace context into env
|
|
87
91
|
const traceEnv = (0, websearch_manager_1.createWebSearchTraceContext)({
|
|
88
92
|
launcher: 'cliproxy.executor',
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"claude-launcher.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,8 @@ export interface ProxyChainConfig {
|
|
|
55
55
|
claudeConfigDir?: string;
|
|
56
56
|
/** Execution-aware image analysis env prepared by the caller */
|
|
57
57
|
imageAnalysisEnv?: Record<string, string>;
|
|
58
|
+
/** WebSearch hook env captured from the launch configuration snapshot. */
|
|
59
|
+
webSearchEnv?: Record<string, string>;
|
|
58
60
|
/** Optional browser runtime env for Claude browser MCP reuse. */
|
|
59
61
|
browserRuntimeEnv?: Record<string, string>;
|
|
60
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-resolver.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAUH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"env-resolver.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,6 @@ exports.applyFallback = exports.logEnvironment = exports.buildClaudeEnvironment
|
|
|
37
37
|
const fs = __importStar(require("fs"));
|
|
38
38
|
const config_generator_1 = require("../config/config-generator");
|
|
39
39
|
const extended_context_config_1 = require("../config/extended-context-config");
|
|
40
|
-
const websearch_manager_1 = require("../../utils/websearch-manager");
|
|
41
40
|
const get_image_analysis_hook_env_1 = require("../../utils/hooks/get-image-analysis-hook-env");
|
|
42
41
|
const image_analysis_runtime_status_1 = require("../../utils/hooks/image-analysis-runtime-status");
|
|
43
42
|
const image_analyzer_profile_hook_injector_1 = require("../../utils/hooks/image-analyzer-profile-hook-injector");
|
|
@@ -152,7 +151,7 @@ exports.resolveCliproxyImageAnalysisEnv = resolveCliproxyImageAnalysisEnv;
|
|
|
152
151
|
* Handles proxy chain ordering and integration with hooks
|
|
153
152
|
*/
|
|
154
153
|
function buildClaudeEnvironment(config) {
|
|
155
|
-
const { provider, useRemoteProxy, remoteConfig, httpsTunnel, tunnelPort, localPort, customSettingsPath, thinkingOverride, extendedContextOverride, codexReasoningPort, toolSanitizationPort, isComposite, compositeTiers, compositeDefaultTier, claudeConfigDir, imageAnalysisEnv: resolvedImageAnalysisEnv, browserRuntimeEnv, } = config;
|
|
154
|
+
const { provider, useRemoteProxy, remoteConfig, httpsTunnel, tunnelPort, localPort, customSettingsPath, thinkingOverride, extendedContextOverride, codexReasoningPort, toolSanitizationPort, isComposite, compositeTiers, compositeDefaultTier, claudeConfigDir, imageAnalysisEnv: resolvedImageAnalysisEnv, webSearchEnv = {}, browserRuntimeEnv, } = config;
|
|
156
155
|
// Build base env vars - check remote mode first
|
|
157
156
|
let envVars;
|
|
158
157
|
if (useRemoteProxy && remoteConfig) {
|
|
@@ -256,7 +255,6 @@ function buildClaudeEnvironment(config) {
|
|
|
256
255
|
ANTHROPIC_BASE_URL: finalBaseUrl,
|
|
257
256
|
};
|
|
258
257
|
// Add hook environment variables
|
|
259
|
-
const webSearchEnv = (0, websearch_manager_1.getWebSearchHookEnv)();
|
|
260
258
|
const imageAnalysisEnv = resolvedImageAnalysisEnv ?? (0, get_image_analysis_hook_env_1.getImageAnalysisHookEnv)(provider);
|
|
261
259
|
// Merge all environment variables (filter undefined values)
|
|
262
260
|
const baseEnv = (0, shell_executor_1.stripBrowserEnv)(Object.fromEntries(Object.entries(process.env).filter(([, v]) => v !== undefined)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,iEAKoC;AACpC,+EAA+E;AAG/E
|
|
1
|
+
{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAeH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAkB5D,OAAO,EACL,mCAAmC,IAAI,oCAAoC,EAE5E,MAAM,sBAAsB,CAAC;AA+C9B;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAeH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAkB5D,OAAO,EACL,mCAAmC,IAAI,oCAAoC,EAE5E,MAAM,sBAAsB,CAAC;AA+C9B;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,CAqef;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIzE,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnG,OAAO,EAAE,mCAAmC,IAAI,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAEnH,eAAO,MAAM,aAAa;;CAEzB,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
|
|
@@ -200,10 +200,9 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
200
200
|
}
|
|
201
201
|
await (0, auth_coordinator_1.handleImport)(authCtx);
|
|
202
202
|
// Setup first-class CCS WebSearch runtime for non-strict user launches.
|
|
203
|
-
const
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
}
|
|
203
|
+
const webSearchLaunch = (0, websearch_manager_2.resolveWebSearchLaunchState)();
|
|
204
|
+
(0, websearch_manager_1.ensureWebSearchMcpForLaunch)(webSearchLaunch.config);
|
|
205
|
+
(0, websearch_manager_1.displayWebSearchStatus)(webSearchLaunch.config);
|
|
207
206
|
// 3. Ensure OAuth completed (if provider requires it)
|
|
208
207
|
const remoteAuthToken = proxyConfig.authToken?.trim();
|
|
209
208
|
const skipLocalAuth = (0, auth_coordinator_1.resolveSkipLocalAuth)(remoteAuthToken, useRemoteProxy);
|
|
@@ -366,6 +365,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
366
365
|
compositeDefaultTier: cfg.compositeDefaultTier,
|
|
367
366
|
claudeConfigDir: inheritedClaudeConfigDir,
|
|
368
367
|
imageAnalysisEnv,
|
|
368
|
+
webSearchEnv: webSearchLaunch.hookEnv,
|
|
369
369
|
});
|
|
370
370
|
// 9b. Build env-dependent proxy chain (tool-sanitization + codex-reasoning)
|
|
371
371
|
({ toolSanitizationProxy, toolSanitizationPort, codexReasoningProxy, codexReasoningPort } =
|
|
@@ -408,6 +408,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
408
408
|
compositeDefaultTier: cfg.compositeDefaultTier,
|
|
409
409
|
claudeConfigDir: inheritedClaudeConfigDir,
|
|
410
410
|
imageAnalysisEnv,
|
|
411
|
+
webSearchEnv: webSearchLaunch.hookEnv,
|
|
411
412
|
browserRuntimeEnv,
|
|
412
413
|
});
|
|
413
414
|
if (cfg.isComposite && cfg.compositeTiers && cfg.compositeDefaultTier) {
|
|
@@ -419,7 +420,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
419
420
|
const defaultTierProvider = cfg.compositeTiers[cfg.compositeDefaultTier]?.provider ?? provider;
|
|
420
421
|
log(`Composite self-check: mode=${mode}, baseUrl=${env.ANTHROPIC_BASE_URL || 'unset'}, defaultTier=${cfg.compositeDefaultTier}, defaultProvider=${defaultTierProvider}`);
|
|
421
422
|
}
|
|
422
|
-
const webSearchEnv =
|
|
423
|
+
const webSearchEnv = webSearchLaunch.hookEnv;
|
|
423
424
|
if (process.env.CCS_DEBUG) {
|
|
424
425
|
logger.info('browser-env-keys', 'CCS_BROWSER_* keys in environment', {
|
|
425
426
|
keys: Object.keys(env)
|
|
@@ -449,6 +450,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
449
450
|
skipLocalAuth,
|
|
450
451
|
sessionId,
|
|
451
452
|
imageAnalysisMcpReady,
|
|
453
|
+
webSearchLaunch,
|
|
452
454
|
browserRuntimeEnv,
|
|
453
455
|
inheritedClaudeConfigDir,
|
|
454
456
|
codexReasoningProxy,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { CopilotConfig } from '../config/unified-config-types';
|
|
|
8
8
|
import { ensureCliproxyService } from '../cliproxy';
|
|
9
9
|
import { getEffectiveApiKey } from '../cliproxy/auth/auth-token-manager';
|
|
10
10
|
import { CopilotStatus } from './types';
|
|
11
|
+
import type { WebSearchLaunchState } from '../utils/websearch-manager';
|
|
11
12
|
import { getImageAnalysisHookEnv, resolveImageAnalysisRuntimeStatus } from '../utils/hooks';
|
|
12
13
|
interface CopilotImageAnalysisDeps {
|
|
13
14
|
ensureCliproxyService: typeof ensureCliproxyService;
|
|
@@ -23,6 +24,7 @@ interface CopilotImageAnalysisResolution {
|
|
|
23
24
|
* Get full copilot status (auth + daemon).
|
|
24
25
|
*/
|
|
25
26
|
export declare function getCopilotStatus(config: CopilotConfig): Promise<CopilotStatus>;
|
|
27
|
+
export declare function buildCopilotClaudeLaunchArgs(claudeArgs: string[], imageAnalysisMcpReady: boolean, webSearchEnabled: boolean): string[];
|
|
26
28
|
/**
|
|
27
29
|
* Generate environment variables for Claude Code to use copilot-api.
|
|
28
30
|
* Uses model mapping for opus/sonnet/haiku tiers if configured.
|
|
@@ -36,6 +38,6 @@ export declare function resolveCopilotImageAnalysisEnv(verbose?: boolean, deps?:
|
|
|
36
38
|
* @param claudeArgs Arguments to pass to Claude CLI
|
|
37
39
|
* @returns Exit code
|
|
38
40
|
*/
|
|
39
|
-
export declare function executeCopilotProfile(config: CopilotConfig, claudeArgs: string[], claudeConfigDir?: string, claudeCliPath?: string): Promise<number>;
|
|
41
|
+
export declare function executeCopilotProfile(config: CopilotConfig, claudeArgs: string[], claudeConfigDir?: string, claudeCliPath?: string, webSearchLaunch?: WebSearchLaunchState): Promise<number>;
|
|
40
42
|
export {};
|
|
41
43
|
//# sourceMappingURL=copilot-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-executor.d.ts","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAMzE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot-executor.d.ts","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAMzE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAOxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAMvE,OAAO,EAEL,uBAAuB,EAEvB,iCAAiC,EAClC,MAAM,gBAAgB,CAAC;AAOxB,UAAU,wBAAwB;IAChC,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IACpD,uBAAuB,EAAE,OAAO,uBAAuB,CAAC;IACxD,iCAAiC,EAAE,OAAO,iCAAiC,CAAC;IAC5E,qBAAqB,EAAE,OAAO,kBAAkB,CAAC;CAClD;AAED,UAAU,8BAA8B;IACtC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAcpF;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,EAAE,EACpB,qBAAqB,EAAE,OAAO,EAC9B,gBAAgB,EAAE,OAAO,GACxB,MAAM,EAAE,CAKV;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,aAAa,EACrB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwBxB;AAED,wBAAsB,8BAA8B,CAClD,OAAO,UAAQ,EACf,IAAI,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAC3C,OAAO,CAAC,8BAA8B,CAAC,CAiEzC;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,MAAM,EAAE,EACpB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,MAAiB,EAChC,eAAe,CAAC,EAAE,oBAAoB,GACrC,OAAO,CAAC,MAAM,CAAC,CA0KjB"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* Uses local installation from ~/.ccs/copilot/ (managed by copilot-package-manager).
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.executeCopilotProfile = exports.resolveCopilotImageAnalysisEnv = exports.generateCopilotEnv = exports.getCopilotStatus = void 0;
|
|
9
|
+
exports.executeCopilotProfile = exports.resolveCopilotImageAnalysisEnv = exports.generateCopilotEnv = exports.buildCopilotClaudeLaunchArgs = exports.getCopilotStatus = void 0;
|
|
10
10
|
const child_process_1 = require("child_process");
|
|
11
11
|
const cliproxy_1 = require("../cliproxy");
|
|
12
12
|
const auth_token_manager_1 = require("../cliproxy/auth/auth-token-manager");
|
|
@@ -41,6 +41,13 @@ async function getCopilotStatus(config) {
|
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
exports.getCopilotStatus = getCopilotStatus;
|
|
44
|
+
function buildCopilotClaudeLaunchArgs(claudeArgs, imageAnalysisMcpReady, webSearchEnabled) {
|
|
45
|
+
const imageAnalysisArgs = imageAnalysisMcpReady
|
|
46
|
+
? (0, image_analysis_1.appendThirdPartyImageAnalysisToolArgs)(claudeArgs)
|
|
47
|
+
: claudeArgs;
|
|
48
|
+
return (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(imageAnalysisArgs, webSearchEnabled);
|
|
49
|
+
}
|
|
50
|
+
exports.buildCopilotClaudeLaunchArgs = buildCopilotClaudeLaunchArgs;
|
|
44
51
|
/**
|
|
45
52
|
* Generate environment variables for Claude Code to use copilot-api.
|
|
46
53
|
* Uses model mapping for opus/sonnet/haiku tiers if configured.
|
|
@@ -135,7 +142,7 @@ exports.resolveCopilotImageAnalysisEnv = resolveCopilotImageAnalysisEnv;
|
|
|
135
142
|
* @param claudeArgs Arguments to pass to Claude CLI
|
|
136
143
|
* @returns Exit code
|
|
137
144
|
*/
|
|
138
|
-
async function executeCopilotProfile(config, claudeArgs, claudeConfigDir, claudeCliPath = 'claude') {
|
|
145
|
+
async function executeCopilotProfile(config, claudeArgs, claudeConfigDir, claudeCliPath = 'claude', webSearchLaunch) {
|
|
139
146
|
const { config: normalizedConfig, warnings } = (0, copilot_model_normalizer_1.normalizeCopilotConfigWithWarnings)(config);
|
|
140
147
|
logger.stage('intake', 'copilot.execute.start', 'Starting Copilot profile execution', {
|
|
141
148
|
provider: 'copilot',
|
|
@@ -215,7 +222,7 @@ async function executeCopilotProfile(config, claudeArgs, claudeConfigDir, claude
|
|
|
215
222
|
(0, websearch_manager_1.syncWebSearchMcpToConfigDir)(claudeConfigDir);
|
|
216
223
|
(0, image_analysis_1.syncImageAnalysisMcpToConfigDir)(claudeConfigDir);
|
|
217
224
|
// Merge with current environment (global env first, copilot overrides, then hook env vars)
|
|
218
|
-
const webSearchEnv =
|
|
225
|
+
const webSearchEnv = webSearchLaunch?.hookEnv ?? {};
|
|
219
226
|
const imageAnalysisResolution = await resolveCopilotImageAnalysisEnv();
|
|
220
227
|
const imageAnalysisProvisioningFailed = !imageAnalysisMcpReady && imageAnalysisResolution.env.CCS_IMAGE_ANALYSIS_ENABLED === '1';
|
|
221
228
|
const imageAnalysisWarning = imageAnalysisProvisioningFailed
|
|
@@ -241,10 +248,7 @@ async function executeCopilotProfile(config, claudeArgs, claudeConfigDir, claude
|
|
|
241
248
|
// Spawn Claude CLI
|
|
242
249
|
const spawnStartedAt = Date.now();
|
|
243
250
|
return new Promise((resolve) => {
|
|
244
|
-
const
|
|
245
|
-
? (0, image_analysis_1.appendThirdPartyImageAnalysisToolArgs)(claudeArgs)
|
|
246
|
-
: claudeArgs;
|
|
247
|
-
const launchArgs = (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(imageAnalysisArgs);
|
|
251
|
+
const launchArgs = buildCopilotClaudeLaunchArgs(claudeArgs, imageAnalysisMcpReady, webSearchLaunch?.enabled ?? true);
|
|
248
252
|
const traceEnv = (0, websearch_manager_1.createWebSearchTraceContext)({
|
|
249
253
|
launcher: 'copilot.executor',
|
|
250
254
|
args: launchArgs,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-executor.js","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iDAAsC;AAGtC,0CAAoD;AACpD,4EAAyE;AACzE,kEAAuE;AACvE,iDAAwE;AACxE,qDAAgE;AAChE,uEAA6D;AAC7D,yEAAgF;AAEhF,oCAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"copilot-executor.js","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { CursorConfig } from '../config/unified-config-types';
|
|
2
2
|
import { ensureCliproxyService } from '../cliproxy';
|
|
3
3
|
import { resolveLifecyclePort } from '../cliproxy/config/port-manager';
|
|
4
|
+
import type { WebSearchLaunchState } from '../utils/websearch-manager';
|
|
4
5
|
import { getImageAnalysisHookEnv, resolveImageAnalysisRuntimeStatus } from '../utils/hooks';
|
|
5
6
|
interface CursorImageAnalysisResolution {
|
|
6
7
|
env: Record<string, string>;
|
|
@@ -14,6 +15,7 @@ interface CursorImageAnalysisDeps {
|
|
|
14
15
|
}
|
|
15
16
|
export declare function generateCursorEnv(config: CursorConfig, daemonToken: string, claudeConfigDir?: string): Record<string, string>;
|
|
16
17
|
export declare function resolveCursorImageAnalysisEnv(verbose?: boolean, deps?: CursorImageAnalysisDeps): Promise<CursorImageAnalysisResolution>;
|
|
17
|
-
export declare function
|
|
18
|
+
export declare function buildCursorClaudeLaunchArgs(claudeArgs: string[], webSearchEnabled: boolean): string[];
|
|
19
|
+
export declare function executeCursorProfile(config: CursorConfig, claudeArgs: string[], claudeConfigDir?: string, claudeCliPath?: string, webSearchLaunch?: WebSearchLaunchState): Promise<number>;
|
|
18
20
|
export {};
|
|
19
21
|
//# sourceMappingURL=cursor-profile-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-profile-executor.d.ts","sourceRoot":"","sources":["../../src/cursor/cursor-profile-executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"cursor-profile-executor.d.ts","sourceRoot":"","sources":["../../src/cursor/cursor-profile-executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAOvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AAO5F,UAAU,6BAA6B;IACrC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,UAAU,uBAAuB;IAC/B,uBAAuB,CAAC,EAAE,OAAO,uBAAuB,CAAC;IACzD,iCAAiC,CAAC,EAAE,OAAO,iCAAiC,CAAC;IAC7E,qBAAqB,CAAC,EAAE,OAAO,qBAAqB,CAAC;IACrD,oBAAoB,CAAC,EAAE,OAAO,oBAAoB,CAAC;CACpD;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBxB;AAED,wBAAsB,6BAA6B,CACjD,OAAO,UAAQ,EACf,IAAI,GAAE,uBAA4B,GACjC,OAAO,CAAC,6BAA6B,CAAC,CA+CxC;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAAE,EACpB,gBAAgB,EAAE,OAAO,GACxB,MAAM,EAAE,CAEV;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,EAAE,EACpB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,SAAW,EACxB,eAAe,CAAC,EAAE,oBAAoB,GACrC,OAAO,CAAC,MAAM,CAAC,CAiGjB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.executeCursorProfile = exports.resolveCursorImageAnalysisEnv = exports.generateCursorEnv = void 0;
|
|
3
|
+
exports.executeCursorProfile = exports.buildCursorClaudeLaunchArgs = exports.resolveCursorImageAnalysisEnv = exports.generateCursorEnv = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const cliproxy_1 = require("../cliproxy");
|
|
6
6
|
const logging_1 = require("../services/logging");
|
|
@@ -74,7 +74,11 @@ async function resolveCursorImageAnalysisEnv(verbose = false, deps = {}) {
|
|
|
74
74
|
return { env, warning: null };
|
|
75
75
|
}
|
|
76
76
|
exports.resolveCursorImageAnalysisEnv = resolveCursorImageAnalysisEnv;
|
|
77
|
-
|
|
77
|
+
function buildCursorClaudeLaunchArgs(claudeArgs, webSearchEnabled) {
|
|
78
|
+
return (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(claudeArgs, webSearchEnabled);
|
|
79
|
+
}
|
|
80
|
+
exports.buildCursorClaudeLaunchArgs = buildCursorClaudeLaunchArgs;
|
|
81
|
+
async function executeCursorProfile(config, claudeArgs, claudeConfigDir, claudeCliPath = 'claude', webSearchLaunch) {
|
|
78
82
|
if (!config.enabled) {
|
|
79
83
|
process.stderr.write((0, ui_1.fail)('Cursor integration is not enabled.') + '\n');
|
|
80
84
|
process.stderr.write('\n');
|
|
@@ -123,7 +127,7 @@ async function executeCursorProfile(config, claudeArgs, claudeConfigDir, claudeC
|
|
|
123
127
|
const cursorEnv = generateCursorEnv(config, daemonToken, claudeConfigDir);
|
|
124
128
|
const globalEnvConfig = (0, config_loader_facade_1.getGlobalEnvConfig)();
|
|
125
129
|
const globalEnv = globalEnvConfig.enabled ? globalEnvConfig.env : {};
|
|
126
|
-
const webSearchEnv =
|
|
130
|
+
const webSearchEnv = webSearchLaunch?.hookEnv ?? {};
|
|
127
131
|
const { env: imageAnalysisEnv, warning: imageAnalysisWarning } = await resolveCursorImageAnalysisEnv();
|
|
128
132
|
const env = (0, shell_executor_1.stripClaudeCodeEnv)({
|
|
129
133
|
...process.env,
|
|
@@ -140,7 +144,7 @@ async function executeCursorProfile(config, claudeArgs, claudeConfigDir, claudeC
|
|
|
140
144
|
console.log('');
|
|
141
145
|
(0, websearch_manager_1.syncWebSearchMcpToConfigDir)(claudeConfigDir);
|
|
142
146
|
return new Promise((resolve) => {
|
|
143
|
-
const launchArgs = (
|
|
147
|
+
const launchArgs = buildCursorClaudeLaunchArgs(claudeArgs, webSearchLaunch?.enabled ?? true);
|
|
144
148
|
const traceEnv = (0, websearch_manager_1.createWebSearchTraceContext)({
|
|
145
149
|
launcher: 'cursor.executor',
|
|
146
150
|
args: launchArgs,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-profile-executor.js","sourceRoot":"","sources":["../../src/cursor/cursor-profile-executor.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AAItC,0CAAoD;AACpD,iDAA0D;AAC1D,kEAAuE;AACvE,oCAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"cursor-profile-executor.js","sourceRoot":"","sources":["../../src/cursor/cursor-profile-executor.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AAItC,0CAAoD;AACpD,iDAA0D;AAC1D,kEAAuE;AACvE,oCAA6C;AAC7C,kEAIoC;AAEpC,0CAA4F;AAC5F,4DAA6D;AAC7D,+CAAgD;AAChD,mDAA+D;AAC/D,6DAA4D;AAC5D,yEAAoE;AAcpE,SAAgB,iBAAiB,CAC/B,MAAoB,EACpB,WAAmB,EACnB,eAAwB;IAExB,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,KAAK,CAAC;IACpD,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,KAAK,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC;IAEtD,OAAO;QACL,kBAAkB,EAAE,oBAAoB,MAAM,CAAC,IAAI,EAAE;QACrD,oBAAoB,EAAE,WAAW;QACjC,eAAe,EAAE,MAAM,CAAC,KAAK;QAC7B,4BAA4B,EAAE,SAAS;QACvC,8BAA8B,EAAE,WAAW;QAC3C,0BAA0B,EAAE,UAAU;QACtC,6BAA6B,EAAE,UAAU;QACzC,iCAAiC,EAAE,GAAG;QACtC,wCAAwC,EAAE,GAAG;QAC7C,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC;AArBD,8CAqBC;AAEM,KAAK,UAAU,6BAA6B,CACjD,OAAO,GAAG,KAAK,EACf,OAAgC,EAAE;IAElC,MAAM,yBAAyB,GAAG,IAAI,CAAC,uBAAuB,IAAI,+BAAuB,CAAC;IAC1F,MAAM,mCAAmC,GACvC,IAAI,CAAC,iCAAiC,IAAI,yCAAiC,CAAC;IAC9E,MAAM,uBAAuB,GAAG,IAAI,CAAC,qBAAqB,IAAI,gCAAqB,CAAC;IACpF,MAAM,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,IAAI,mCAAoB,CAAC;IAEjF,MAAM,GAAG,GAAG,yBAAyB,CAAC;QACpC,WAAW,EAAE,QAAQ;QACrB,WAAW,EAAE,QAAQ;KACtB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC7C,IAAI,GAAG,CAAC,yBAAyB,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxD,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,mCAAmC,CAAC;QACvD,WAAW,EAAE,QAAQ;QACrB,WAAW,EAAE,QAAQ;KACtB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,oBAAoB,KAAK,aAAa,EAAE,CAAC;QAClD,OAAO;YACL,GAAG,EAAE;gBACH,GAAG,GAAG;gBACN,oBAAoB,EAAE,EAAE;gBACxB,uBAAuB,EAAE,GAAG;aAC7B;YACD,OAAO,EAAE,GAAG,MAAM,CAAC,sBAAsB,IAAI,sBAAsB,QAAQ,kBAAkB,qCAAqC;SACnI,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACxC,MAAM,mBAAmB,GAAG,MAAM,uBAAuB,CAAC,sBAAsB,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7F,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;YACjC,OAAO;gBACL,GAAG,EAAE;oBACH,GAAG,GAAG;oBACN,oBAAoB,EAAE,EAAE;oBACxB,uBAAuB,EAAE,GAAG;iBAC7B;gBACD,OAAO,EAAE,sBAAsB,QAAQ,4GAA4G;aACpJ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;AAlDD,sEAkDC;AAED,SAAgB,2BAA2B,CACzC,UAAoB,EACpB,gBAAyB;IAEzB,OAAO,IAAA,qDAAiC,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;AACzE,CAAC;AALD,kEAKC;AAEM,KAAK,UAAU,oBAAoB,CACxC,MAAoB,EACpB,UAAoB,EACpB,eAAwB,EACxB,aAAa,GAAG,QAAQ,EACxB,eAAsC;IAEtC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,oCAAoC,CAAC,GAAG,IAAI,CAAC,CAAC;QACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACpE,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,6BAAe,GAAE,CAAC;IACrC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,+BAA+B,CAAC,GAAG,IAAI,CAAC,CAAC;QACnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACrE,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,kCAAkC,CAAC,GAAG,IAAI,CAAC,CAAC;QACtE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACpE,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,yCAAoB,GAAE,CAAC;IAE3C,IAAI,aAAa,GAAG,MAAM,IAAA,+BAAe,EAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACpE,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,2BAA2B,CAAC,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAW,EAAC;gBAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,YAAY,EAAE,WAAW;aAC1B,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,kCAAkC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;gBACpF,OAAO,CAAC,CAAC;YACX,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAA,OAAE,EAAC,0BAA0B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACzD,aAAa,GAAG,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,+BAA+B,CAAC,GAAG,IAAI,CAAC,CAAC;YACnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACpD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC7E,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IAC1E,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;IACrE,MAAM,YAAY,GAAG,eAAe,EAAE,OAAO,IAAI,EAAE,CAAC;IACpD,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAC5D,MAAM,6BAA6B,EAAE,CAAC;IACxC,MAAM,GAAG,GAAG,IAAA,mCAAkB,EAAC;QAC7B,GAAG,OAAO,CAAC,GAAG;QACd,GAAG,SAAS;QACZ,GAAG,SAAS;QACZ,GAAG,YAAY;QACf,GAAG,gBAAgB;QACnB,gBAAgB,EAAE,QAAQ;KAC3B,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,8BAA8B,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACjE,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,oBAAoB,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,IAAA,+CAA2B,EAAC,eAAe,CAAC,CAAC;IAE7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,UAAU,GAAG,2BAA2B,CAAC,UAAU,EAAE,eAAe,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC;QAC7F,MAAM,QAAQ,GAAG,IAAA,+CAA2B,EAAC;YAC3C,QAAQ,EAAE,iBAAiB;YAC3B,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE,QAAQ;YACrB,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAA,qBAAK,EAAC,aAAa,EAAE,UAAU,EAAE;YAC5C,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAA,6BAAmB,GAAE,EAAE;YACtD,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;SACpC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,2BAA2B,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAC5E,OAAO,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAvGD,oDAuGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless-executor.d.ts","sourceRoot":"","sources":["../../src/delegation/headless-executor.ts"],"names":[],"mappings":";AAEA;;;GAGG;AAUH,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,eAAe,EAAsB,MAAM,kBAAkB,CAAC;AAiDnG,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIzF,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,qBAAqB,EAAE,MAAM,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;WACU,OAAO,CAClB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"headless-executor.d.ts","sourceRoot":"","sources":["../../src/delegation/headless-executor.ts"],"names":[],"mappings":";AAEA;;;GAGG;AAUH,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,eAAe,EAAsB,MAAM,kBAAkB,CAAC;AAiDnG,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIzF,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,qBAAqB,EAAE,MAAM,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;WACU,OAAO,CAClB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAmU3B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IA0P/B,+BAA+B;IAC/B,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAOtC,mCAAmC;IACnC,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAU/B,+BAA+B;WAClB,gBAAgB,CAC3B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAyB3B,sCAAsC;IACtC,OAAO,CAAC,MAAM,CAAC,MAAM;IAIrB,2DAA2D;IAC3D,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAuBnC,oCAAoC;WACvB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAQ5D"}
|
|
@@ -111,7 +111,8 @@ class HeadlessExecutor {
|
|
|
111
111
|
if (continuityInheritance.sourceAccount && process.env.CCS_DEBUG) {
|
|
112
112
|
process.stderr.write(String((0, ui_1.info)(`Continuity inheritance active: profile "${profile}" -> account "${continuityInheritance.sourceAccount}"`)) + '\n');
|
|
113
113
|
}
|
|
114
|
-
(0, websearch_manager_1.
|
|
114
|
+
const webSearchLaunch = (0, websearch_manager_1.resolveWebSearchLaunchState)();
|
|
115
|
+
(0, websearch_manager_1.ensureWebSearchMcpForLaunch)(webSearchLaunch.config);
|
|
115
116
|
const imageAnalysisMcpReady = (0, image_analysis_1.ensureImageAnalysisMcpOrThrow)();
|
|
116
117
|
(0, websearch_manager_1.syncWebSearchMcpToConfigDir)(inheritedClaudeConfigDir);
|
|
117
118
|
(0, image_analysis_1.syncImageAnalysisMcpToConfigDir)(inheritedClaudeConfigDir);
|
|
@@ -188,6 +189,7 @@ class HeadlessExecutor {
|
|
|
188
189
|
}
|
|
189
190
|
let runtimeEnvVars = {
|
|
190
191
|
...(0, shell_executor_1.stripAnthropicRoutingEnv)({ ...globalEnv, ...settingsEnv }, settingsEnv),
|
|
192
|
+
...webSearchLaunch.hookEnv,
|
|
191
193
|
...(inheritedClaudeConfigDir ? { CLAUDE_CONFIG_DIR: inheritedClaudeConfigDir } : {}),
|
|
192
194
|
CCS_PROFILE_TYPE: 'settings',
|
|
193
195
|
CCS_STRIP_INHERITED_ANTHROPIC_ENV: '1',
|
|
@@ -292,7 +294,7 @@ class HeadlessExecutor {
|
|
|
292
294
|
const imageAnalysisArgs = imageAnalysisMcpReady
|
|
293
295
|
? (0, image_analysis_1.appendThirdPartyImageAnalysisToolArgs)(args)
|
|
294
296
|
: args;
|
|
295
|
-
const launchArgs = (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(imageAnalysisArgs);
|
|
297
|
+
const launchArgs = (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(imageAnalysisArgs, webSearchLaunch.enabled);
|
|
296
298
|
const traceEnv = (0, websearch_manager_1.createWebSearchTraceContext)({
|
|
297
299
|
launcher: 'delegation.headless-executor',
|
|
298
300
|
args: launchArgs,
|
|
@@ -340,7 +342,6 @@ class HeadlessExecutor {
|
|
|
340
342
|
const cleanEnv = (0, shell_executor_1.stripClaudeCodeEnv)({
|
|
341
343
|
...(0, shell_executor_1.stripAnthropicRoutingEnv)(process.env),
|
|
342
344
|
...(0, shell_executor_1.getClaudeLaunchEnvOverrides)(),
|
|
343
|
-
...(0, websearch_manager_1.getWebSearchHookEnv)(),
|
|
344
345
|
...runtimeEnvVars,
|
|
345
346
|
...imageAnalysisEnv,
|
|
346
347
|
...traceEnv,
|