@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.
- package/dist/channels/official-channels-runtime.js +1 -1
- package/dist/channels/official-channels-runtime.js.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +88 -11
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js.map +1 -1
- package/dist/cliproxy/auth/auth-types.d.ts +2 -0
- package/dist/cliproxy/auth/auth-types.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.js +12 -6
- package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.js +1 -0
- package/dist/cliproxy/auth/oauth-trace/redactor.js.map +1 -1
- package/dist/cliproxy/binary/version-checker.d.ts +4 -2
- package/dist/cliproxy/binary/version-checker.d.ts.map +1 -1
- package/dist/cliproxy/binary/version-checker.js +30 -20
- package/dist/cliproxy/binary/version-checker.js.map +1 -1
- package/dist/cliproxy/proxy/proxy-config-resolver.d.ts.map +1 -1
- package/dist/cliproxy/proxy/proxy-config-resolver.js +11 -1
- package/dist/cliproxy/proxy/proxy-config-resolver.js.map +1 -1
- package/dist/cliproxy/proxy/tool-sanitization-proxy.d.ts.map +1 -1
- package/dist/cliproxy/proxy/tool-sanitization-proxy.js +160 -8
- package/dist/cliproxy/proxy/tool-sanitization-proxy.js.map +1 -1
- package/dist/cliproxy/proxy/upstream-response-timeout.d.ts +14 -0
- package/dist/cliproxy/proxy/upstream-response-timeout.d.ts.map +1 -0
- package/dist/cliproxy/proxy/upstream-response-timeout.js +72 -0
- package/dist/cliproxy/proxy/upstream-response-timeout.js.map +1 -0
- package/dist/codex-auth/codex-config-symlink.js +21 -4
- package/dist/codex-auth/codex-config-symlink.js.map +1 -1
- package/dist/commands/config-channels-command.d.ts +1 -4
- package/dist/commands/config-channels-command.d.ts.map +1 -1
- package/dist/commands/config-channels-command.js +20 -24
- package/dist/commands/config-channels-command.js.map +1 -1
- package/dist/cursor/cursor-daemon-auth.d.ts +2 -0
- package/dist/cursor/cursor-daemon-auth.d.ts.map +1 -0
- package/dist/cursor/cursor-daemon-auth.js +49 -0
- package/dist/cursor/cursor-daemon-auth.js.map +1 -0
- package/dist/cursor/cursor-daemon-entry.d.ts.map +1 -1
- package/dist/cursor/cursor-daemon-entry.js +44 -0
- package/dist/cursor/cursor-daemon-entry.js.map +1 -1
- package/dist/cursor/cursor-daemon.d.ts +2 -1
- package/dist/cursor/cursor-daemon.d.ts.map +1 -1
- package/dist/cursor/cursor-daemon.js +21 -5
- package/dist/cursor/cursor-daemon.js.map +1 -1
- package/dist/cursor/cursor-models.d.ts.map +1 -1
- package/dist/cursor/cursor-models.js +2 -1
- package/dist/cursor/cursor-models.js.map +1 -1
- package/dist/cursor/cursor-profile-executor.d.ts +1 -1
- package/dist/cursor/cursor-profile-executor.d.ts.map +1 -1
- package/dist/cursor/cursor-profile-executor.js +7 -4
- package/dist/cursor/cursor-profile-executor.js.map +1 -1
- package/dist/cursor/cursor-runtime-probe.d.ts.map +1 -1
- package/dist/cursor/cursor-runtime-probe.js +4 -2
- package/dist/cursor/cursor-runtime-probe.js.map +1 -1
- package/dist/cursor/types.d.ts +1 -0
- package/dist/cursor/types.d.ts.map +1 -1
- package/dist/dispatcher/profile-resolver.d.ts +16 -0
- package/dist/dispatcher/profile-resolver.d.ts.map +1 -1
- package/dist/dispatcher/profile-resolver.js +49 -3
- package/dist/dispatcher/profile-resolver.js.map +1 -1
- package/dist/docker/docker-key-rotation.d.ts +2 -0
- package/dist/docker/docker-key-rotation.d.ts.map +1 -1
- package/dist/docker/docker-key-rotation.js +9 -1
- package/dist/docker/docker-key-rotation.js.map +1 -1
- package/dist/glmt/sse-parser.d.ts +1 -0
- package/dist/glmt/sse-parser.d.ts.map +1 -1
- package/dist/glmt/sse-parser.js +13 -1
- package/dist/glmt/sse-parser.js.map +1 -1
- package/dist/proxy/server/messages-route.d.ts.map +1 -1
- package/dist/proxy/server/messages-route.js +69 -3
- package/dist/proxy/server/messages-route.js.map +1 -1
- package/dist/proxy/transformers/request-transformer.d.ts.map +1 -1
- package/dist/proxy/transformers/request-transformer.js +9 -2
- package/dist/proxy/transformers/request-transformer.js.map +1 -1
- package/dist/shared/claude-extension-setup.d.ts.map +1 -1
- package/dist/shared/claude-extension-setup.js +2 -1
- package/dist/shared/claude-extension-setup.js.map +1 -1
- package/dist/targets/codex-adapter.js +1 -1
- package/dist/targets/codex-adapter.js.map +1 -1
- package/dist/ui/assets/{Trans-DyZQZ3e2.js → Trans-DOlVGvG6.js} +1 -1
- package/dist/ui/assets/accounts-0xPiZAXy.js +1 -0
- package/dist/ui/assets/{alert-dialog-DWHL-dqd.js → alert-dialog-C3Ubz6zm.js} +1 -1
- package/dist/ui/assets/api-DOQGwMEs.js +4 -0
- package/dist/ui/assets/{auth-section-B4o90dwz.js → auth-section-DdCSF3QD.js} +1 -1
- package/dist/ui/assets/{backups-section-1AsdSIJO.js → backups-section-CwKgWux6.js} +1 -1
- package/dist/ui/assets/{channels-CU4Zdsc_.js → channels-D4N7rmlS.js} +1 -1
- package/dist/ui/assets/{checkbox-CbCKGH8I.js → checkbox-_9tb7vSM.js} +1 -1
- package/dist/ui/assets/claude-extension-CqVB2rHX.js +1 -0
- package/dist/ui/assets/cliproxy-BkV3-j4-.js +4 -0
- package/dist/ui/assets/{cliproxy-ai-providers-Dr4L5NRY.js → cliproxy-ai-providers-DyvBnYx-.js} +6 -6
- package/dist/ui/assets/cliproxy-control-panel-CZCK9iWQ.js +1 -0
- package/dist/ui/assets/codex--NKVi5Hz.js +30 -0
- package/dist/ui/assets/{confirm-dialog-b5Dahgnk.js → confirm-dialog-BujRCf8j.js} +1 -1
- package/dist/ui/assets/{copilot-B1Ojakbt.js → copilot-Dzrxq8in.js} +2 -2
- package/dist/ui/assets/{cursor-PUtNVPx1.js → cursor-LUCato_2.js} +1 -1
- package/dist/ui/assets/{droid-S2gclncb.js → droid-Dn4dUn-L.js} +1 -1
- package/dist/ui/assets/{globalenv-section-7wKSmNSG.js → globalenv-section-BTsCpt1B.js} +1 -1
- package/dist/ui/assets/{health-hMLN_gyw.js → health-DzzrVkWD.js} +1 -1
- package/dist/ui/assets/{index-Coc3_ABK.js → index-BIlIgeCk.js} +1 -1
- package/dist/ui/assets/{index-BWboJia4.js → index-BLqQisUk.js} +1 -1
- package/dist/ui/assets/{index-DkR2KVhF.js → index-BV8jqT-L.js} +1 -1
- package/dist/ui/assets/{index-CcGVqYOy.js → index-C0u5iUif.js} +18 -18
- package/dist/ui/assets/{index-CxvNNHgE.js → index-CZIkLl6M.js} +1 -1
- package/dist/ui/assets/index-DEpjRj7J.js +1 -0
- package/dist/ui/assets/index-G3mgTfgR.css +1 -0
- package/dist/ui/assets/{index-Cx0dmbiQ.js → index-_eIr26Ep.js} +1 -1
- package/dist/ui/assets/{logs-BRFVfyLc.js → logs-CRUo_kf6.js} +1 -1
- package/dist/ui/assets/{masked-input-4L9CIZGb.js → masked-input-d9kIfCtM.js} +1 -1
- package/dist/ui/assets/proxy-status-widget-P9Ong2o_.js +1 -0
- package/dist/ui/assets/{raw-json-settings-editor-panel-DXh8c8rA.js → raw-json-settings-editor-panel-Cxj67aFh.js} +1 -1
- package/dist/ui/assets/{searchable-select-CtvEQrMo.js → searchable-select-DOIHHohx.js} +1 -1
- package/dist/ui/assets/{separator-E0ISp1SN.js → separator-BAQA3doU.js} +1 -1
- package/dist/ui/assets/{shared-BeYwHeNS.js → shared-7_iosa5S.js} +2 -2
- package/dist/ui/assets/{table-BBslZvNP.js → table-DReGZAso.js} +1 -1
- package/dist/ui/assets/updates-DGa6nr_u.js +1 -0
- package/dist/ui/assets/{use-accounts-BdalFsdY.js → use-accounts-CigQ6WZJ.js} +1 -1
- package/dist/ui/index.html +2 -2
- package/dist/utils/browser/browser-settings.d.ts.map +1 -1
- package/dist/utils/browser/browser-settings.js +13 -3
- package/dist/utils/browser/browser-settings.js.map +1 -1
- package/dist/utils/glmt-deprecation.d.ts.map +1 -1
- package/dist/utils/glmt-deprecation.js +1 -3
- package/dist/utils/glmt-deprecation.js.map +1 -1
- package/dist/web-server/index.d.ts.map +1 -1
- package/dist/web-server/index.js +0 -9
- package/dist/web-server/index.js.map +1 -1
- package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
- package/dist/web-server/middleware/auth-middleware.js +26 -4
- package/dist/web-server/middleware/auth-middleware.js.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts +10 -0
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.js +45 -13
- package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-local-proxy.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-local-proxy.js +25 -8
- package/dist/web-server/routes/cliproxy-local-proxy.js.map +1 -1
- package/dist/web-server/routes/cursor-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cursor-routes.js +6 -1
- package/dist/web-server/routes/cursor-routes.js.map +1 -1
- package/dist/web-server/routes/image-analysis-routes.d.ts.map +1 -1
- package/dist/web-server/routes/image-analysis-routes.js +7 -0
- package/dist/web-server/routes/image-analysis-routes.js.map +1 -1
- package/dist/web-server/routes/settings-routes.d.ts.map +1 -1
- package/dist/web-server/routes/settings-routes.js +10 -1
- package/dist/web-server/routes/settings-routes.js.map +1 -1
- package/dist/web-server/services/claude-extension-settings-service.d.ts.map +1 -1
- package/dist/web-server/services/claude-extension-settings-service.js +5 -1
- package/dist/web-server/services/claude-extension-settings-service.js.map +1 -1
- package/lib/mcp/ccs-browser-server.cjs +24 -13
- package/package.json +1 -1
- package/scripts/github/stable-release-issue-cleanup-lib.mjs +113 -0
- package/scripts/github/stable-release-issue-cleanup.mjs +134 -0
- package/dist/ui/assets/accounts-BPJltru3.js +0 -1
- package/dist/ui/assets/api-BxPN-zy4.js +0 -4
- package/dist/ui/assets/claude-extension-CWpjmIGt.js +0 -1
- package/dist/ui/assets/cliproxy-K6eBb5VO.js +0 -4
- package/dist/ui/assets/cliproxy-control-panel-Cz5r7kHP.js +0 -1
- package/dist/ui/assets/codex-0HdbW8NR.js +0 -30
- package/dist/ui/assets/index-BMoGhs28.css +0 -1
- package/dist/ui/assets/index-COt1pbk-.js +0 -1
- package/dist/ui/assets/proxy-status-widget-s1UWOE23.js +0 -1
- package/dist/ui/assets/updates-CDrm903n.js +0 -1
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.probeCursorRuntime = void 0;
|
|
4
4
|
const cursor_auth_1 = require("./cursor-auth");
|
|
5
5
|
const cursor_daemon_1 = require("./cursor-daemon");
|
|
6
|
+
const cursor_daemon_auth_1 = require("./cursor-daemon-auth");
|
|
6
7
|
const cursor_models_1 = require("./cursor-models");
|
|
7
8
|
const PROBE_PROMPT = 'Reply with OK only.';
|
|
8
9
|
const PROBE_TIMEOUT_MS = 15000;
|
|
@@ -103,14 +104,15 @@ async function probeCursorRuntime(config) {
|
|
|
103
104
|
error_type: 'authentication_error',
|
|
104
105
|
};
|
|
105
106
|
}
|
|
106
|
-
|
|
107
|
+
const daemonToken = (0, cursor_daemon_auth_1.getCursorDaemonToken)();
|
|
108
|
+
let daemonRunning = await (0, cursor_daemon_1.isDaemonRunning)(config.port, daemonToken);
|
|
107
109
|
if (!daemonRunning && config.auto_start) {
|
|
108
110
|
const startResult = await (0, cursor_daemon_1.startDaemon)({
|
|
109
111
|
port: config.port,
|
|
110
112
|
ghost_mode: config.ghost_mode,
|
|
111
113
|
});
|
|
112
114
|
if (!startResult.success) {
|
|
113
|
-
daemonRunning = await (0, cursor_daemon_1.isDaemonRunning)(config.port);
|
|
115
|
+
daemonRunning = await (0, cursor_daemon_1.isDaemonRunning)(config.port, daemonToken);
|
|
114
116
|
}
|
|
115
117
|
else {
|
|
116
118
|
daemonRunning = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-runtime-probe.js","sourceRoot":"","sources":["../../src/cursor/cursor-runtime-probe.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cursor-runtime-probe.js","sourceRoot":"","sources":["../../src/cursor/cursor-runtime-probe.ts"],"names":[],"mappings":"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"}
|
package/dist/cursor/types.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cursor/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cursor/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,mCAAmC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,UAAU,EAAE,aAAa,GAAG,QAAQ,CAAC;IACrC,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,oCAAoC;IACpC,aAAa,EAAE,OAAO,CAAC;IACvB,6CAA6C;IAC7C,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gCAAgC;IAChC,KAAK,EAAE,OAAO,CAAC;IACf,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iDAAiD;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mDAAmD;IACnD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,qDAAqD;IACrD,MAAM,CAAC,EACH,cAAc,GACd,oBAAoB,GACpB,iBAAiB,GACjB,wBAAwB,GACxB,sBAAsB,GACtB,sBAAsB,CAAC;IAC3B,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,gCAAgC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,eAAe;IACf,EAAE,EAAE,MAAM,CAAC;IACX,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,wCAAwC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
|
|
@@ -51,6 +51,22 @@ export interface ResolvedProfile {
|
|
|
51
51
|
/** ProfileDetector instance — Phase E account/settings flows need getAllProfiles() */
|
|
52
52
|
detector: InstanceType<typeof ProfileDetector>;
|
|
53
53
|
}
|
|
54
|
+
/**
|
|
55
|
+
* Decide whether a first token that has no matching profile is actually a bare
|
|
56
|
+
* Claude subcommand that should be forwarded through the default profile.
|
|
57
|
+
*
|
|
58
|
+
* Claude Code exposes subcommands like `claude agents`, `claude mcp`,
|
|
59
|
+
* `claude plugin`, `claude setup-token`. Invoked through CCS as `ccs agents`,
|
|
60
|
+
* `ccs mcp`, ... the first token is treated as a profile name, so profile
|
|
61
|
+
* resolution throws "profile not found". Instead, forward such tokens to
|
|
62
|
+
* `claude <subcommand>` under the default profile (matching `ccs default
|
|
63
|
+
* agents`), where the launcher already strips interactive-session args.
|
|
64
|
+
*
|
|
65
|
+
* Gated to the claude target — codex/droid run their own subcommand routing —
|
|
66
|
+
* and only reached on the profile-not-found path, so a real configured profile
|
|
67
|
+
* of the same name always wins.
|
|
68
|
+
*/
|
|
69
|
+
export declare function isBareClaudeSubcommandPassthrough(profile: string, args: string[]): boolean;
|
|
54
70
|
/**
|
|
55
71
|
* Resolve profile detection, target type, adapter, binary, and per-target arg normalization.
|
|
56
72
|
*
|
|
@@ -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;
|
|
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;AAWxF,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;AAMD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAQ1F;AAYD;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,wBAAwB,GAC5B,OAAO,CAAC,eAAe,CAAC,CA0R1B"}
|
|
@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
36
36
|
return result;
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.resolveProfileAndTarget = void 0;
|
|
39
|
+
exports.resolveProfileAndTarget = exports.isBareClaudeSubcommandPassthrough = void 0;
|
|
40
40
|
const claude_detector_1 = require("../utils/claude-detector");
|
|
41
41
|
const config_manager_1 = require("../utils/config-manager");
|
|
42
42
|
const config_loader_facade_1 = require("../config/config-loader-facade");
|
|
@@ -50,11 +50,40 @@ const target_resolver_1 = require("../targets/target-resolver");
|
|
|
50
50
|
const droid_reasoning_runtime_1 = require("../targets/droid-reasoning-runtime");
|
|
51
51
|
const droid_command_router_1 = require("../targets/droid-command-router");
|
|
52
52
|
const cliproxy_profile_bridge_1 = require("../api/services/cliproxy-profile-bridge");
|
|
53
|
+
const claude_subcommand_detector_1 = require("../utils/claude-subcommand-detector");
|
|
53
54
|
const environment_builder_1 = require("./environment-builder");
|
|
54
55
|
const cli_argument_parser_1 = require("./cli-argument-parser");
|
|
55
56
|
function usesImplicitDefaultProfile(cleanArgs) {
|
|
56
57
|
return cleanArgs.length === 0 || cleanArgs[0]?.startsWith('-') === true;
|
|
57
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Decide whether a first token that has no matching profile is actually a bare
|
|
61
|
+
* Claude subcommand that should be forwarded through the default profile.
|
|
62
|
+
*
|
|
63
|
+
* Claude Code exposes subcommands like `claude agents`, `claude mcp`,
|
|
64
|
+
* `claude plugin`, `claude setup-token`. Invoked through CCS as `ccs agents`,
|
|
65
|
+
* `ccs mcp`, ... the first token is treated as a profile name, so profile
|
|
66
|
+
* resolution throws "profile not found". Instead, forward such tokens to
|
|
67
|
+
* `claude <subcommand>` under the default profile (matching `ccs default
|
|
68
|
+
* agents`), where the launcher already strips interactive-session args.
|
|
69
|
+
*
|
|
70
|
+
* Gated to the claude target — codex/droid run their own subcommand routing —
|
|
71
|
+
* and only reached on the profile-not-found path, so a real configured profile
|
|
72
|
+
* of the same name always wins.
|
|
73
|
+
*/
|
|
74
|
+
function isBareClaudeSubcommandPassthrough(profile, args) {
|
|
75
|
+
if (profile === 'default')
|
|
76
|
+
return false;
|
|
77
|
+
if ((0, claude_subcommand_detector_1.getClaudeSubcommandName)([profile]) === null)
|
|
78
|
+
return false;
|
|
79
|
+
try {
|
|
80
|
+
return (0, target_resolver_1.resolveTargetType)(args) === 'claude';
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
exports.isBareClaudeSubcommandPassthrough = isBareClaudeSubcommandPassthrough;
|
|
58
87
|
function buildNativeCodexDefaultProfile() {
|
|
59
88
|
return {
|
|
60
89
|
type: 'default',
|
|
@@ -88,8 +117,25 @@ async function resolveProfileAndTarget(ctx) {
|
|
|
88
117
|
const detector = new ProfileDetectorClass();
|
|
89
118
|
// Detect profile (strip --target flags before profile detection)
|
|
90
119
|
const cleanArgs = (0, target_resolver_1.stripTargetFlag)(args);
|
|
91
|
-
const
|
|
92
|
-
let
|
|
120
|
+
const detected = (0, cli_argument_parser_1.detectProfile)(cleanArgs);
|
|
121
|
+
let profile = detected.profile;
|
|
122
|
+
let remainingArgs = detected.remainingArgs;
|
|
123
|
+
let profileInfo;
|
|
124
|
+
try {
|
|
125
|
+
profileInfo = detector.detectProfileType(profile);
|
|
126
|
+
}
|
|
127
|
+
catch (profileError) {
|
|
128
|
+
// Bare Claude subcommand passthrough: forward `ccs agents`, `ccs mcp`, ...
|
|
129
|
+
// through the default profile instead of failing as an unknown profile.
|
|
130
|
+
if (isBareClaudeSubcommandPassthrough(profile, args)) {
|
|
131
|
+
remainingArgs = [profile, ...remainingArgs];
|
|
132
|
+
profile = 'default';
|
|
133
|
+
profileInfo = detector.detectProfileType(profile);
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
throw profileError;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
93
139
|
let resolvedTarget;
|
|
94
140
|
try {
|
|
95
141
|
resolvedTarget = (0, target_resolver_1.resolveTargetType)(args, profileInfo.target ? { target: profileInfo.target } : undefined);
|
|
@@ -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,SAAS,0BAA0B,CAAC,SAAmB;IACrD,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AAC1E,CAAC;AAED,SAAS,8BAA8B;IACrC,OAAO;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,8EAA8E;KACxF,CAAC;AACJ,CAAC;AAED,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,
|
|
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,oFAA8E;AAC9E,+DAA2E;AAC3E,+DAO+B;AA0C/B,SAAS,0BAA0B,CAAC,SAAmB;IACrD,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AAC1E,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,iCAAiC,CAAC,OAAe,EAAE,IAAc;IAC/E,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,IAAA,oDAAuB,EAAC,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,CAAC;QACH,OAAO,IAAA,mCAAiB,EAAC,IAAI,CAAC,KAAK,QAAQ,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AARD,8EAQC;AAED,SAAS,8BAA8B;IACrC,OAAO;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,8EAA8E;KACxF,CAAC;AACJ,CAAC;AAED,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,QAAQ,GAAG,IAAA,mCAAa,EAAC,SAAS,CAAC,CAAC;IAC1C,IAAI,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAC/B,IAAI,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;IAC3C,IAAI,WAAmC,CAAC;IACxC,IAAI,CAAC;QACH,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,2EAA2E;QAC3E,wEAAwE;QACxE,IAAI,iCAAiC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;YACrD,aAAa,GAAG,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC;YAC5C,OAAO,GAAG,SAAS,CAAC;YACpB,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,CAAC;QACrB,CAAC;IACH,CAAC;IAED,IAAI,cAAoD,CAAC;IACzD,IAAI,CAAC;QACH,cAAc,GAAG,IAAA,mCAAiB,EAChC,IAAI,EACJ,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAChE,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAE,KAAe,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,0EAA0E;QAC1E,MAAM,KAAK,CAAC;IACd,CAAC;IAED,IAAI,cAAc,KAAK,OAAO,IAAI,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC;QACxE,WAAW,GAAG,8BAA8B,EAAE,CAAC;IACjD,CAAC;IAED,8EAA8E;IAC9E,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAC;IACvC,IAAI,cAAc,KAAK,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;QACjD,MAAM,4BAAY,CAAC,kBAAkB,EAAE,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,SAAS,GAAG,YAAY,IAAI,EAAE,CAAC;IAErC,0CAA0C;IAC1C,MAAM,aAAa,GACjB,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAS,EAAC,cAAc,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,IAAI,oBAAwC,CAAC;IAC7C,IAAI,gBAA6D,CAAC;IAClE,IAAI,sBAAoF,CAAC;IAEzF,6EAA6E;IAC7E,oFAAoF;IACpF,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,iCAAiC,cAAc,GAAG,CAAC,CAAC,CAAC;YACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,WAAW,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACpC,oBAAoB,GAAG,WAAW,CAAC,YAAY;gBAC7C,CAAC,CAAC,IAAA,oBAAU,EAAC,WAAW,CAAC,YAAY,CAAC;gBACtC,CAAC,CAAC,IAAA,gCAAe,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACtC,gBAAgB,GAAG,IAAA,mCAAY,EAAC,oBAAoB,CAAC,CAAC;YACtD,sBAAsB,GAAG,IAAA,uDAA6B,EAAC,gBAAgB,CAAC,CAAC;YACzE,MAAM,aAAa,GAAG,IAAA,4CAAkC,EAAC;gBACvD,MAAM,EAAE,cAAc;gBACtB,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,sBAAsB,EAAE,sBAAsB,EAAE,QAAQ,IAAI,IAAI;aACjE,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EACF,aAAa,CAAC,MAAM,IAAI,GAAG,aAAa,CAAC,WAAW,iCAAiC,CACtF,CACF,CAAC;gBACF,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;oBAC7B,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,sFAAsF;YACtF,0DAA0D;YAC1D,MAAM,aAAa,GAAG,IAAA,4CAAkC,EAAC;gBACvD,MAAM,EAAE,cAAc;gBACtB,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,gBAAgB,EAAE,WAAW,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;gBACpF,WAAW,EAAE,WAAW,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5F,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EACF,aAAa,CAAC,MAAM,IAAI,GAAG,aAAa,CAAC,WAAW,iCAAiC,CACtF,CACF,CAAC;gBACF,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;oBAC7B,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACnC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClD,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,GAAG,aAAa,CAAC,WAAW,wCAAwC,CAAC,CAAC,CAAC;gBAC1F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,0EAA0E;YAC1E,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;gBACzD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBACtC,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EACF,GAAG,aAAa,CAAC,WAAW,oEAAoE,CACjG,CACF,CAAC;oBACF,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,8DAA8D,CAAC,CAAC,CAAC;oBACpF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,gFAAgF;IAChF,MAAM,gBAAgB,GAA4B,aAAa,EAAE,YAAY,EAAE,IAAI,IAAI,CAAC;IACxF,MAAM,aAAa,GAAG,IAAA,uCAAgB,GAAE,CAAC;IACzC,MAAM,kBAAkB,GACtB,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,+CAAqC,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjG,MAAM,2BAA2B,GAAG,IAAA,wDAAkC,EACpE,cAAc,EACd,qBAAqB,CACtB,CAAC;IACF,MAAM,qBAAqB,GACzB,cAAc,KAAK,QAAQ;QACzB,CAAC,CAAC,IAAA,gCAAsB,EACpB;YACE,OAAO,EAAE,kBAAkB,EAAE,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO;YACpE,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM;SACpC,EACD,qBAAqB,CACtB;QACH,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,oBAAoB,GACxB,cAAc,KAAK,OAAO;QACxB,CAAC,CAAC,IAAA,gCAAsB,EAAC,aAAa,CAAC,KAAK,EAAE,qBAAqB,CAAC;QACpE,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,6BAA6B,GACjC,cAAc,KAAK,QAAQ,IAAI,qBAAqB;QAClD,CAAC,CAAC,IAAA,0CAAgC,EAAC,uBAAuB,EAAE,qBAAqB,CAAC;QAClF,CAAC,CAAC,cAAc,KAAK,OAAO,IAAI,oBAAoB;YAClD,CAAC,CAAC,IAAA,0CAAgC,EAAC,qBAAqB,EAAE,oBAAoB,CAAC;YAC/E,CAAC,CAAC,SAAS,CAAC;IAClB,IAAI,6BAA6B,EAAE,CAAC;QAClC,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,6BAA6B,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,cAAc,KAAK,QAAQ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrD,MAAM,WAAW,GAAG,aAAa,EAAE,WAAW,IAAI,cAAc,CAAC;QACjE,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,GAAG,WAAW,iBAAiB,CAAC,CAAC,CAAC;QACrD,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,gCAAgC,CAAC,CAAC,CAAC;QACxD,CAAC;aAAM,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;YACtC,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,mDAAmD,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,wFAAwF;IACxF,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC9C,MAAM,cAAc,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7F,MAAM,IAAA,6BAAmB,EAAC,cAAc,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,IAAA,SAAI,EAAC,4BAA6B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IAED,oCAAoC;IACpC,IAAI,mBAAmB,GAAG,aAAa,CAAC;IACxC,IAAI,wBAAqD,CAAC;IAC1D,IAAI,yBAAyB,GAAG,aAAa,CAAC;IAE9C,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAA,4CAAqB,EAAC,aAAa,CAAC,CAAC;YACxD,mBAAmB,GAAG,UAAU,CAAC,YAAY,CAAC;YAE9C,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACtC,MAAM,OAAO,GAAG,IAAA,kDAA4B,EAAC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;gBACzF,mBAAmB,GAAG,OAAO,CAAC,yBAAyB,CAAC;gBACxD,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,IAAI,UAAU,CAAC,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrD,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EACF,kEAAkE,UAAU,CAAC,sBAAsB,IAAI,cAAc,EAAE,CACxH,CACF,CAAC;gBACJ,CAAC;gBACD,IAAI,UAAU,CAAC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBACzD,OAAO,CAAC,KAAK,CACX,IAAA,SAAI,EAAC,yEAAyE,CAAC,CAChF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,iDAAuB,IAAI,KAAK,YAAY,8CAAuB,EAAE,CAAC;gBACzF,IAAA,uDAAiC,EAAC,KAAK,CAAC,OAAO,EAAE;oBAC/C,gBAAgB,EAAE,+BAA+B;oBACjD,uBAAuB,EAAE,IAAI;iBAC9B,CAAC,CAAC;YACL,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;SAAM,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAA,kDAA4B,EAAC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;YACzF,mBAAmB,GAAG,OAAO,CAAC,yBAAyB,CAAC;YACxD,MAAM,mBAAmB,GAAG,IAAA,4DAAsC,EAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAC9F,IAAI,OAAO,CAAC,iBAAiB,KAAK,SAAS,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACpE,IAAI,OAAO,CAAC,eAAe,KAAK,MAAM,EAAE,CAAC;oBACvC,MAAM,IAAI,iDAAuB,CAC/B,iFAAiF,EACjF,UAAU,CACX,CAAC;gBACJ,CAAC;gBACD,wBAAwB,GAAG,SAAS,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,wBAAwB,GAAG,mBAAmB,CAAC;YACjD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,iDAAuB,EAAE,CAAC;gBAC7C,IAAA,uDAAiC,EAAC,KAAK,CAAC,OAAO,EAAE;oBAC/C,gBAAgB,EAAE,+BAA+B;iBAClD,CAAC,CAAC;YACL,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;SAAM,IAAI,cAAc,KAAK,QAAQ,IAAI,IAAA,uDAAiC,EAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9F,yBAAyB,GAAG,IAAA,qDAA+B,EAAC,aAAa,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO;QACL,OAAO;QACP,aAAa;QACb,WAAW;QACX,cAAc;QACd,SAAS;QACT,aAAa;QACb,gBAAgB;QAChB,oBAAoB;QACpB,gBAAgB;QAChB,sBAAsB;QACtB,mBAAmB;QACnB,yBAAyB;QACzB,wBAAwB;QACxB,2BAA2B;QAC3B,qBAAqB;QACrB,oBAAoB;QACpB,kBAAkB;QAClB,QAAQ;KACT,CAAC;AACJ,CAAC;AA5RD,0DA4RC"}
|
|
@@ -5,6 +5,7 @@ export declare const DOCKER_LEGACY_API_KEY = "ccs-internal-managed";
|
|
|
5
5
|
export declare const DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS = 14;
|
|
6
6
|
export declare const DOCKER_LEGACY_KEY_GRACE_ENV = "CCS_DOCKER_LEGACY_KEY_GRACE_DAYS";
|
|
7
7
|
export declare const DOCKER_RESTORE_LEGACY_KEY_ENV = "CCS_DOCKER_RESTORE_LEGACY_API_KEY";
|
|
8
|
+
export declare const DOCKER_ENABLE_LEGACY_KEY_AUTH_ENV = "CCS_DOCKER_ENABLE_LEGACY_KEY_AUTH";
|
|
8
9
|
export interface DockerLegacyKeyGrace {
|
|
9
10
|
legacyKey: string;
|
|
10
11
|
replacementKey: string;
|
|
@@ -35,6 +36,7 @@ export declare function getDockerBootstrapStatePath(): string;
|
|
|
35
36
|
export declare function parseDockerLegacyKeyGraceDays(env?: NodeJS.ProcessEnv): number;
|
|
36
37
|
export declare function isLikelyDockerGeneratedApiKey(value: string | undefined): boolean;
|
|
37
38
|
export declare function shouldRestoreDockerLegacyApiKey(env?: NodeJS.ProcessEnv): boolean;
|
|
39
|
+
export declare function shouldEnableDockerLegacyKeyAuth(env?: NodeJS.ProcessEnv): boolean;
|
|
38
40
|
export declare function readDockerBootstrapState(): DockerBootstrapStateReadResult;
|
|
39
41
|
export declare function writeDockerBootstrapState(state: DockerBootstrapState): void;
|
|
40
42
|
export declare function createDockerBootstrapState(apiKey: string | undefined, now?: Date): DockerBootstrapState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-key-rotation.d.ts","sourceRoot":"","sources":["../../src/docker/docker-key-rotation.ts"],"names":[],"mappings":";;AAIA,eAAO,MAAM,+BAA+B,iCAAiC,CAAC;AAC9E,eAAO,MAAM,qBAAqB,yBAAyB,CAAC;AAC5D,eAAO,MAAM,oCAAoC,KAAK,CAAC;AACvD,eAAO,MAAM,2BAA2B,qCAAqC,CAAC;AAC9E,eAAO,MAAM,6BAA6B,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"docker-key-rotation.d.ts","sourceRoot":"","sources":["../../src/docker/docker-key-rotation.ts"],"names":[],"mappings":";;AAIA,eAAO,MAAM,+BAA+B,iCAAiC,CAAC;AAC9E,eAAO,MAAM,qBAAqB,yBAAyB,CAAC;AAC5D,eAAO,MAAM,oCAAoC,KAAK,CAAC;AACvD,eAAO,MAAM,2BAA2B,qCAAqC,CAAC;AAC9E,eAAO,MAAM,6BAA6B,sCAAsC,CAAC;AACjF,eAAO,MAAM,iCAAiC,sCAAsC,CAAC;AAKrF,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,oBAAoB,CAAC;CACvC;AAED,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACpC;AAED,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AAED,wBAAgB,6BAA6B,CAAC,GAAG,oBAAc,GAAG,MAAM,CAYvE;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEhF;AAED,wBAAgB,+BAA+B,CAAC,GAAG,oBAAc,GAAG,OAAO,CAE1E;AAED,wBAAgB,+BAA+B,CAAC,GAAG,oBAAc,GAAG,OAAO,CAE1E;AAED,wBAAgB,wBAAwB,IAAI,8BAA8B,CAezE;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAM3E;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,OAAa,GACf,oBAAoB,CAMtB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,oBAAoB,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,OAAa,EAChB,SAAS,SAAkC,GAC1C,oBAAoB,CAWtB;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,oBAAoB,GAAG,IAAI,EAClC,GAAG,OAAa,GACf,OAAO,CAQT;AAED,wBAAgB,4BAA4B,CAAC,GAAG,OAAa,GAAG,MAAM,EAAE,CAWvE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAQ/E;AAED,wBAAgB,0BAA0B,CAAC,GAAG,OAAa,GAAG,uBAAuB,CAapF;AAED,wBAAgB,6BAA6B,CAAC,MAAM,0BAA+B,GAAG,MAAM,CAe3F;AAED,wBAAgB,yBAAyB,CAAC,GAAG,OAAa,GAAG,uBAAuB,CAkBnF"}
|
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.finalizeDockerKeyRotation = exports.renderDockerKeyRotationBanner = exports.getDockerKeyRotationStatus = exports.maskDockerApiKey = exports.getActiveDockerLegacyApiKeys = exports.isDockerLegacyKeyGraceActive = exports.addLegacyKeyGrace = exports.createDockerBootstrapState = exports.writeDockerBootstrapState = exports.readDockerBootstrapState = exports.shouldRestoreDockerLegacyApiKey = exports.isLikelyDockerGeneratedApiKey = exports.parseDockerLegacyKeyGraceDays = exports.getDockerBootstrapStatePath = exports.DOCKER_RESTORE_LEGACY_KEY_ENV = exports.DOCKER_LEGACY_KEY_GRACE_ENV = exports.DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS = exports.DOCKER_LEGACY_API_KEY = exports.DOCKER_BOOTSTRAP_STATE_FILENAME = void 0;
|
|
26
|
+
exports.finalizeDockerKeyRotation = exports.renderDockerKeyRotationBanner = exports.getDockerKeyRotationStatus = exports.maskDockerApiKey = exports.getActiveDockerLegacyApiKeys = exports.isDockerLegacyKeyGraceActive = exports.addLegacyKeyGrace = exports.createDockerBootstrapState = exports.writeDockerBootstrapState = exports.readDockerBootstrapState = exports.shouldEnableDockerLegacyKeyAuth = exports.shouldRestoreDockerLegacyApiKey = exports.isLikelyDockerGeneratedApiKey = exports.parseDockerLegacyKeyGraceDays = exports.getDockerBootstrapStatePath = exports.DOCKER_ENABLE_LEGACY_KEY_AUTH_ENV = exports.DOCKER_RESTORE_LEGACY_KEY_ENV = exports.DOCKER_LEGACY_KEY_GRACE_ENV = exports.DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS = exports.DOCKER_LEGACY_API_KEY = exports.DOCKER_BOOTSTRAP_STATE_FILENAME = void 0;
|
|
27
27
|
const fs = __importStar(require("fs"));
|
|
28
28
|
const path = __importStar(require("path"));
|
|
29
29
|
const config_loader_facade_1 = require("../config/config-loader-facade");
|
|
@@ -32,6 +32,7 @@ exports.DOCKER_LEGACY_API_KEY = 'ccs-internal-managed';
|
|
|
32
32
|
exports.DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS = 14;
|
|
33
33
|
exports.DOCKER_LEGACY_KEY_GRACE_ENV = 'CCS_DOCKER_LEGACY_KEY_GRACE_DAYS';
|
|
34
34
|
exports.DOCKER_RESTORE_LEGACY_KEY_ENV = 'CCS_DOCKER_RESTORE_LEGACY_API_KEY';
|
|
35
|
+
exports.DOCKER_ENABLE_LEGACY_KEY_AUTH_ENV = 'CCS_DOCKER_ENABLE_LEGACY_KEY_AUTH';
|
|
35
36
|
const DAY_MS = 24 * 60 * 60 * 1000;
|
|
36
37
|
const STATE_VERSION = 1;
|
|
37
38
|
function getDockerBootstrapStatePath() {
|
|
@@ -58,6 +59,10 @@ function shouldRestoreDockerLegacyApiKey(env = process.env) {
|
|
|
58
59
|
return env[exports.DOCKER_RESTORE_LEGACY_KEY_ENV] === '1';
|
|
59
60
|
}
|
|
60
61
|
exports.shouldRestoreDockerLegacyApiKey = shouldRestoreDockerLegacyApiKey;
|
|
62
|
+
function shouldEnableDockerLegacyKeyAuth(env = process.env) {
|
|
63
|
+
return env[exports.DOCKER_ENABLE_LEGACY_KEY_AUTH_ENV] === '1';
|
|
64
|
+
}
|
|
65
|
+
exports.shouldEnableDockerLegacyKeyAuth = shouldEnableDockerLegacyKeyAuth;
|
|
61
66
|
function readDockerBootstrapState() {
|
|
62
67
|
const statePath = getDockerBootstrapStatePath();
|
|
63
68
|
if (!fs.existsSync(statePath)) {
|
|
@@ -114,6 +119,9 @@ function isDockerLegacyKeyGraceActive(state, now = new Date()) {
|
|
|
114
119
|
}
|
|
115
120
|
exports.isDockerLegacyKeyGraceActive = isDockerLegacyKeyGraceActive;
|
|
116
121
|
function getActiveDockerLegacyApiKeys(now = new Date()) {
|
|
122
|
+
if (!shouldEnableDockerLegacyKeyAuth()) {
|
|
123
|
+
return [];
|
|
124
|
+
}
|
|
117
125
|
const { state } = readDockerBootstrapState();
|
|
118
126
|
if (!isDockerLegacyKeyGraceActive(state, now)) {
|
|
119
127
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-key-rotation.js","sourceRoot":"","sources":["../../src/docker/docker-key-rotation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,yEAAsF;AAEzE,QAAA,+BAA+B,GAAG,8BAA8B,CAAC;AACjE,QAAA,qBAAqB,GAAG,sBAAsB,CAAC;AAC/C,QAAA,oCAAoC,GAAG,EAAE,CAAC;AAC1C,QAAA,2BAA2B,GAAG,kCAAkC,CAAC;AACjE,QAAA,6BAA6B,GAAG,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"docker-key-rotation.js","sourceRoot":"","sources":["../../src/docker/docker-key-rotation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-parser.d.ts","sourceRoot":"","sources":["../../src/glmt/sse-parser.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;GAeG;;;AAEH,UAAU,gBAAgB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,oBAAoB,CAAU;
|
|
1
|
+
{"version":3,"file":"sse-parser.d.ts","sourceRoot":"","sources":["../../src/glmt/sse-parser.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;GAeG;;;AAEH,UAAU,gBAAgB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,oBAAoB,CAAU;IACtC,OAAO,CAAC,SAAS,CAAU;gBAEf,OAAO,GAAE,gBAAqB;IAQ1C;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAAE;IAqFzC;;OAEG;IACH,KAAK,IAAI,IAAI;CAKd"}
|
package/dist/glmt/sse-parser.js
CHANGED
|
@@ -24,6 +24,7 @@ class SSEParser {
|
|
|
24
24
|
this.eventCount = 0;
|
|
25
25
|
this.maxBufferSize = options.maxBufferSize || 1024 * 1024; // 1MB default
|
|
26
26
|
this.throwOnMalformedJson = options.throwOnMalformedJson === true;
|
|
27
|
+
this.pendingCR = false;
|
|
27
28
|
}
|
|
28
29
|
/**
|
|
29
30
|
* Parse chunk and extract SSE events
|
|
@@ -31,7 +32,17 @@ class SSEParser {
|
|
|
31
32
|
* @returns Array of parsed events
|
|
32
33
|
*/
|
|
33
34
|
parse(chunk) {
|
|
34
|
-
|
|
35
|
+
let normalizedChunk = chunk.toString();
|
|
36
|
+
if (this.pendingCR) {
|
|
37
|
+
if (normalizedChunk.startsWith('\n')) {
|
|
38
|
+
normalizedChunk = normalizedChunk.slice(1);
|
|
39
|
+
}
|
|
40
|
+
this.pendingCR = false;
|
|
41
|
+
}
|
|
42
|
+
const endsWithCR = normalizedChunk.endsWith('\r');
|
|
43
|
+
normalizedChunk = normalizedChunk.replace(/\r\n?/g, '\n');
|
|
44
|
+
this.pendingCR = endsWithCR;
|
|
45
|
+
this.buffer += normalizedChunk;
|
|
35
46
|
// C-01 Fix: Prevent unbounded buffer growth (DoS protection)
|
|
36
47
|
if (this.buffer.length > this.maxBufferSize) {
|
|
37
48
|
throw new Error(`SSE buffer exceeded ${this.maxBufferSize} bytes (DoS protection)`);
|
|
@@ -96,6 +107,7 @@ class SSEParser {
|
|
|
96
107
|
reset() {
|
|
97
108
|
this.buffer = '';
|
|
98
109
|
this.eventCount = 0;
|
|
110
|
+
this.pendingCR = false;
|
|
99
111
|
}
|
|
100
112
|
}
|
|
101
113
|
exports.SSEParser = SSEParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-parser.js","sourceRoot":"","sources":["../../src/glmt/sse-parser.ts"],"names":[],"mappings":";;AAEA;;;;;;;;;;;;;;;GAeG;;;AAeH,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"sse-parser.js","sourceRoot":"","sources":["../../src/glmt/sse-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-route.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"messages-route.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAuKnE,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,GAAG,MAAM,GAAG,IAAI,CAmB1F;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACjC,aAAa,EAAE,MAAM,GACpB,OAAO,CAET;AAmDD,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GACrC,MAAM,IAAI,CA0BZ;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,EAClC,iBAAiB,EAAE,MAAM,EACzB,kBAAkB,CAAC,EAAE,UAAU,GAC9B,OAAO,CAAC,IAAI,CAAC,CA+Jf;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,GACjC,IAAI,CAWN"}
|
|
@@ -29,11 +29,77 @@ function isDirectOpenAIReasoningChatModel(profile, model) {
|
|
|
29
29
|
typeof model === 'string' &&
|
|
30
30
|
DIRECT_OPENAI_REASONING_CHAT_MODEL.test(model.trim().toLowerCase()));
|
|
31
31
|
}
|
|
32
|
-
function
|
|
33
|
-
|
|
32
|
+
function isMiniMaxOpenAICompatProfile(profile) {
|
|
33
|
+
try {
|
|
34
|
+
return new URL(profile.baseUrl).hostname.toLowerCase().includes('minimax');
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function prependTextToContent(content, text) {
|
|
41
|
+
if (Array.isArray(content)) {
|
|
42
|
+
return [{ type: 'text', text }, ...content];
|
|
43
|
+
}
|
|
44
|
+
if (typeof content === 'string') {
|
|
45
|
+
return `${text}\n\n${content}`;
|
|
46
|
+
}
|
|
47
|
+
return text;
|
|
48
|
+
}
|
|
49
|
+
function extractTextContent(content) {
|
|
50
|
+
if (typeof content === 'string') {
|
|
51
|
+
return content;
|
|
52
|
+
}
|
|
53
|
+
if (!Array.isArray(content)) {
|
|
54
|
+
return '';
|
|
55
|
+
}
|
|
56
|
+
return content
|
|
57
|
+
.filter((part) => part.type === 'text')
|
|
58
|
+
.map((part) => part.text)
|
|
59
|
+
.join('\n\n');
|
|
60
|
+
}
|
|
61
|
+
function shapeMiniMaxChatPayload(payload) {
|
|
62
|
+
const systemMessages = [];
|
|
63
|
+
let removedSystemMessage = false;
|
|
64
|
+
const messages = payload.messages.filter((message) => {
|
|
65
|
+
if (message.role !== 'system') {
|
|
66
|
+
return true;
|
|
67
|
+
}
|
|
68
|
+
removedSystemMessage = true;
|
|
69
|
+
const systemText = extractTextContent(message.content).trim();
|
|
70
|
+
if (systemText.length > 0) {
|
|
71
|
+
systemMessages.push(systemText);
|
|
72
|
+
}
|
|
73
|
+
return false;
|
|
74
|
+
});
|
|
75
|
+
if (!removedSystemMessage) {
|
|
34
76
|
return payload;
|
|
35
77
|
}
|
|
36
|
-
|
|
78
|
+
if (systemMessages.length === 0) {
|
|
79
|
+
return { ...payload, messages };
|
|
80
|
+
}
|
|
81
|
+
const systemPrefix = systemMessages.join('\n\n');
|
|
82
|
+
const firstUserIndex = messages.findIndex((message) => message.role === 'user');
|
|
83
|
+
if (firstUserIndex >= 0) {
|
|
84
|
+
messages[firstUserIndex] = {
|
|
85
|
+
...messages[firstUserIndex],
|
|
86
|
+
content: prependTextToContent(messages[firstUserIndex].content, systemPrefix),
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
messages.unshift({ role: 'user', content: systemPrefix });
|
|
91
|
+
}
|
|
92
|
+
return { ...payload, messages };
|
|
93
|
+
}
|
|
94
|
+
function shapeUpstreamChatPayload(payload, profile) {
|
|
95
|
+
let shaped = payload;
|
|
96
|
+
if (isMiniMaxOpenAICompatProfile(profile)) {
|
|
97
|
+
shaped = shapeMiniMaxChatPayload(shaped);
|
|
98
|
+
}
|
|
99
|
+
if (!isDirectOpenAIReasoningChatModel(profile, shaped.model)) {
|
|
100
|
+
return shaped;
|
|
101
|
+
}
|
|
102
|
+
shaped = { ...shaped };
|
|
37
103
|
if (shaped.max_tokens !== undefined) {
|
|
38
104
|
shaped.max_completion_tokens = shaped.max_tokens;
|
|
39
105
|
delete shaped.max_tokens;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-route.js","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messages-route.js","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-transformer.d.ts","sourceRoot":"","sources":["../../../src/proxy/transformers/request-transformer.ts"],"names":[],"mappings":"AAwEA,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED,KAAK,iBAAiB,GAAG,cAAc,GAAG,eAAe,CAAC;AAE1D,UAAU,aAAa;IACrB,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC/C,OAAO,EAAE,MAAM,GAAG,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAC7C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;YACb,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACrC,CAAC;KACH,CAAC,CAAC;IACH,WAAW,CAAC,EACR,MAAM,GACN,MAAM,GACN,UAAU,GACV;QACE,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;IACN,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;
|
|
1
|
+
{"version":3,"file":"request-transformer.d.ts","sourceRoot":"","sources":["../../../src/proxy/transformers/request-transformer.ts"],"names":[],"mappings":"AAwEA,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED,KAAK,iBAAiB,GAAG,cAAc,GAAG,eAAe,CAAC;AAE1D,UAAU,aAAa;IACrB,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC/C,OAAO,EAAE,MAAM,GAAG,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAC7C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;YACb,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACrC,CAAC;KACH,CAAC,CAAC;IACH,WAAW,CAAC,EACR,MAAM,GACN,MAAM,GACN,UAAU,GACV;QACE,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;IACN,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAgkBD,qBAAa,uBAAuB;IAClC,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,kBAAkB;CA8B5C"}
|
|
@@ -240,13 +240,20 @@ function transformMessages(messagesValue) {
|
|
|
240
240
|
messagesValue.forEach((message, messageIndex) => {
|
|
241
241
|
const parsedMessage = assertObject(message, `messages[${messageIndex}]`);
|
|
242
242
|
const role = parsedMessage.role;
|
|
243
|
-
if (role !== 'user' && role !== 'assistant') {
|
|
244
|
-
throw new Error(`messages[${messageIndex}].role must be "user" or "assistant"`);
|
|
243
|
+
if (role !== 'system' && role !== 'user' && role !== 'assistant') {
|
|
244
|
+
throw new Error(`messages[${messageIndex}].role must be "system", "user", or "assistant"`);
|
|
245
245
|
}
|
|
246
246
|
if (pendingToolUseIds && pendingToolUseIds.size > 0 && role !== 'user') {
|
|
247
247
|
throw new Error(`messages[${messageIndex}].role must be "user" with tool_result blocks after assistant tool_use`);
|
|
248
248
|
}
|
|
249
249
|
const content = parsedMessage.content;
|
|
250
|
+
if (role === 'system') {
|
|
251
|
+
translatedMessages.push({
|
|
252
|
+
role: 'system',
|
|
253
|
+
content: flattenTextContent(content, `messages[${messageIndex}].content`),
|
|
254
|
+
});
|
|
255
|
+
return;
|
|
256
|
+
}
|
|
250
257
|
if (typeof content === 'string') {
|
|
251
258
|
if (pendingToolUseIds && pendingToolUseIds.size > 0) {
|
|
252
259
|
throw new Error(`messages[${messageIndex}].content must start with tool_result blocks for pending tool_use ids`);
|