@kaitranntt/ccs 8.1.3 → 8.1.4-dev.2

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.
Files changed (162) hide show
  1. package/dist/channels/official-channels-runtime.js +1 -1
  2. package/dist/channels/official-channels-runtime.js.map +1 -1
  3. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
  4. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +88 -11
  5. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js.map +1 -1
  6. package/dist/cliproxy/auth/auth-types.d.ts +2 -0
  7. package/dist/cliproxy/auth/auth-types.d.ts.map +1 -1
  8. package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
  9. package/dist/cliproxy/auth/oauth-handler.js +12 -6
  10. package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
  11. package/dist/cliproxy/auth/oauth-trace/redactor.d.ts.map +1 -1
  12. package/dist/cliproxy/auth/oauth-trace/redactor.js +1 -0
  13. package/dist/cliproxy/auth/oauth-trace/redactor.js.map +1 -1
  14. package/dist/cliproxy/binary/version-checker.d.ts +4 -2
  15. package/dist/cliproxy/binary/version-checker.d.ts.map +1 -1
  16. package/dist/cliproxy/binary/version-checker.js +30 -20
  17. package/dist/cliproxy/binary/version-checker.js.map +1 -1
  18. package/dist/cliproxy/proxy/proxy-config-resolver.d.ts.map +1 -1
  19. package/dist/cliproxy/proxy/proxy-config-resolver.js +11 -1
  20. package/dist/cliproxy/proxy/proxy-config-resolver.js.map +1 -1
  21. package/dist/cliproxy/proxy/tool-sanitization-proxy.d.ts.map +1 -1
  22. package/dist/cliproxy/proxy/tool-sanitization-proxy.js +160 -8
  23. package/dist/cliproxy/proxy/tool-sanitization-proxy.js.map +1 -1
  24. package/dist/cliproxy/proxy/upstream-response-timeout.d.ts +14 -0
  25. package/dist/cliproxy/proxy/upstream-response-timeout.d.ts.map +1 -0
  26. package/dist/cliproxy/proxy/upstream-response-timeout.js +72 -0
  27. package/dist/cliproxy/proxy/upstream-response-timeout.js.map +1 -0
  28. package/dist/codex-auth/codex-config-symlink.js +21 -4
  29. package/dist/codex-auth/codex-config-symlink.js.map +1 -1
  30. package/dist/commands/config-channels-command.d.ts +1 -4
  31. package/dist/commands/config-channels-command.d.ts.map +1 -1
  32. package/dist/commands/config-channels-command.js +20 -24
  33. package/dist/commands/config-channels-command.js.map +1 -1
  34. package/dist/cursor/cursor-daemon-auth.d.ts +2 -0
  35. package/dist/cursor/cursor-daemon-auth.d.ts.map +1 -0
  36. package/dist/cursor/cursor-daemon-auth.js +49 -0
  37. package/dist/cursor/cursor-daemon-auth.js.map +1 -0
  38. package/dist/cursor/cursor-daemon-entry.d.ts.map +1 -1
  39. package/dist/cursor/cursor-daemon-entry.js +44 -0
  40. package/dist/cursor/cursor-daemon-entry.js.map +1 -1
  41. package/dist/cursor/cursor-daemon.d.ts +2 -1
  42. package/dist/cursor/cursor-daemon.d.ts.map +1 -1
  43. package/dist/cursor/cursor-daemon.js +21 -5
  44. package/dist/cursor/cursor-daemon.js.map +1 -1
  45. package/dist/cursor/cursor-models.d.ts.map +1 -1
  46. package/dist/cursor/cursor-models.js +2 -1
  47. package/dist/cursor/cursor-models.js.map +1 -1
  48. package/dist/cursor/cursor-profile-executor.d.ts +1 -1
  49. package/dist/cursor/cursor-profile-executor.d.ts.map +1 -1
  50. package/dist/cursor/cursor-profile-executor.js +7 -4
  51. package/dist/cursor/cursor-profile-executor.js.map +1 -1
  52. package/dist/cursor/cursor-runtime-probe.d.ts.map +1 -1
  53. package/dist/cursor/cursor-runtime-probe.js +4 -2
  54. package/dist/cursor/cursor-runtime-probe.js.map +1 -1
  55. package/dist/cursor/types.d.ts +1 -0
  56. package/dist/cursor/types.d.ts.map +1 -1
  57. package/dist/dispatcher/profile-resolver.d.ts +16 -0
  58. package/dist/dispatcher/profile-resolver.d.ts.map +1 -1
  59. package/dist/dispatcher/profile-resolver.js +49 -3
  60. package/dist/dispatcher/profile-resolver.js.map +1 -1
  61. package/dist/docker/docker-key-rotation.d.ts +2 -0
  62. package/dist/docker/docker-key-rotation.d.ts.map +1 -1
  63. package/dist/docker/docker-key-rotation.js +9 -1
  64. package/dist/docker/docker-key-rotation.js.map +1 -1
  65. package/dist/glmt/sse-parser.d.ts +1 -0
  66. package/dist/glmt/sse-parser.d.ts.map +1 -1
  67. package/dist/glmt/sse-parser.js +13 -1
  68. package/dist/glmt/sse-parser.js.map +1 -1
  69. package/dist/proxy/server/messages-route.d.ts.map +1 -1
  70. package/dist/proxy/server/messages-route.js +69 -3
  71. package/dist/proxy/server/messages-route.js.map +1 -1
  72. package/dist/proxy/transformers/request-transformer.d.ts.map +1 -1
  73. package/dist/proxy/transformers/request-transformer.js +9 -2
  74. package/dist/proxy/transformers/request-transformer.js.map +1 -1
  75. package/dist/shared/claude-extension-setup.d.ts.map +1 -1
  76. package/dist/shared/claude-extension-setup.js +2 -1
  77. package/dist/shared/claude-extension-setup.js.map +1 -1
  78. package/dist/targets/codex-adapter.js +1 -1
  79. package/dist/targets/codex-adapter.js.map +1 -1
  80. package/dist/ui/assets/{Trans-DyZQZ3e2.js → Trans-DOlVGvG6.js} +1 -1
  81. package/dist/ui/assets/accounts-0xPiZAXy.js +1 -0
  82. package/dist/ui/assets/{alert-dialog-DWHL-dqd.js → alert-dialog-C3Ubz6zm.js} +1 -1
  83. package/dist/ui/assets/api-DOQGwMEs.js +4 -0
  84. package/dist/ui/assets/{auth-section-B4o90dwz.js → auth-section-DdCSF3QD.js} +1 -1
  85. package/dist/ui/assets/{backups-section-1AsdSIJO.js → backups-section-CwKgWux6.js} +1 -1
  86. package/dist/ui/assets/{channels-CU4Zdsc_.js → channels-D4N7rmlS.js} +1 -1
  87. package/dist/ui/assets/{checkbox-CbCKGH8I.js → checkbox-_9tb7vSM.js} +1 -1
  88. package/dist/ui/assets/claude-extension-CqVB2rHX.js +1 -0
  89. package/dist/ui/assets/cliproxy-BkV3-j4-.js +4 -0
  90. package/dist/ui/assets/{cliproxy-ai-providers-Dr4L5NRY.js → cliproxy-ai-providers-DyvBnYx-.js} +6 -6
  91. package/dist/ui/assets/cliproxy-control-panel-CZCK9iWQ.js +1 -0
  92. package/dist/ui/assets/codex--NKVi5Hz.js +30 -0
  93. package/dist/ui/assets/{confirm-dialog-b5Dahgnk.js → confirm-dialog-BujRCf8j.js} +1 -1
  94. package/dist/ui/assets/{copilot-B1Ojakbt.js → copilot-Dzrxq8in.js} +2 -2
  95. package/dist/ui/assets/{cursor-PUtNVPx1.js → cursor-LUCato_2.js} +1 -1
  96. package/dist/ui/assets/{droid-S2gclncb.js → droid-Dn4dUn-L.js} +1 -1
  97. package/dist/ui/assets/{globalenv-section-7wKSmNSG.js → globalenv-section-BTsCpt1B.js} +1 -1
  98. package/dist/ui/assets/{health-hMLN_gyw.js → health-DzzrVkWD.js} +1 -1
  99. package/dist/ui/assets/{index-Coc3_ABK.js → index-BIlIgeCk.js} +1 -1
  100. package/dist/ui/assets/{index-BWboJia4.js → index-BLqQisUk.js} +1 -1
  101. package/dist/ui/assets/{index-DkR2KVhF.js → index-BV8jqT-L.js} +1 -1
  102. package/dist/ui/assets/{index-CcGVqYOy.js → index-C0u5iUif.js} +18 -18
  103. package/dist/ui/assets/{index-CxvNNHgE.js → index-CZIkLl6M.js} +1 -1
  104. package/dist/ui/assets/index-DEpjRj7J.js +1 -0
  105. package/dist/ui/assets/index-G3mgTfgR.css +1 -0
  106. package/dist/ui/assets/{index-Cx0dmbiQ.js → index-_eIr26Ep.js} +1 -1
  107. package/dist/ui/assets/{logs-BRFVfyLc.js → logs-CRUo_kf6.js} +1 -1
  108. package/dist/ui/assets/{masked-input-4L9CIZGb.js → masked-input-d9kIfCtM.js} +1 -1
  109. package/dist/ui/assets/proxy-status-widget-P9Ong2o_.js +1 -0
  110. package/dist/ui/assets/{raw-json-settings-editor-panel-DXh8c8rA.js → raw-json-settings-editor-panel-Cxj67aFh.js} +1 -1
  111. package/dist/ui/assets/{searchable-select-CtvEQrMo.js → searchable-select-DOIHHohx.js} +1 -1
  112. package/dist/ui/assets/{separator-E0ISp1SN.js → separator-BAQA3doU.js} +1 -1
  113. package/dist/ui/assets/{shared-BeYwHeNS.js → shared-7_iosa5S.js} +2 -2
  114. package/dist/ui/assets/{table-BBslZvNP.js → table-DReGZAso.js} +1 -1
  115. package/dist/ui/assets/updates-DGa6nr_u.js +1 -0
  116. package/dist/ui/assets/{use-accounts-BdalFsdY.js → use-accounts-CigQ6WZJ.js} +1 -1
  117. package/dist/ui/index.html +2 -2
  118. package/dist/utils/browser/browser-settings.d.ts.map +1 -1
  119. package/dist/utils/browser/browser-settings.js +13 -3
  120. package/dist/utils/browser/browser-settings.js.map +1 -1
  121. package/dist/utils/glmt-deprecation.d.ts.map +1 -1
  122. package/dist/utils/glmt-deprecation.js +1 -3
  123. package/dist/utils/glmt-deprecation.js.map +1 -1
  124. package/dist/web-server/index.d.ts.map +1 -1
  125. package/dist/web-server/index.js +0 -9
  126. package/dist/web-server/index.js.map +1 -1
  127. package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
  128. package/dist/web-server/middleware/auth-middleware.js +26 -4
  129. package/dist/web-server/middleware/auth-middleware.js.map +1 -1
  130. package/dist/web-server/routes/cliproxy-auth-routes.d.ts +10 -0
  131. package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
  132. package/dist/web-server/routes/cliproxy-auth-routes.js +45 -13
  133. package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
  134. package/dist/web-server/routes/cliproxy-local-proxy.d.ts.map +1 -1
  135. package/dist/web-server/routes/cliproxy-local-proxy.js +25 -8
  136. package/dist/web-server/routes/cliproxy-local-proxy.js.map +1 -1
  137. package/dist/web-server/routes/cursor-routes.d.ts.map +1 -1
  138. package/dist/web-server/routes/cursor-routes.js +6 -1
  139. package/dist/web-server/routes/cursor-routes.js.map +1 -1
  140. package/dist/web-server/routes/image-analysis-routes.d.ts.map +1 -1
  141. package/dist/web-server/routes/image-analysis-routes.js +7 -0
  142. package/dist/web-server/routes/image-analysis-routes.js.map +1 -1
  143. package/dist/web-server/routes/settings-routes.d.ts.map +1 -1
  144. package/dist/web-server/routes/settings-routes.js +10 -1
  145. package/dist/web-server/routes/settings-routes.js.map +1 -1
  146. package/dist/web-server/services/claude-extension-settings-service.d.ts.map +1 -1
  147. package/dist/web-server/services/claude-extension-settings-service.js +5 -1
  148. package/dist/web-server/services/claude-extension-settings-service.js.map +1 -1
  149. package/lib/mcp/ccs-browser-server.cjs +24 -13
  150. package/package.json +1 -1
  151. package/scripts/github/stable-release-issue-cleanup-lib.mjs +113 -0
  152. package/scripts/github/stable-release-issue-cleanup.mjs +134 -0
  153. package/dist/ui/assets/accounts-BPJltru3.js +0 -1
  154. package/dist/ui/assets/api-BxPN-zy4.js +0 -4
  155. package/dist/ui/assets/claude-extension-CWpjmIGt.js +0 -1
  156. package/dist/ui/assets/cliproxy-K6eBb5VO.js +0 -4
  157. package/dist/ui/assets/cliproxy-control-panel-Cz5r7kHP.js +0 -1
  158. package/dist/ui/assets/codex-0HdbW8NR.js +0 -30
  159. package/dist/ui/assets/index-BMoGhs28.css +0 -1
  160. package/dist/ui/assets/index-COt1pbk-.js +0 -1
  161. package/dist/ui/assets/proxy-status-widget-s1UWOE23.js +0 -1
  162. package/dist/ui/assets/updates-CDrm903n.js +0 -1
