@kaitranntt/ccs 8.10.0-dev.5 → 8.10.0-dev.7
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/cursor/cursor-daemon.d.ts.map +1 -1
- package/dist/cursor/cursor-daemon.js +7 -4
- package/dist/cursor/cursor-daemon.js.map +1 -1
- package/dist/dispatcher/flows/settings-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/settings-flow.js +3 -1
- package/dist/dispatcher/flows/settings-flow.js.map +1 -1
- package/dist/utils/openai-compat-launch-settings.d.ts +11 -1
- package/dist/utils/openai-compat-launch-settings.d.ts.map +1 -1
- package/dist/utils/openai-compat-launch-settings.js +55 -5
- package/dist/utils/openai-compat-launch-settings.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-daemon.d.ts","sourceRoot":"","sources":["../../src/cursor/cursor-daemon.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;AAOH,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAKtE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAuCpF,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAO5E;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"cursor-daemon.d.ts","sourceRoot":"","sources":["../../src/cursor/cursor-daemon.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;AAOH,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAKtE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAuCpF,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAO5E;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiD1F;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,WAAW,SAAyB,GACnC,OAAO,CAAC,kBAAkB,CAAC,CAS7B;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAsKnF;AAED;;GAEG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwEhF"}
|
|
@@ -88,6 +88,9 @@ exports.buildDaemonProcessEnv = buildDaemonProcessEnv;
|
|
|
88
88
|
* Uses 127.0.0.1 instead of localhost for more reliable local connections.
|
|
89
89
|
*/
|
|
90
90
|
async function isDaemonRunning(port, daemonToken) {
|
|
91
|
+
if (!Number.isInteger(port) || port < 1 || port > 65535) {
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
91
94
|
return new Promise((resolve) => {
|
|
92
95
|
const req = http.request({
|
|
93
96
|
hostname: '127.0.0.1',
|
|
@@ -153,6 +156,10 @@ async function startDaemon(config) {
|
|
|
153
156
|
? config.daemon_token
|
|
154
157
|
: (0, crypto_1.randomBytes)(32).toString('hex');
|
|
155
158
|
const effectiveConfig = { ...config, daemon_token: daemonToken };
|
|
159
|
+
// Validate port before probing or interpolation (prevents injection and bad port RangeError)
|
|
160
|
+
if (!Number.isInteger(config.port) || config.port < 1 || config.port > 65535) {
|
|
161
|
+
return { success: false, error: `Invalid port: ${config.port}` };
|
|
162
|
+
}
|
|
156
163
|
// Check if already running
|
|
157
164
|
if (await isDaemonRunning(effectiveConfig.port, effectiveConfig.daemon_token)) {
|
|
158
165
|
logger.stage('dispatch', 'cursor.daemon.already_running', 'Cursor daemon already running', {
|
|
@@ -165,10 +172,6 @@ async function startDaemon(config) {
|
|
|
165
172
|
daemonToken: effectiveConfig.daemon_token,
|
|
166
173
|
};
|
|
167
174
|
}
|
|
168
|
-
// Validate port before interpolation (prevents injection)
|
|
169
|
-
if (!Number.isInteger(config.port) || config.port < 1 || config.port > 65535) {
|
|
170
|
-
return { success: false, error: `Invalid port: ${config.port}` };
|
|
171
|
-
}
|
|
172
175
|
const daemonEntry = await resolveDaemonEntrypoint();
|
|
173
176
|
if (!daemonEntry) {
|
|
174
177
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-daemon.js","sourceRoot":"","sources":["../../src/cursor/cursor-daemon.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cursor-daemon.js","sourceRoot":"","sources":["../../src/cursor/cursor-daemon.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;AAyDH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAEpE,wBAAsB,eAAe,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
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,CAqXhF"}
|
|
@@ -286,13 +286,15 @@ async function runSettingsFlow(ctx) {
|
|
|
286
286
|
...(0, proxy_1.buildOpenAICompatProxyEnv)(openAICompatProfile, proxyStart.port, proxyStart.authToken || '', inheritedClaudeConfigDir),
|
|
287
287
|
};
|
|
288
288
|
delete proxyEnv.ANTHROPIC_API_KEY;
|
|
289
|
-
const launchSettings = (0, openai_compat_launch_settings_1.createOpenAICompatLaunchSettings)(expandedSettingsPath, settings);
|
|
290
289
|
// Claude subcommands reject `--settings` (it flips `agents` to list mode).
|
|
291
290
|
// Routing env vars still flow via proxyEnv. Issue #1218.
|
|
292
291
|
const isSubcommand = (0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(browserArgs);
|
|
293
292
|
const subcommandArgs = isSubcommand
|
|
294
293
|
? (0, claude_subcommand_detector_1.stripClaudeSubcommandSessionArgs)(browserArgs)
|
|
295
294
|
: browserArgs;
|
|
295
|
+
const launchSettings = isSubcommand
|
|
296
|
+
? { settingsPath: expandedSettingsPath, cleanup: () => { } }
|
|
297
|
+
: (0, openai_compat_launch_settings_1.createOpenAICompatLaunchSettings)(expandedSettingsPath, settings, { durable: true });
|
|
296
298
|
const launchArgs = isSubcommand
|
|
297
299
|
? (0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(subcommandArgs, webSearchLaunch.enabled)
|
|
298
300
|
: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-flow.js","sourceRoot":"","sources":["../../../src/dispatcher/flows/settings-flow.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settings-flow.js","sourceRoot":"","sources":["../../../src/dispatcher/flows/settings-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,15 @@ export interface OpenAICompatLaunchSettings {
|
|
|
3
3
|
settingsPath: string;
|
|
4
4
|
cleanup: () => void;
|
|
5
5
|
}
|
|
6
|
-
export
|
|
6
|
+
export interface OpenAICompatLaunchSettingsOptions {
|
|
7
|
+
/**
|
|
8
|
+
* When true, snapshot the isolated settings to a durable, profile-scoped
|
|
9
|
+
* location under ~/.ccs/cache/isolated-settings/ instead of an ephemeral $TMPDIR.
|
|
10
|
+
* This ensures background fleet daemons respawning sessions can continue to read
|
|
11
|
+
* the settings file after the parent CCS launch process exits (Issue #1734).
|
|
12
|
+
* Default: false (ephemeral tempdir with automatic deletion on cleanup).
|
|
13
|
+
*/
|
|
14
|
+
durable?: boolean;
|
|
15
|
+
}
|
|
16
|
+
export declare function createOpenAICompatLaunchSettings(settingsPath: string, settings: Settings, options?: OpenAICompatLaunchSettingsOptions): OpenAICompatLaunchSettings;
|
|
7
17
|
//# sourceMappingURL=openai-compat-launch-settings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat-launch-settings.d.ts","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openai-compat-launch-settings.d.ts","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhD,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,iCAAiC;IAChD;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAQD,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,iCAAiC,GAC1C,0BAA0B,CAoF5B"}
|
|
@@ -27,6 +27,8 @@ exports.createOpenAICompatLaunchSettings = void 0;
|
|
|
27
27
|
const fs = __importStar(require("fs"));
|
|
28
28
|
const os = __importStar(require("os"));
|
|
29
29
|
const path = __importStar(require("path"));
|
|
30
|
+
const crypto_1 = require("crypto");
|
|
31
|
+
const config_manager_1 = require("./config-manager");
|
|
30
32
|
const shell_executor_1 = require("./shell-executor");
|
|
31
33
|
// SIBLING HELPER: src/cliproxy/executor/launch-settings.ts (prepareLaunchSettings)
|
|
32
34
|
// solves the same problem by OVERLAYING resolved routing values instead of
|
|
@@ -34,9 +36,7 @@ const shell_executor_1 = require("./shell-executor");
|
|
|
34
36
|
// delete a routing key (e.g. ANTHROPIC_API_KEY in settings-flow) and need it
|
|
35
37
|
// ABSENT from the launch settings. Do not unify without an explicit force-absent
|
|
36
38
|
// key list — see issue #1609.
|
|
37
|
-
function createOpenAICompatLaunchSettings(settingsPath, settings) {
|
|
38
|
-
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ccs-openai-compat-settings-'));
|
|
39
|
-
fs.chmodSync(tempDir, 0o700);
|
|
39
|
+
function createOpenAICompatLaunchSettings(settingsPath, settings, options) {
|
|
40
40
|
const launchSettings = JSON.parse(JSON.stringify(settings));
|
|
41
41
|
const sanitizedEnv = Object.fromEntries(Object.entries((0, shell_executor_1.stripAnthropicRoutingEnv)({ ...(launchSettings.env ?? {}) })).filter((entry) => typeof entry[1] === 'string'));
|
|
42
42
|
if (Object.keys(sanitizedEnv).length > 0) {
|
|
@@ -45,8 +45,53 @@ function createOpenAICompatLaunchSettings(settingsPath, settings) {
|
|
|
45
45
|
else {
|
|
46
46
|
delete launchSettings.env;
|
|
47
47
|
}
|
|
48
|
+
const contentStr = JSON.stringify(launchSettings, null, 2) + '\n';
|
|
49
|
+
if (options?.durable) {
|
|
50
|
+
// Durable mode: key one private directory per canonical settings path so each
|
|
51
|
+
// profile has exactly one snapshot, atomically replaced on content updates.
|
|
52
|
+
// Do not fall back to $TMPDIR: failure here must fail the launch early rather than
|
|
53
|
+
// causing a deferred background fleet respawn crash (Issue #1734).
|
|
54
|
+
const pathHash = (0, crypto_1.createHash)('sha256')
|
|
55
|
+
.update(path.resolve(settingsPath))
|
|
56
|
+
.digest('hex')
|
|
57
|
+
.slice(0, 16);
|
|
58
|
+
const durableDir = path.join((0, config_manager_1.getCcsDir)(), 'cache', 'isolated-settings', pathHash);
|
|
59
|
+
fs.mkdirSync(durableDir, { recursive: true, mode: 0o700 });
|
|
60
|
+
fs.chmodSync(durableDir, 0o700);
|
|
61
|
+
const launchSettingsPath = path.join(durableDir, path.basename(settingsPath));
|
|
62
|
+
const tempFile = path.join(durableDir, `.${path.basename(settingsPath)}.${(0, crypto_1.randomUUID)()}.tmp`);
|
|
63
|
+
let renamed = false;
|
|
64
|
+
try {
|
|
65
|
+
fs.writeFileSync(tempFile, contentStr, {
|
|
66
|
+
encoding: 'utf8',
|
|
67
|
+
mode: 0o600,
|
|
68
|
+
flag: 'wx',
|
|
69
|
+
});
|
|
70
|
+
fs.renameSync(tempFile, launchSettingsPath);
|
|
71
|
+
renamed = true;
|
|
72
|
+
}
|
|
73
|
+
finally {
|
|
74
|
+
if (!renamed) {
|
|
75
|
+
try {
|
|
76
|
+
fs.unlinkSync(tempFile);
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
// best-effort cleanup on failure
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
settingsPath: launchSettingsPath,
|
|
85
|
+
cleanup: () => {
|
|
86
|
+
// No-op in durable mode: snapshot persists for background fleet daemon respawns.
|
|
87
|
+
},
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
// Ephemeral mode (default / headless): create isolated tempdir in os.tmpdir() and purge on cleanup.
|
|
91
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ccs-openai-compat-settings-'));
|
|
92
|
+
fs.chmodSync(tempDir, 0o700);
|
|
48
93
|
const launchSettingsPath = path.join(tempDir, path.basename(settingsPath));
|
|
49
|
-
fs.writeFileSync(launchSettingsPath,
|
|
94
|
+
fs.writeFileSync(launchSettingsPath, contentStr, {
|
|
50
95
|
encoding: 'utf8',
|
|
51
96
|
mode: 0o600,
|
|
52
97
|
});
|
|
@@ -56,7 +101,12 @@ function createOpenAICompatLaunchSettings(settingsPath, settings) {
|
|
|
56
101
|
return;
|
|
57
102
|
}
|
|
58
103
|
cleanedUp = true;
|
|
59
|
-
|
|
104
|
+
try {
|
|
105
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
// best-effort cleanup
|
|
109
|
+
}
|
|
60
110
|
};
|
|
61
111
|
return {
|
|
62
112
|
settingsPath: launchSettingsPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat-launch-settings.js","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,uCAAyB;AACzB,2CAA6B;
|
|
1
|
+
{"version":3,"file":"openai-compat-launch-settings.js","sourceRoot":"","sources":["../../src/utils/openai-compat-launch-settings.ts"],"names":[],"mappings":"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"}
|