@@ -47,6 +47,7 @@ const model_id_normalizer_1 = require("../ai-providers/model-id-normalizer");
47
47
  const model_catalog_1 = require("../model-catalog");
48
48
  const logging_1 = require("../../services/logging");
49
49
  const config_loader_facade_1 = require("../../config/config-loader-facade");
50
+ const upstream_response_timeout_1 = require("./upstream-response-timeout");
50
51
  /**
51
52
  * Type guard to check if a value is a plain object (Record).
52
53
  * Used for safely accessing properties on unknown JSON values.
@@ -62,6 +63,7 @@ const GEMINI_UNSUPPORTED_TOOL_FIELDS = new Set([
62
63
  'defer_loading',
63
64
  ]);
64
65
  const CODEX_UNSUPPORTED_TOOL_FIELDS = new Set(['cache_control']);
66
+ const CODEX_FAST_SERVICE_TIER = 'priority';
65
67
  const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
66
68
  const LEGACY_CODEX_MODEL_ID_REGEX = /^gpt-5(?:\.\d+)?-codex(?:-(?:mini|max))?$/i;
67
69
  function canonicalizeCodexModelId(model) {
@@ -82,6 +84,97 @@ function isKnownCodexModelId(model) {
82
84
  return (LEGACY_CODEX_MODEL_ID_REGEX.test(normalizedModel) ||
83
85
  (0, model_catalog_1.getModelMaxLevel)('codex', normalizedModel) !== undefined);
84
86
  }
87
+ function isCodexRequest(providerFromPath, model) {
88
+ return (providerFromPath === 'codex' ||
89
+ (providerFromPath === null && typeof model === 'string' && isKnownCodexModelId(model)));
90
+ }
91
+ function applyCodexModelTuningAlias(body) {
92
+ if (typeof body.model !== 'string') {
93
+ return body;
94
+ }
95
+ const parsed = (0, model_id_normalizer_1.parseCodexModelTuningAlias)(body.model);
96
+ if (!parsed || !isKnownCodexModelId(parsed.baseModel)) {
97
+ return body;
98
+ }
99
+ const tunedBody = { ...body, model: parsed.baseModel };
100
+ if (parsed.effort) {
101
+ const existingReasoning = isRecord(body.reasoning) ? body.reasoning : {};
102
+ tunedBody.reasoning = {
103
+ ...existingReasoning,
104
+ effort: parsed.effort,
105
+ };
106
+ }
107
+ if (parsed.serviceTier) {
108
+ tunedBody.service_tier = CODEX_FAST_SERVICE_TIER;
109
+ }
110
+ return tunedBody;
111
+ }
112
+ function extractSystemText(content) {
113
+ if (typeof content === 'string') {
114
+ return content;
115
+ }
116
+ if (!Array.isArray(content)) {
117
+ return '';
118
+ }
119
+ return content
120
+ .filter((block) => isRecord(block))
121
+ .filter((block) => block.type === 'text' && typeof block.text === 'string')
122
+ .map((block) => block.text)
123
+ .join('\n\n');
124
+ }
125
+ function prependSystemTextToContent(content, systemText) {
126
+ if (Array.isArray(content)) {
127
+ return [{ type: 'text', text: systemText }, ...content];
128
+ }
129
+ if (typeof content === 'string') {
130
+ return `${systemText}\n\n${content}`;
131
+ }
132
+ return systemText;
133
+ }
134
+ function foldCodexSystemMessages(body) {
135
+ const systemTexts = [];
136
+ let removedSystem = false;
137
+ const nextBody = { ...body };
138
+ if (body.system !== undefined) {
139
+ removedSystem = true;
140
+ delete nextBody.system;
141
+ const systemText = extractSystemText(body.system).trim();
142
+ if (systemText) {
143
+ systemTexts.push(systemText);
144
+ }
145
+ }
146
+ const rawMessages = Array.isArray(body.messages) ? body.messages : [];
147
+ const messages = rawMessages.filter((message) => {
148
+ if (!isRecord(message) || message.role !== 'system') {
149
+ return true;
150
+ }
151
+ removedSystem = true;
152
+ const systemText = extractSystemText(message.content).trim();
153
+ if (systemText) {
154
+ systemTexts.push(systemText);
155
+ }
156
+ return false;
157
+ });
158
+ if (!removedSystem) {
159
+ return body;
160
+ }
161
+ if (systemTexts.length > 0) {
162
+ const systemPrefix = systemTexts.join('\n\n');
163
+ const firstUserIndex = messages.findIndex((message) => isRecord(message) && message.role === 'user');
164
+ if (firstUserIndex >= 0 && isRecord(messages[firstUserIndex])) {
165
+ const firstUserMessage = messages[firstUserIndex];
166
+ messages[firstUserIndex] = {
167
+ ...firstUserMessage,
168
+ content: prependSystemTextToContent(firstUserMessage.content, systemPrefix),
169
+ };
170
+ }
171
+ else {
172
+ messages.unshift({ role: 'user', content: systemPrefix });
173
+ }
174
+ }
175
+ nextBody.messages = messages;
176
+ return nextBody;
177
+ }
85
178
  function getUnsupportedToolFields(providerFromPath, model) {
86
179
  const normalizedProvider = providerFromPath?.trim().toLowerCase() ?? null;
87
180
  const normalizedModel = model?.trim().toLowerCase();
@@ -287,6 +380,10 @@ class ToolSanitizationProxy {
287
380
  modifiedBody = { ...modifiedBody, model: normalizedModel };
288
381
  }
289
382
  }
383
+ if (isRecord(modifiedBody) && isCodexRequest(providerFromPath, modifiedBody.model)) {
384
+ const tunedBody = applyCodexModelTuningAlias(modifiedBody);
385
+ modifiedBody = foldCodexSystemMessages(tunedBody);
386
+ }
290
387
  // Sanitize tools if present
291
388
  if (isRecord(modifiedBody) && Array.isArray(modifiedBody.tools)) {
292
389
  // Step 1: Sanitize input_schema properties (remove non-standard JSON Schema properties)
@@ -410,10 +507,39 @@ class ToolSanitizationProxy {
410
507
  let clearResponseTimeout = () => undefined;
411
508
  const upstreamReq = requestFn(this.buildRequestOptions(upstreamUrl, originalReq.method, this.buildForwardHeaders(originalReq.headers)), (upstreamRes) => {
412
509
  clearResponseTimeout();
413
- clientRes.writeHead(upstreamRes.statusCode || 200, upstreamRes.headers);
414
- upstreamRes.pipe(clientRes);
415
- upstreamRes.on('end', () => resolve());
416
- upstreamRes.on('error', reject);
510
+ const statusCode = upstreamRes.statusCode || 200;
511
+ let responseStarted = false;
512
+ const writeResponseHead = () => {
513
+ if (responseStarted)
514
+ return;
515
+ responseStarted = true;
516
+ (0, upstream_response_timeout_1.writeForwardResponseHead)(clientRes, statusCode, upstreamRes.headers);
517
+ };
518
+ const clearUpstreamResponseTimeout = (0, upstream_response_timeout_1.attachUpstreamResponseTimeout)({
519
+ upstreamReq,
520
+ upstreamRes,
521
+ clientRes,
522
+ timeoutMs: this.config.timeoutMs,
523
+ onTimeout: () => resolve(),
524
+ });
525
+ upstreamRes.on('data', (chunk) => {
526
+ writeResponseHead();
527
+ const canContinue = clientRes.write(chunk);
528
+ if (!canContinue) {
529
+ upstreamRes.pause();
530
+ clientRes.once('drain', () => upstreamRes.resume());
531
+ }
532
+ });
533
+ upstreamRes.on('end', () => {
534
+ clearUpstreamResponseTimeout();
535
+ writeResponseHead();
536
+ clientRes.end();
537
+ resolve();
538
+ });
539
+ upstreamRes.on('error', (error) => {
540
+ clearUpstreamResponseTimeout();
541
+ reject(error);
542
+ });
417
543
  });
418
544
  clearResponseTimeout = this.startResponseTimeout(upstreamReq);
419
545
  upstreamReq.on('timeout', () => upstreamReq.destroy(new Error('Upstream request timeout')));
@@ -434,9 +560,17 @@ class ToolSanitizationProxy {
434
560
  let clearResponseTimeout = () => undefined;
435
561
  const upstreamReq = requestFn(this.buildRequestOptions(upstreamUrl, originalReq.method, this.buildForwardHeaders(originalReq.headers, bodyString)), (upstreamRes) => {
436
562
  clearResponseTimeout();
563
+ const clearUpstreamResponseTimeout = (0, upstream_response_timeout_1.attachUpstreamResponseTimeout)({
564
+ upstreamReq,
565
+ upstreamRes,
566
+ clientRes,
567
+ timeoutMs: this.config.timeoutMs,
568
+ onTimeout: () => resolve(),
569
+ });
437
570
  const chunks = [];
438
571
  upstreamRes.on('data', (chunk) => chunks.push(chunk));
439
572
  upstreamRes.on('end', () => {
573
+ clearUpstreamResponseTimeout();
440
574
  try {
441
575
  const responseBody = Buffer.concat(chunks).toString('utf8');
442
576
  const contentType = upstreamRes.headers['content-type'] || '';
@@ -469,7 +603,10 @@ class ToolSanitizationProxy {
469
603
  reject(err);
470
604
  }
471
605
  });
472
- upstreamRes.on('error', reject);
606
+ upstreamRes.on('error', (error) => {
607
+ clearUpstreamResponseTimeout();
608
+ reject(error);
609
+ });
473
610
  });
474
611
  clearResponseTimeout = this.startResponseTimeout(upstreamReq);
475
612
  upstreamReq.on('timeout', () => upstreamReq.destroy(new Error('Upstream request timeout')));
@@ -492,7 +629,14 @@ class ToolSanitizationProxy {
492
629
  let clearResponseTimeout = () => undefined;
493
630
  const upstreamReq = requestFn(this.buildRequestOptions(upstreamUrl, originalReq.method, this.buildForwardHeaders(originalReq.headers, bodyString)), (upstreamRes) => {
494
631
  clearResponseTimeout();
495
- clientRes.writeHead(upstreamRes.statusCode || 200, upstreamRes.headers);
632
+ const clearUpstreamResponseTimeout = (0, upstream_response_timeout_1.attachUpstreamResponseTimeout)({
633
+ upstreamReq,
634
+ upstreamRes,
635
+ clientRes,
636
+ timeoutMs: this.config.timeoutMs,
637
+ onTimeout: () => resolve(),
638
+ });
639
+ (0, upstream_response_timeout_1.writeForwardResponseHead)(clientRes, upstreamRes.statusCode || 200, upstreamRes.headers);
496
640
  // Track upstream SSE lifecycle events (guards against empty proxy responses)
497
641
  const lifecycle = {
498
642
  hasContent: false,
@@ -530,6 +674,7 @@ class ToolSanitizationProxy {
530
674
  }
531
675
  });
532
676
  upstreamRes.on('end', () => {
677
+ clearUpstreamResponseTimeout();
533
678
  try {
534
679
  if (!lifecycle.hasContent && isSuccessResponse && lifecycle.hasData) {
535
680
  this.writeLog('warn', '[tool-sanitization-proxy] Empty response detected from upstream (no content blocks). Injecting synthetic response to prevent client crash.');
@@ -542,7 +687,10 @@ class ToolSanitizationProxy {
542
687
  }
543
688
  resolve();
544
689
  });
545
- upstreamRes.on('error', reject);
690
+ upstreamRes.on('error', (error) => {
691
+ clearUpstreamResponseTimeout();
692
+ reject(error);
693
+ });
546
694
  return;
547
695
  }
548
696
  // Process SSE events for tool name restoration
@@ -562,6 +710,7 @@ class ToolSanitizationProxy {
562
710
  }
563
711
  });
564
712
  upstreamRes.on('end', () => {
713
+ clearUpstreamResponseTimeout();
565
714
  try {
566
715
  // Process any remaining buffer
567
716
  if (buffer.trim()) {
@@ -581,7 +730,10 @@ class ToolSanitizationProxy {
581
730
  }
582
731
  resolve();
583
732
  });
584
- upstreamRes.on('error', reject);
733
+ upstreamRes.on('error', (error) => {
734
+ clearUpstreamResponseTimeout();
735
+ reject(error);
736
+ });
585
737
  });
586
738
  clearResponseTimeout = this.startResponseTimeout(upstreamReq);
587
739
  upstreamReq.on('timeout', () => upstreamReq.destroy(new Error('Upstream request timeout')));
@@ -1 +1 @@
1
- {"version":3,"file":"tool-sanitization-proxy.js","sourceRoot":"","sources":["../../../src/cliproxy/proxy/tool-sanitization-proxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tool-sanitization-proxy.js","sourceRoot":"","sources":["../../../src/cliproxy/proxy/tool-sanitization-proxy.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,14 @@
1
+ /// <reference types="node" />
2
+ import * as http from 'http';
3
+ export declare const UPSTREAM_RESPONSE_TIMEOUT_MESSAGE = "Upstream response timed out while streaming response body";
4
+ export declare function buildTimeoutSafeResponseHeaders(headers: http.IncomingHttpHeaders): http.OutgoingHttpHeaders;
5
+ export declare function writeForwardResponseHead(clientRes: http.ServerResponse, statusCode: number, headers: http.IncomingHttpHeaders): void;
6
+ export declare function writeTimeoutResponse(clientRes: http.ServerResponse, headers: http.IncomingHttpHeaders, message?: string): void;
7
+ export declare function attachUpstreamResponseTimeout(options: {
8
+ upstreamReq: http.ClientRequest;
9
+ upstreamRes: http.IncomingMessage;
10
+ clientRes: http.ServerResponse;
11
+ timeoutMs: number;
12
+ onTimeout?: (error: Error) => void;
13
+ }): () => void;
14
+ //# sourceMappingURL=upstream-response-timeout.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upstream-response-timeout.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/proxy/upstream-response-timeout.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,eAAO,MAAM,iCAAiC,8DACe,CAAC;AAE9D,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,IAAI,CAAC,mBAAmB,GAChC,IAAI,CAAC,mBAAmB,CAU1B;AAED,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,IAAI,CAAC,cAAc,EAC9B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,IAAI,CAAC,mBAAmB,GAChC,IAAI,CAGN;AAED,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,IAAI,CAAC,cAAc,EAC9B,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACjC,OAAO,SAAoC,GAC1C,IAAI,CA0BN;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE;IACrD,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC;IAChC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC;IAClC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACpC,GAAG,MAAM,IAAI,CAoBb"}
@@ -0,0 +1,72 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.attachUpstreamResponseTimeout = exports.writeTimeoutResponse = exports.writeForwardResponseHead = exports.buildTimeoutSafeResponseHeaders = exports.UPSTREAM_RESPONSE_TIMEOUT_MESSAGE = void 0;
4
+ exports.UPSTREAM_RESPONSE_TIMEOUT_MESSAGE = 'Upstream response timed out while streaming response body';
5
+ function buildTimeoutSafeResponseHeaders(headers) {
6
+ const safeHeaders = {};
7
+ for (const [name, value] of Object.entries(headers)) {
8
+ const normalized = name.toLowerCase();
9
+ if (normalized === 'content-length' || normalized === 'transfer-encoding') {
10
+ continue;
11
+ }
12
+ safeHeaders[name] = value;
13
+ }
14
+ return safeHeaders;
15
+ }
16
+ exports.buildTimeoutSafeResponseHeaders = buildTimeoutSafeResponseHeaders;
17
+ function writeForwardResponseHead(clientRes, statusCode, headers) {
18
+ if (clientRes.headersSent)
19
+ return;
20
+ clientRes.writeHead(statusCode, buildTimeoutSafeResponseHeaders(headers));
21
+ }
22
+ exports.writeForwardResponseHead = writeForwardResponseHead;
23
+ function writeTimeoutResponse(clientRes, headers, message = exports.UPSTREAM_RESPONSE_TIMEOUT_MESSAGE) {
24
+ if (clientRes.destroyed || clientRes.writableEnded)
25
+ return;
26
+ const contentType = String(headers['content-type'] ?? '').toLowerCase();
27
+ try {
28
+ if (contentType.includes('text/event-stream')) {
29
+ const payload = {
30
+ type: 'error',
31
+ error: {
32
+ type: 'timeout_error',
33
+ message,
34
+ },
35
+ };
36
+ clientRes.write(`event: error\ndata: ${JSON.stringify(payload)}\n\n`);
37
+ }
38
+ else if (!clientRes.headersSent) {
39
+ clientRes.writeHead(504, { 'Content-Type': 'application/json' });
40
+ clientRes.write(JSON.stringify({ error: message }));
41
+ }
42
+ else {
43
+ clientRes.write(`\n${JSON.stringify({ error: message })}`);
44
+ }
45
+ clientRes.end();
46
+ }
47
+ catch {
48
+ // Client may have disconnected while the upstream response was stalled.
49
+ }
50
+ }
51
+ exports.writeTimeoutResponse = writeTimeoutResponse;
52
+ function attachUpstreamResponseTimeout(options) {
53
+ const { upstreamReq, upstreamRes, clientRes, timeoutMs, onTimeout } = options;
54
+ let settled = false;
55
+ const clear = () => {
56
+ settled = true;
57
+ upstreamRes.setTimeout(0);
58
+ };
59
+ upstreamRes.setTimeout(timeoutMs, () => {
60
+ if (settled)
61
+ return;
62
+ settled = true;
63
+ const error = new Error(exports.UPSTREAM_RESPONSE_TIMEOUT_MESSAGE);
64
+ writeTimeoutResponse(clientRes, upstreamRes.headers, error.message);
65
+ onTimeout?.(error);
66
+ upstreamRes.destroy(error);
67
+ upstreamReq.destroy(error);
68
+ });
69
+ return clear;
70
+ }
71
+ exports.attachUpstreamResponseTimeout = attachUpstreamResponseTimeout;
72
+ //# sourceMappingURL=upstream-response-timeout.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upstream-response-timeout.js","sourceRoot":"","sources":["../../../src/cliproxy/proxy/upstream-response-timeout.ts"],"names":[],"mappings":"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"}
@@ -102,7 +102,7 @@ function ensureSharedConfigSymlink(profileDir, sharedConfigPath, options = {}) {
102
102
  });
103
103
  }
104
104
  catch (err) {
105
- copySharedConfigFallback(targetPath, linkPath, err);
105
+ handleSymlinkFailure(targetPath, linkPath, err);
106
106
  }
107
107
  }
108
108
  exports.ensureSharedConfigSymlink = ensureSharedConfigSymlink;
@@ -114,9 +114,26 @@ function isRegularConfigCopyUnmodified(linkPath, targetPath) {
114
114
  return false;
115
115
  }
116
116
  }
117
- function copySharedConfigFallback(targetPath, linkPath, err) {
118
- fs.copyFileSync(targetPath, linkPath);
119
- fs.chmodSync(linkPath, 0o600);
117
+ function handleSymlinkFailure(targetPath, linkPath, err) {
118
+ const code = err?.code;
119
+ if (code !== 'EPERM' && code !== 'EACCES' && code !== 'ENOSYS') {
120
+ throw err;
121
+ }
122
+ const tmpPath = path.join(path.dirname(linkPath), `.config.toml.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`);
123
+ try {
124
+ fs.copyFileSync(targetPath, tmpPath, fs.constants.COPYFILE_EXCL);
125
+ fs.chmodSync(tmpPath, 0o600);
126
+ fs.renameSync(tmpPath, linkPath);
127
+ }
128
+ catch (copyErr) {
129
+ try {
130
+ fs.rmSync(tmpPath, { force: true });
131
+ }
132
+ catch {
133
+ // best effort cleanup
134
+ }
135
+ throw copyErr;
136
+ }
120
137
  process.stderr.write(`[!] codex-auth: symlink unavailable; copied shared config.toml to ${linkPath}. ` +
121
138
  `Config edits won't propagate automatically.\n`);
122
139
  logger.warn('codex-auth.symlink-copy-fallback', 'Copied shared config after symlink failure', {
@@ -1 +1 @@
1
- {"version":3,"file":"codex-config-symlink.js","sourceRoot":"","sources":["../../src/codex-auth/codex-config-symlink.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codex-config-symlink.js","sourceRoot":"","sources":["../../src/codex-auth/codex-config-symlink.ts"],"names":[],"mappings":"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"}
@@ -9,10 +9,7 @@ interface ChannelsCommandOptions {
9
9
  setSelectionMissing: boolean;
10
10
  clearTokenAll: boolean;
11
11
  clearTokenChannel?: OfficialChannelId;
12
- setToken?: {
13
- channelId: OfficialChannelId;
14
- token: string;
15
- };
12
+ setTokenChannel?: OfficialChannelId;
16
13
  setTokenMissing: boolean;
17
14
  clearTokenInvalid?: string;
18
15
  setTokenInvalid?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"config-channels-command.d.ts","sourceRoot":"","sources":["../../src/commands/config-channels-command.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AA4CxE,UAAU,sBAAsB;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,EAAE;QAAE,SAAS,EAAE,iBAAiB,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;CACf;AAoBD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,sBAAsB,CA8C/E;AA+OD,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiH/E"}
1
+ {"version":3,"file":"config-channels-command.d.ts","sourceRoot":"","sources":["../../src/commands/config-channels-command.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AA4CxE,UAAU,sBAAsB;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,eAAe,CAAC,EAAE,iBAAiB,CAAC;IACpC,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,sBAAsB,CAgD/E;AA+OD,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA0H/E"}
@@ -7,18 +7,6 @@ const official_channels_store_1 = require("../channels/official-channels-store")
7
7
  const official_channels_runtime_1 = require("../channels/official-channels-runtime");
8
8
  const arg_extractor_1 = require("./arg-extractor");
9
9
  const config_loader_facade_1 = require("../config/config-loader-facade");
10
- function parseTokenAssignment(value) {
11
- const separatorIndex = value.indexOf('=');
12
- if (separatorIndex === -1) {
13
- return value.trim() ? { channelId: 'discord', token: value.trim() } : null;
14
- }
15
- const channelId = value.slice(0, separatorIndex).trim().toLowerCase();
16
- const token = value.slice(separatorIndex + 1).trim();
17
- if (!(0, official_channels_runtime_1.isOfficialChannelId)(channelId) || !token) {
18
- return null;
19
- }
20
- return { channelId, token };
21
- }
22
10
  function parseChannelsCommandArgs(args) {
23
11
  const setSelection = (0, arg_extractor_1.extractOption)(args, ['--set']);
24
12
  const setToken = (0, arg_extractor_1.extractOption)(args, ['--set-token']);
@@ -40,11 +28,14 @@ function parseChannelsCommandArgs(args) {
40
28
  }
41
29
  }
42
30
  }
43
- let parsedSetToken;
31
+ let parsedSetTokenChannel;
44
32
  let setTokenInvalid;
45
33
  if (setToken.found && !setToken.missingValue && setToken.value) {
46
- parsedSetToken = parseTokenAssignment(setToken.value) ?? undefined;
47
- if (!parsedSetToken) {
34
+ const channelId = setToken.value.trim().toLowerCase();
35
+ if ((0, official_channels_runtime_1.isOfficialChannelId)(channelId)) {
36
+ parsedSetTokenChannel = channelId;
37
+ }
38
+ else {
48
39
  setTokenInvalid = setToken.value;
49
40
  }
50
41
  }
@@ -59,7 +50,7 @@ function parseChannelsCommandArgs(args) {
59
50
  clearTokenAll,
60
51
  clearTokenChannel,
61
52
  clearTokenInvalid,
62
- setToken: parsedSetToken,
53
+ setTokenChannel: parsedSetTokenChannel,
63
54
  setTokenMissing: setToken.found && setToken.missingValue,
64
55
  setTokenInvalid,
65
56
  help: (0, arg_extractor_1.hasAnyFlag)(args, ['--help', '-h']),
@@ -84,7 +75,7 @@ function showHelp() {
84
75
  console.log(` ${(0, ui_1.color)('--disable', 'command')} Legacy compatibility alias: remove Discord`);
85
76
  console.log(` ${(0, ui_1.color)('--unattended', 'command')} Also add --dangerously-skip-permissions`);
86
77
  console.log(` ${(0, ui_1.color)('--no-unattended', 'command')} Disable unattended runtime flag`);
87
- console.log(` ${(0, ui_1.color)('--set-token <spec>', 'command')} ${(0, official_channels_runtime_1.getOfficialChannelTokenHelp)()}`);
78
+ console.log(` ${(0, ui_1.color)('--set-token <channel>', 'command')} ${(0, official_channels_runtime_1.getOfficialChannelTokenHelp)()}`);
88
79
  console.log(` ${(0, ui_1.color)('--clear-token [channel]', 'command')} ${(0, official_channels_runtime_1.getOfficialChannelClearTokenHelp)()}`);
89
80
  console.log(` ${(0, ui_1.color)('--help, -h', 'command')} Show this help`);
90
81
  console.log('');
@@ -93,7 +84,7 @@ function showHelp() {
93
84
  console.log(` $ ${(0, ui_1.color)('ccs config channels', 'command')} ${(0, ui_1.dim)('# Show status')}`);
94
85
  console.log(` $ ${(0, ui_1.color)('ccs config channels --set telegram,discord', 'command')} ${(0, ui_1.dim)('# Enable Telegram + Discord')}`);
95
86
  console.log(` $ ${(0, ui_1.color)('ccs config channels --set all', 'command')} ${(0, ui_1.dim)('# Enable all official channels')}`);
96
- console.log(` $ ${(0, ui_1.color)('ccs config channels --set-token telegram=123:abc', 'command')} ${(0, ui_1.dim)('# Save TELEGRAM_BOT_TOKEN')}`);
87
+ console.log(` $ ${(0, ui_1.color)('TELEGRAM_BOT_TOKEN=123:abc ccs config channels --set-token telegram', 'command')} ${(0, ui_1.dim)('# Save TELEGRAM_BOT_TOKEN')}`);
97
88
  console.log(` $ ${(0, ui_1.color)('ccs config channels --clear-token discord', 'command')} ${(0, ui_1.dim)('# Clear one token')}`);
98
89
  console.log(` ${(0, ui_1.dim)((0, official_channels_runtime_1.getOfficialChannelsSupportMessage)())}`);
99
90
  console.log('');
@@ -283,7 +274,7 @@ async function handleConfigChannelsCommand(args) {
283
274
  return;
284
275
  }
285
276
  if (options.setTokenInvalid) {
286
- console.error((0, ui_1.fail)(`Invalid --set-token value: ${options.setTokenInvalid} (use <channel>=<token>)`));
277
+ console.error((0, ui_1.fail)(`Invalid --set-token value: ${options.setTokenInvalid} (use ${(0, official_channels_runtime_1.getOfficialChannelChoices)()})`));
287
278
  process.exitCode = 1;
288
279
  return;
289
280
  }
@@ -322,12 +313,17 @@ async function handleConfigChannelsCommand(args) {
322
313
  if (hasConfigMutation) {
323
314
  (0, config_loader_facade_1.updateConfig)({ channels: nextConfig });
324
315
  }
325
- if (options.setToken) {
326
- if (!(0, official_channels_runtime_1.getOfficialChannelTokenIds)().includes(options.setToken.channelId)) {
327
- throw new Error(`${options.setToken.channelId} does not use a bot token.`);
316
+ if (options.setTokenChannel) {
317
+ if (!(0, official_channels_runtime_1.getOfficialChannelTokenIds)().includes(options.setTokenChannel)) {
318
+ throw new Error(`${options.setTokenChannel} does not use a bot token.`);
319
+ }
320
+ const envKey = (0, official_channels_runtime_1.getOfficialChannelEnvKey)(options.setTokenChannel);
321
+ const token = envKey ? process.env[envKey]?.trim() : '';
322
+ if (!token) {
323
+ throw new Error(`${(0, official_channels_runtime_1.getOfficialChannelDisplayName)(options.setTokenChannel)} token missing. Set ${envKey} in your environment and rerun.`);
328
324
  }
329
- (0, official_channels_store_1.setConfiguredOfficialChannelToken)(options.setToken.channelId, options.setToken.token);
330
- console.log((0, ui_1.ok)(`${(0, official_channels_runtime_1.getOfficialChannelDisplayName)(options.setToken.channelId)} token saved`));
325
+ (0, official_channels_store_1.setConfiguredOfficialChannelToken)(options.setTokenChannel, token);
326
+ console.log((0, ui_1.ok)(`${(0, official_channels_runtime_1.getOfficialChannelDisplayName)(options.setTokenChannel)} token saved`));
331
327
  console.log('');
332
328
  }
333
329
  if (options.clearTokenChannel) {