@kaitranntt/ccs 7.78.1 → 7.79.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/ccsxp-runtime.d.ts +1 -0
- package/dist/bin/ccsxp-runtime.d.ts.map +1 -1
- package/dist/bin/ccsxp-runtime.js +2 -0
- package/dist/bin/ccsxp-runtime.js.map +1 -1
- package/dist/channels/official-channels-runtime.d.ts.map +1 -1
- package/dist/channels/official-channels-runtime.js +11 -0
- package/dist/channels/official-channels-runtime.js.map +1 -1
- package/dist/channels/official-channels-store.d.ts.map +1 -1
- package/dist/channels/official-channels-store.js +3 -4
- package/dist/channels/official-channels-store.js.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.js +21 -0
- package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
- package/dist/cliproxy/auth/oauth-start-failure-guidance.d.ts +22 -0
- package/dist/cliproxy/auth/oauth-start-failure-guidance.d.ts.map +1 -0
- package/dist/cliproxy/auth/oauth-start-failure-guidance.js +82 -0
- package/dist/cliproxy/auth/oauth-start-failure-guidance.js.map +1 -0
- package/dist/cliproxy/executor/claude-launcher.d.ts.map +1 -1
- package/dist/cliproxy/executor/claude-launcher.js +22 -9
- package/dist/cliproxy/executor/claude-launcher.js.map +1 -1
- package/dist/cliproxy/executor/session-bridge.d.ts +16 -1
- package/dist/cliproxy/executor/session-bridge.d.ts.map +1 -1
- package/dist/cliproxy/executor/session-bridge.js +86 -54
- package/dist/cliproxy/executor/session-bridge.js.map +1 -1
- package/dist/commands/config-command-options.d.ts.map +1 -1
- package/dist/commands/config-command-options.js +4 -2
- package/dist/commands/config-command-options.js.map +1 -1
- package/dist/commands/config-command.js +1 -1
- package/dist/commands/config-command.js.map +1 -1
- package/dist/commands/config-dashboard-host.d.ts +1 -0
- package/dist/commands/config-dashboard-host.d.ts.map +1 -1
- package/dist/commands/config-dashboard-host.js +2 -1
- package/dist/commands/config-dashboard-host.js.map +1 -1
- package/dist/dispatcher/flows/settings-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/settings-flow.js +21 -10
- package/dist/dispatcher/flows/settings-flow.js.map +1 -1
- package/dist/dispatcher/profile-resolver.d.ts.map +1 -1
- package/dist/dispatcher/profile-resolver.js +14 -1
- package/dist/dispatcher/profile-resolver.js.map +1 -1
- package/dist/management/checks/profile-check.d.ts.map +1 -1
- package/dist/management/checks/profile-check.js +2 -3
- package/dist/management/checks/profile-check.js.map +1 -1
- package/dist/management/checks/symlink-check.d.ts.map +1 -1
- package/dist/management/checks/symlink-check.js +2 -3
- package/dist/management/checks/symlink-check.js.map +1 -1
- package/dist/management/checks/system-check.d.ts.map +1 -1
- package/dist/management/checks/system-check.js +1 -1
- package/dist/management/checks/system-check.js.map +1 -1
- package/dist/management/instance-directory.d.ts +4 -0
- package/dist/management/instance-directory.d.ts.map +1 -0
- package/dist/management/instance-directory.js +54 -0
- package/dist/management/instance-directory.js.map +1 -0
- package/dist/management/instance-manager.d.ts.map +1 -1
- package/dist/management/instance-manager.js +2 -10
- package/dist/management/instance-manager.js.map +1 -1
- package/dist/management/shared-manager.d.ts.map +1 -1
- package/dist/management/shared-manager.js +6 -16
- package/dist/management/shared-manager.js.map +1 -1
- package/dist/proxy/proxy-daemon-entry.js +46 -3
- package/dist/proxy/proxy-daemon-entry.js.map +1 -1
- package/dist/proxy/proxy-daemon-state.d.ts +2 -0
- package/dist/proxy/proxy-daemon-state.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon-state.js +42 -4
- package/dist/proxy/proxy-daemon-state.js.map +1 -1
- package/dist/proxy/proxy-daemon.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon.js +11 -6
- package/dist/proxy/proxy-daemon.js.map +1 -1
- package/dist/proxy/transformers/sse-stream-transformer.d.ts.map +1 -1
- package/dist/proxy/transformers/sse-stream-transformer.js +1 -0
- package/dist/proxy/transformers/sse-stream-transformer.js.map +1 -1
- package/dist/shared/toml-object.d.ts.map +1 -1
- package/dist/shared/toml-object.js +6 -2
- package/dist/shared/toml-object.js.map +1 -1
- package/dist/targets/codex-adapter.d.ts +1 -0
- package/dist/targets/codex-adapter.d.ts.map +1 -1
- package/dist/targets/codex-adapter.js +18 -1
- package/dist/targets/codex-adapter.js.map +1 -1
- package/dist/targets/codex-cliproxy-provider-config.d.ts +16 -0
- package/dist/targets/codex-cliproxy-provider-config.d.ts.map +1 -0
- package/dist/targets/codex-cliproxy-provider-config.js +156 -0
- package/dist/targets/codex-cliproxy-provider-config.js.map +1 -0
- package/dist/targets/target-runtime-compatibility.js +1 -1
- package/dist/targets/target-runtime-compatibility.js.map +1 -1
- package/dist/ui/assets/{accounts-CW9bbE4S.js → accounts-BQu3Aeey.js} +1 -1
- package/dist/ui/assets/{alert-dialog-ClPYGzV3.js → alert-dialog-DC1l1GRX.js} +1 -1
- package/dist/ui/assets/{api-BjpAFHdA.js → api-BTbrbjic.js} +1 -1
- package/dist/ui/assets/{auth-section-wl4-fzwD.js → auth-section-BsSVWOMp.js} +1 -1
- package/dist/ui/assets/{backups-section-CRfyOhtX.js → backups-section-BGHYHASS.js} +1 -1
- package/dist/ui/assets/{channels-DH0HkSGX.js → channels-vJ8L4j-z.js} +1 -1
- package/dist/ui/assets/{checkbox-CTpEjpTH.js → checkbox-Dgd2ucy2.js} +1 -1
- package/dist/ui/assets/{claude-extension-BQOBO5Au.js → claude-extension-B3ern4Ad.js} +1 -1
- package/dist/ui/assets/cliproxy-CGljI0Or.js +4 -0
- package/dist/ui/assets/{cliproxy-ai-providers-DoUPKyI5.js → cliproxy-ai-providers-DxoCNEaQ.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-CvjXdHw9.js → cliproxy-control-panel-BJ3Mliy1.js} +1 -1
- package/dist/ui/assets/codex-DBGHPn0v.js +30 -0
- package/dist/ui/assets/{confirm-dialog-CYj_LLWN.js → confirm-dialog-nDFNrH0F.js} +1 -1
- package/dist/ui/assets/{copilot-ZCJeM_Zk.js → copilot-CE_Z3NB0.js} +1 -1
- package/dist/ui/assets/{cursor-CtBjQ1_j.js → cursor-YzGsSR_d.js} +1 -1
- package/dist/ui/assets/{droid-BLmzMBtN.js → droid-C-ItViCi.js} +1 -1
- package/dist/ui/assets/{globalenv-section-0ENDeVbM.js → globalenv-section-C9gSGyZ8.js} +1 -1
- package/dist/ui/assets/{health-BEnDHk-j.js → health-DEeA97sQ.js} +1 -1
- package/dist/ui/assets/index-B71yJlMj.css +1 -0
- package/dist/ui/assets/{index-Cip18A41.js → index-BPVO-QAw.js} +1 -1
- package/dist/ui/assets/index-BRZp_Csi.js +72 -0
- package/dist/ui/assets/{index-O9Qq-UJq.js → index-BYUwpOeA.js} +1 -1
- package/dist/ui/assets/{index-ClMz157R.js → index-D2r_fAW5.js} +1 -1
- package/dist/ui/assets/{index-B3xma6R0.js → index-DGiziSVQ.js} +1 -1
- package/dist/ui/assets/{index-C04Kst21.js → index-DwG6bbUr.js} +1 -1
- package/dist/ui/assets/{index-DrCrZ7r1.js → index-Dwtj4wGT.js} +1 -1
- package/dist/ui/assets/{logs-DQxVdsHm.js → logs-Mt2W7M3G.js} +1 -1
- package/dist/ui/assets/{masked-input-eN6tFUjN.js → masked-input-5TJ4LSuz.js} +1 -1
- package/dist/ui/assets/{proxy-status-widget-50UIM6S8.js → proxy-status-widget-BQOAlYsb.js} +1 -1
- package/dist/ui/assets/raw-json-settings-editor-panel-Fg4WMiuD.js +1 -0
- package/dist/ui/assets/{searchable-select-JO0gngYE.js → searchable-select-CPJn5vA1.js} +1 -1
- package/dist/ui/assets/{separator-AoncAA6l.js → separator-BrQkfpAp.js} +1 -1
- package/dist/ui/assets/{shared-BTv96-3y.js → shared-BlkDl2HF.js} +1 -1
- package/dist/ui/assets/{table-BM_YK49c.js → table-DRzNRkpJ.js} +1 -1
- package/dist/ui/assets/{updates-eo4H4NOg.js → updates-BQNeSzLj.js} +1 -1
- package/dist/ui/assets/{use-accounts-ELLatpzU.js → use-accounts-B6AXtlfF.js} +1 -1
- package/dist/ui/index.html +2 -2
- package/dist/utils/browser/claude-tool-args.d.ts.map +1 -1
- package/dist/utils/browser/claude-tool-args.js +4 -0
- package/dist/utils/browser/claude-tool-args.js.map +1 -1
- package/dist/utils/claude-detector.d.ts.map +1 -1
- package/dist/utils/claude-detector.js +2 -1
- package/dist/utils/claude-detector.js.map +1 -1
- package/dist/utils/claude-subcommand-detector.d.ts +45 -0
- package/dist/utils/claude-subcommand-detector.d.ts.map +1 -0
- package/dist/utils/claude-subcommand-detector.js +179 -0
- package/dist/utils/claude-subcommand-detector.js.map +1 -0
- package/dist/utils/image-analysis/claude-tool-args.d.ts.map +1 -1
- package/dist/utils/image-analysis/claude-tool-args.js +4 -0
- package/dist/utils/image-analysis/claude-tool-args.js.map +1 -1
- package/dist/utils/shell-executor.d.ts +4 -2
- package/dist/utils/shell-executor.d.ts.map +1 -1
- package/dist/utils/shell-executor.js +59 -7
- package/dist/utils/shell-executor.js.map +1 -1
- package/dist/utils/websearch/claude-tool-args.d.ts.map +1 -1
- package/dist/utils/websearch/claude-tool-args.js +5 -0
- package/dist/utils/websearch/claude-tool-args.js.map +1 -1
- package/dist/web-server/health/profile-checks.d.ts.map +1 -1
- package/dist/web-server/health/profile-checks.js +2 -3
- package/dist/web-server/health/profile-checks.js.map +1 -1
- package/dist/web-server/health/symlink-checks.d.ts.map +1 -1
- package/dist/web-server/health/symlink-checks.js +2 -3
- package/dist/web-server/health/symlink-checks.js.map +1 -1
- package/dist/web-server/index.d.ts.map +1 -1
- package/dist/web-server/index.js +80 -20
- package/dist/web-server/index.js.map +1 -1
- package/dist/web-server/middleware/auth-middleware.d.ts +5 -0
- package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
- package/dist/web-server/middleware/auth-middleware.js +73 -1
- package/dist/web-server/middleware/auth-middleware.js.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.js +30 -3
- package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
- package/dist/web-server/routes/codex-routes.d.ts.map +1 -1
- package/dist/web-server/routes/codex-routes.js +7 -0
- package/dist/web-server/routes/codex-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 +92 -14
- package/dist/web-server/routes/settings-routes.js.map +1 -1
- package/dist/web-server/usage/aggregator.d.ts.map +1 -1
- package/dist/web-server/usage/aggregator.js +2 -5
- package/dist/web-server/usage/aggregator.js.map +1 -1
- package/lib/hooks/image-analyzer-transformer.cjs +49 -3
- package/lib/mcp/ccs-browser-server.cjs +153 -6
- package/package.json +1 -1
- package/dist/ui/assets/cliproxy-qUbiZjec.js +0 -3
- package/dist/ui/assets/codex-BeeazJpw.js +0 -27
- package/dist/ui/assets/index-Bs28kNJN.js +0 -72
- package/dist/ui/assets/index-D2_yb3d2.css +0 -1
- package/dist/ui/assets/raw-json-settings-editor-panel-DqKmVWL-.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-detector.js","sourceRoot":"","sources":["../../src/utils/claude-detector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,iDAAuD;AACvD,uCAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"claude-detector.js","sourceRoot":"","sources":["../../src/utils/claude-detector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,iDAAuD;AACvD,uCAAuC;AAEvC,qDAK0B;AAY1B;;;;;;;GAOG;AACH,MAAM,oBAAoB,GAAG;IAC3B,kEAAkE;IAClE,iEAAiE;IACjE,wCAAwC;IACxC,4EAA4E;IAC5E,4BAA4B;IAC5B,sCAAsC;CACvC,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,wBAAwB;IAC/B,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAA,oBAAU,EAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe;IAC7B,+EAA+E;IAC/E,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,IAAA,oBAAU,EAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACxD,gCAAgC;QAChC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,+DAA+D;QAC/D,OAAO,CAAC,IAAI,CAAC,yDAAyD,EAAE,OAAO,CAAC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAC5D,CAAC;IAED,+DAA+D;IAC/D,qFAAqF;IACrF,qFAAqF;IACrF,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;IAE/C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC;QAC5D,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,GAAG,EAAE;YAC3B,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,OAAO,EAAE,IAAI,EAAE,oCAAoC;SACpD,CAAC,CAAC,IAAI,EAAE,CAAC;QAEV,kEAAkE;QAClE,MAAM,OAAO,GAAG,MAAM;aACnB,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpB,IAAI,SAAS,EAAE,CAAC;YACd,oEAAoE;YACpE,qFAAqF;YACrF,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3E,MAAM,UAAU,GAAG,aAAa,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;YAE/C,IAAI,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5C,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,+BAA+B;YAC/B,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAE9B,IAAI,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5C,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;QACd,sCAAsC;QACtC,kDAAkD;IACpD,CAAC;IAED,qEAAqE;IACrE,sFAAsF;IACtF,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,wBAAwB,EAAE,CAAC;QAC9C,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IAED,+BAA+B;IAC/B,OAAO,IAAI,CAAC;AACd,CAAC;AAjED,0CAiEC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,MAAM,UAAU,GAAG,eAAe,EAAE,CAAC;IAErC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;IAC/C,MAAM,UAAU,GAAG,SAAS,IAAI,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAErE,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,SAAS;QACT,UAAU;KACX,CAAC;AACJ,CAAC;AAfD,4CAeC;AAED,SAAS,mBAAmB,CAAC,IAAc,EAAE,YAAgC;IAC3E,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAG,IAAA,mCAAkB,EAAC,IAAA,kCAAiB,EAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC;IACvF,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;IAC/C,MAAM,kBAAkB,GAAG,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEnE,IAAI,CAAC;QACH,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO,IAAA,4BAAY,EACjB,gBAAgB,EAChB,CAAC,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,EAC1E;gBACE,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;gBACjC,OAAO,EAAE,IAAI;gBACb,GAAG;aACJ,CACF,CAAC,IAAI,EAAE,CAAC;QACX,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,IAAA,8CAA6B,GAAE,CAAC;YAC9C,OAAO,IAAA,wBAAQ,EAAC,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,+BAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACnE,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;gBACjC,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;gBACpD,GAAG;aACJ,CAAC,CAAC,IAAI,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAA,4BAAY,EAAC,UAAU,EAAE,IAAI,EAAE;YACpC,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,OAAO,EAAE,IAAI;YACb,GAAG;SACJ,CAAC,CAAC,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;YACrE,MAAM,MAAM,GAAI,KAA6C,CAAC,MAAM,CAAC;YACrE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC9B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7C,CAAC;YACD,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC/C,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAgB,mBAAmB;IACjC,MAAM,MAAM,GAAG,mBAAmB,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACtD,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/C,CAAC;AAJD,kDAIC;AAED,SAAgB,wBAAwB,CAAC,IAAY,EAAE,KAAa;IAClE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACpF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAEhE,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAClD,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE1C,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC7B,OAAO,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAfD,4DAeC;AAED,SAAgB,yBAAyB,CACvC,cAA6B,EAC7B,cAAsB;IAEtB,OAAO,cAAc,KAAK,IAAI,IAAI,wBAAwB,CAAC,cAAc,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;AAClG,CAAC;AALD,8DAKC;AAED,SAAgB,mBAAmB,CAAC,YAAgC;IAClE,MAAM,MAAM,GAAG,mBAAmB,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;IACrE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAA8B,CAAC;QAC/D,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,IAAI;YACrC,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,IAAI;YACvC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;YAC3B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,IAAI;SAClD,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAxBD,kDAwBC;AAED;;GAEG;AACH,SAAgB,uBAAuB;IACrC,OAAO,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACrD,OAAO,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;IACxF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAJD,0DAIC"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Claude subcommand detection.
|
|
3
|
+
*
|
|
4
|
+
* Claude Code's CLI accepts both an interactive session form (`claude [prompt]`,
|
|
5
|
+
* possibly with `--print`) and explicit subcommands (`claude agents`,
|
|
6
|
+
* `claude doctor`, `claude mcp`, ...). Subcommand parsers reject most top-level
|
|
7
|
+
* session flags — e.g. `claude agents --append-system-prompt foo` exits with
|
|
8
|
+
* `error: unknown option '--append-system-prompt'`.
|
|
9
|
+
*
|
|
10
|
+
* CCS injects WebSearch / image-analysis / browser steering args
|
|
11
|
+
* (`--append-system-prompt`, `--disallowedTools`) for interactive sessions.
|
|
12
|
+
* Those flags must be skipped when the user is actually invoking a Claude
|
|
13
|
+
* subcommand, otherwise the subcommand fails or falls back to non-interactive
|
|
14
|
+
* mode (e.g. `claude agents` printing the list instead of opening the agent
|
|
15
|
+
* view — see issue #1218).
|
|
16
|
+
*
|
|
17
|
+
* Detection walks args left-to-right, skipping known value-taking top-level
|
|
18
|
+
* flags, and reports whether the first positional token matches a known
|
|
19
|
+
* Claude subcommand.
|
|
20
|
+
*/
|
|
21
|
+
/// <reference types="node" />
|
|
22
|
+
/// <reference types="bun-types" />
|
|
23
|
+
/**
|
|
24
|
+
* Returns true when `args` look like a Claude subcommand invocation.
|
|
25
|
+
*
|
|
26
|
+
* Heuristic:
|
|
27
|
+
* 1. Walk args until the `--` terminator or end.
|
|
28
|
+
* 2. Skip known value-taking flags together with their next token.
|
|
29
|
+
* 3. Skip unknown `--flag=value` forms and bare `--flag` / `-x` tokens.
|
|
30
|
+
* 4. The first remaining positional token is the candidate.
|
|
31
|
+
* 5. Match against CLAUDE_SUBCOMMANDS.
|
|
32
|
+
*
|
|
33
|
+
* Anything after the candidate is irrelevant — once a subcommand is in play,
|
|
34
|
+
* the rest of the line belongs to that subcommand.
|
|
35
|
+
*/
|
|
36
|
+
export declare function isClaudeSubcommandInvocation(args: readonly string[]): boolean;
|
|
37
|
+
export declare function stripClaudeSubcommandSessionArgs(args: readonly string[]): string[];
|
|
38
|
+
export declare function stripClaudeCodeFeatureBlockingEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
39
|
+
/**
|
|
40
|
+
* Return a shallow copy of `env` with subcommand-blocking telemetry vars
|
|
41
|
+
* removed. Caller is responsible for only invoking this when args are a
|
|
42
|
+
* Claude subcommand invocation.
|
|
43
|
+
*/
|
|
44
|
+
export declare function stripSubcommandBlockingEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
45
|
+
//# sourceMappingURL=claude-subcommand-detector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-subcommand-detector.d.ts","sourceRoot":"","sources":["../../src/utils/claude-subcommand-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AA6EH;;;;;;;;;;;;GAYG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAqB7E;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CA4BlF;AAQD,wBAAgB,iCAAiC,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAa3F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAEpF"}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Claude subcommand detection.
|
|
4
|
+
*
|
|
5
|
+
* Claude Code's CLI accepts both an interactive session form (`claude [prompt]`,
|
|
6
|
+
* possibly with `--print`) and explicit subcommands (`claude agents`,
|
|
7
|
+
* `claude doctor`, `claude mcp`, ...). Subcommand parsers reject most top-level
|
|
8
|
+
* session flags — e.g. `claude agents --append-system-prompt foo` exits with
|
|
9
|
+
* `error: unknown option '--append-system-prompt'`.
|
|
10
|
+
*
|
|
11
|
+
* CCS injects WebSearch / image-analysis / browser steering args
|
|
12
|
+
* (`--append-system-prompt`, `--disallowedTools`) for interactive sessions.
|
|
13
|
+
* Those flags must be skipped when the user is actually invoking a Claude
|
|
14
|
+
* subcommand, otherwise the subcommand fails or falls back to non-interactive
|
|
15
|
+
* mode (e.g. `claude agents` printing the list instead of opening the agent
|
|
16
|
+
* view — see issue #1218).
|
|
17
|
+
*
|
|
18
|
+
* Detection walks args left-to-right, skipping known value-taking top-level
|
|
19
|
+
* flags, and reports whether the first positional token matches a known
|
|
20
|
+
* Claude subcommand.
|
|
21
|
+
*/
|
|
22
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
+
exports.stripSubcommandBlockingEnv = exports.stripClaudeCodeFeatureBlockingEnv = exports.stripClaudeSubcommandSessionArgs = exports.isClaudeSubcommandInvocation = void 0;
|
|
24
|
+
/**
|
|
25
|
+
* Known Claude CLI subcommands. Sourced from `claude --help` (v2.1.139).
|
|
26
|
+
* Keep in sync with upstream — additions are safe (over-skipping injection
|
|
27
|
+
* for an unknown command is acceptable; under-skipping is the bug).
|
|
28
|
+
*/
|
|
29
|
+
const CLAUDE_SUBCOMMANDS = new Set([
|
|
30
|
+
'agents',
|
|
31
|
+
'auth',
|
|
32
|
+
'auto-mode',
|
|
33
|
+
'doctor',
|
|
34
|
+
'install',
|
|
35
|
+
'mcp',
|
|
36
|
+
'plugin',
|
|
37
|
+
'plugins',
|
|
38
|
+
'project',
|
|
39
|
+
'setup-token',
|
|
40
|
+
'ultrareview',
|
|
41
|
+
'update',
|
|
42
|
+
'upgrade',
|
|
43
|
+
]);
|
|
44
|
+
/**
|
|
45
|
+
* Top-level Claude flags that consume the next argv token as their value.
|
|
46
|
+
* Used so the detector doesn't mistake a flag value (e.g. `--name auth`) for
|
|
47
|
+
* a subcommand. Boolean flags are intentionally absent.
|
|
48
|
+
*
|
|
49
|
+
* Variadic flags (`--add-dir`, `--mcp-config`, etc.) only consume their
|
|
50
|
+
* immediate next token here; Commander.js' real variadic parsing isn't worth
|
|
51
|
+
* replicating since the goal is just to skip past one obvious value safely.
|
|
52
|
+
*/
|
|
53
|
+
const VALUE_TAKING_FLAGS = new Set([
|
|
54
|
+
'--add-dir',
|
|
55
|
+
'--agent',
|
|
56
|
+
'--agents',
|
|
57
|
+
'--allowedTools',
|
|
58
|
+
'--allowed-tools',
|
|
59
|
+
'--append-system-prompt',
|
|
60
|
+
'--betas',
|
|
61
|
+
'--channels',
|
|
62
|
+
'--debug-file',
|
|
63
|
+
'--disallowedTools',
|
|
64
|
+
'--disallowed-tools',
|
|
65
|
+
'--effort',
|
|
66
|
+
'--fallback-model',
|
|
67
|
+
'--file',
|
|
68
|
+
'--input-format',
|
|
69
|
+
'--json-schema',
|
|
70
|
+
'--max-budget-usd',
|
|
71
|
+
'--mcp-config',
|
|
72
|
+
'--model',
|
|
73
|
+
'--name',
|
|
74
|
+
'-n',
|
|
75
|
+
'--output-format',
|
|
76
|
+
'--permission-mode',
|
|
77
|
+
'--plugin-dir',
|
|
78
|
+
'--plugin-url',
|
|
79
|
+
'--remote-control-session-name-prefix',
|
|
80
|
+
'--session-id',
|
|
81
|
+
'--setting-sources',
|
|
82
|
+
'--settings',
|
|
83
|
+
'--system-prompt',
|
|
84
|
+
'--teammate-mode',
|
|
85
|
+
'--tools',
|
|
86
|
+
]);
|
|
87
|
+
const SUBCOMMAND_SESSION_ONLY_FLAGS = new Set([
|
|
88
|
+
'--allow-dangerously-skip-permissions',
|
|
89
|
+
'--dangerously-skip-permissions',
|
|
90
|
+
]);
|
|
91
|
+
const SUBCOMMAND_SESSION_ONLY_VALUE_FLAGS = new Set([
|
|
92
|
+
'--permission-mode',
|
|
93
|
+
'--teammate-mode',
|
|
94
|
+
]);
|
|
95
|
+
/**
|
|
96
|
+
* Returns true when `args` look like a Claude subcommand invocation.
|
|
97
|
+
*
|
|
98
|
+
* Heuristic:
|
|
99
|
+
* 1. Walk args until the `--` terminator or end.
|
|
100
|
+
* 2. Skip known value-taking flags together with their next token.
|
|
101
|
+
* 3. Skip unknown `--flag=value` forms and bare `--flag` / `-x` tokens.
|
|
102
|
+
* 4. The first remaining positional token is the candidate.
|
|
103
|
+
* 5. Match against CLAUDE_SUBCOMMANDS.
|
|
104
|
+
*
|
|
105
|
+
* Anything after the candidate is irrelevant — once a subcommand is in play,
|
|
106
|
+
* the rest of the line belongs to that subcommand.
|
|
107
|
+
*/
|
|
108
|
+
function isClaudeSubcommandInvocation(args) {
|
|
109
|
+
for (let i = 0; i < args.length; i += 1) {
|
|
110
|
+
const arg = args[i];
|
|
111
|
+
if (arg === '--')
|
|
112
|
+
return false;
|
|
113
|
+
if (arg.startsWith('-')) {
|
|
114
|
+
if (VALUE_TAKING_FLAGS.has(arg)) {
|
|
115
|
+
// Skip the next token as the flag's value (when present and not another flag).
|
|
116
|
+
const next = args[i + 1];
|
|
117
|
+
if (next !== undefined && !next.startsWith('-')) {
|
|
118
|
+
i += 1;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
// `--flag=value`, bare boolean flags, and unknown short/long flags fall through.
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
return CLAUDE_SUBCOMMANDS.has(arg);
|
|
125
|
+
}
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
exports.isClaudeSubcommandInvocation = isClaudeSubcommandInvocation;
|
|
129
|
+
function stripClaudeSubcommandSessionArgs(args) {
|
|
130
|
+
if (!isClaudeSubcommandInvocation(args)) {
|
|
131
|
+
return [...args];
|
|
132
|
+
}
|
|
133
|
+
const out = [];
|
|
134
|
+
for (let i = 0; i < args.length; i += 1) {
|
|
135
|
+
const arg = args[i];
|
|
136
|
+
if (SUBCOMMAND_SESSION_ONLY_FLAGS.has(arg)) {
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
139
|
+
if (arg.startsWith('--permission-mode=') || arg.startsWith('--teammate-mode=')) {
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
142
|
+
if (SUBCOMMAND_SESSION_ONLY_VALUE_FLAGS.has(arg)) {
|
|
143
|
+
const next = args[i + 1];
|
|
144
|
+
if (next !== undefined && !next.startsWith('-')) {
|
|
145
|
+
i += 1;
|
|
146
|
+
}
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
149
|
+
out.push(arg);
|
|
150
|
+
}
|
|
151
|
+
return out;
|
|
152
|
+
}
|
|
153
|
+
exports.stripClaudeSubcommandSessionArgs = stripClaudeSubcommandSessionArgs;
|
|
154
|
+
/**
|
|
155
|
+
* Claude Code treats DISABLE_TELEMETRY as a feature kill switch for agent-view
|
|
156
|
+
* and background-session surfaces, not only as telemetry preference.
|
|
157
|
+
*/
|
|
158
|
+
const CLAUDE_CODE_FEATURE_BLOCKING_ENV_KEYS = ['DISABLE_TELEMETRY'];
|
|
159
|
+
function stripClaudeCodeFeatureBlockingEnv(env) {
|
|
160
|
+
const out = {};
|
|
161
|
+
for (const [key, value] of Object.entries(env)) {
|
|
162
|
+
if (CLAUDE_CODE_FEATURE_BLOCKING_ENV_KEYS.includes(key)) {
|
|
163
|
+
continue;
|
|
164
|
+
}
|
|
165
|
+
out[key] = value;
|
|
166
|
+
}
|
|
167
|
+
return out;
|
|
168
|
+
}
|
|
169
|
+
exports.stripClaudeCodeFeatureBlockingEnv = stripClaudeCodeFeatureBlockingEnv;
|
|
170
|
+
/**
|
|
171
|
+
* Return a shallow copy of `env` with subcommand-blocking telemetry vars
|
|
172
|
+
* removed. Caller is responsible for only invoking this when args are a
|
|
173
|
+
* Claude subcommand invocation.
|
|
174
|
+
*/
|
|
175
|
+
function stripSubcommandBlockingEnv(env) {
|
|
176
|
+
return stripClaudeCodeFeatureBlockingEnv(env);
|
|
177
|
+
}
|
|
178
|
+
exports.stripSubcommandBlockingEnv = stripSubcommandBlockingEnv;
|
|
179
|
+
//# sourceMappingURL=claude-subcommand-detector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-subcommand-detector.js","sourceRoot":"","sources":["../../src/utils/claude-subcommand-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-tool-args.d.ts","sourceRoot":"","sources":["../../../src/utils/image-analysis/claude-tool-args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"claude-tool-args.d.ts","sourceRoot":"","sources":["../../../src/utils/image-analysis/claude-tool-args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA2CH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAI9E;AAED,wBAAgB,8BAA8B,IAAI,MAAM,CAEvD"}
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.getImageAnalysisSteeringPrompt = exports.appendThirdPartyImageAnalysisToolArgs = void 0;
|
|
10
10
|
const claude_tool_args_1 = require("../claude-tool-args");
|
|
11
11
|
const prompt_injection_strategy_1 = require("../prompt-injection-strategy");
|
|
12
|
+
const claude_subcommand_detector_1 = require("../claude-subcommand-detector");
|
|
12
13
|
const IMAGE_ANALYSIS_STEERING_PROMPT = {
|
|
13
14
|
name: 'ccs-prompt-image-analysis-tool',
|
|
14
15
|
content: 'For local image or PDF files, prefer the CCS MCP tool ImageAnalysis instead of Read. Use Read for text, code, and other plain files. If the user asks a specific question about the visual, pass that question as the focus field when useful. If ImageAnalysis is unavailable or fails, you may fall back to Read.',
|
|
@@ -29,6 +30,9 @@ function ensureImageAnalysisSteeringPrompt(args) {
|
|
|
29
30
|
return [...optionArgs, ...steeringArg, ...trailingArgs];
|
|
30
31
|
}
|
|
31
32
|
function appendThirdPartyImageAnalysisToolArgs(args) {
|
|
33
|
+
// Subcommands reject session-only prompt flags. Issue #1218.
|
|
34
|
+
if ((0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(args))
|
|
35
|
+
return args;
|
|
32
36
|
return ensureImageAnalysisSteeringPrompt(args);
|
|
33
37
|
}
|
|
34
38
|
exports.appendThirdPartyImageAnalysisToolArgs = appendThirdPartyImageAnalysisToolArgs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-tool-args.js","sourceRoot":"","sources":["../../../src/utils/image-analysis/claude-tool-args.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,0DAG6B;AAC7B,4EAIsC;
|
|
1
|
+
{"version":3,"file":"claude-tool-args.js","sourceRoot":"","sources":["../../../src/utils/image-analysis/claude-tool-args.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,0DAG6B;AAC7B,4EAIsC;AACtC,8EAA6E;AAE7E,MAAM,8BAA8B,GAAG;IACrC,IAAI,EAAE,gCAAgC;IACtC,OAAO,EACL,qTAAqT;CACxT,CAAC;AAEF,SAAS,iCAAiC,CAAC,IAAc;IACvD,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,IAAA,wCAA2B,EAAC,IAAI,CAAC,CAAC;IAEvE,IACE,IAAA,oCAAuB,EAAC,UAAU,EAAE,8CAAkB,EAAE,8BAA8B,CAAC,OAAO,CAAC,EAC/F,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,IAAA,mDAAuB,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,8BAA8B,CAAC,IAAI,EAAE,CAAC,EAC9F,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAAC;QACnC,IAAI,EAAE,UAAU;QAChB,UAAU,EAAE,8BAA8B,CAAC,IAAI;QAC/C,aAAa,EAAE,8BAA8B,CAAC,OAAO;KACtD,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,UAAU,EAAE,GAAG,WAAW,EAAE,GAAG,YAAY,CAAC,CAAC;AAC1D,CAAC;AAED,SAAgB,qCAAqC,CAAC,IAAc;IAClE,6DAA6D;IAC7D,IAAI,IAAA,yDAA4B,EAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACpD,OAAO,iCAAiC,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAJD,sFAIC;AAED,SAAgB,8BAA8B;IAC5C,OAAO,8BAA8B,CAAC,OAAO,CAAC;AAChD,CAAC;AAFD,wEAEC"}
|
|
@@ -62,8 +62,10 @@ export declare function escapeShellArg(arg: string): string;
|
|
|
62
62
|
/**
|
|
63
63
|
* Return the shell that matches escapeShellArg() quoting semantics.
|
|
64
64
|
*
|
|
65
|
-
* On Windows,
|
|
66
|
-
*
|
|
65
|
+
* On Windows, use an absolute, trusted system cmd.exe path instead of a bare
|
|
66
|
+
* executable name so wrapper launches cannot be hijacked through the current
|
|
67
|
+
* directory or PATH. ComSpec is accepted only when it resolves to that same
|
|
68
|
+
* system shell.
|
|
67
69
|
*/
|
|
68
70
|
export declare function getWindowsEscapedCommandShell(): SpawnOptions['shell'];
|
|
69
71
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-executor.d.ts","sourceRoot":"","sources":["../../src/utils/shell-executor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;;;AAEH,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"shell-executor.d.ts","sourceRoot":"","sources":["../../src/utils/shell-executor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;;;AAEH,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAelF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAQ3E;AA0BD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,YAAY,CAAC,EAAE,MAAM,CAAC,UAAU,GAC/B,MAAM,CAAC,UAAU,CAkBnB;AA4BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAQzE;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAQ5E;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAW9E;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,MAAM,CAAC,UAAU,CAU/D;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAqBlD;AAED;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,IAAI,YAAY,CAAC,OAAO,CAAC,CAyBrE;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,MAAM,CAAC,UAAU,GAAG,IAAW,EACxC,aAAa,CAAC,EAAE,MAAM,IAAI,GACzB,IAAI,CAuHN"}
|
|
@@ -4,15 +4,40 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Cross-platform shell execution utilities for CCS.
|
|
6
6
|
*/
|
|
7
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
8
|
+
if (k2 === undefined) k2 = k;
|
|
9
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
10
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
11
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
12
|
+
}
|
|
13
|
+
Object.defineProperty(o, k2, desc);
|
|
14
|
+
}) : (function(o, m, k, k2) {
|
|
15
|
+
if (k2 === undefined) k2 = k;
|
|
16
|
+
o[k2] = m[k];
|
|
17
|
+
}));
|
|
18
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
19
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
20
|
+
}) : function(o, v) {
|
|
21
|
+
o["default"] = v;
|
|
22
|
+
});
|
|
23
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
24
|
+
if (mod && mod.__esModule) return mod;
|
|
25
|
+
var result = {};
|
|
26
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
27
|
+
__setModuleDefault(result, mod);
|
|
28
|
+
return result;
|
|
29
|
+
};
|
|
7
30
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
8
31
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
9
32
|
};
|
|
10
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
34
|
exports.execClaude = exports.getWindowsEscapedCommandShell = exports.escapeShellArg = exports.getClaudeLaunchEnvOverrides = exports.stripCodexSessionEnv = exports.stripClaudeCodeEnv = exports.stripBrowserEnv = exports.stripAnthropicRoutingEnv = exports.stripAnthropicEnv = void 0;
|
|
12
35
|
const child_process_1 = require("child_process");
|
|
36
|
+
const path = __importStar(require("path"));
|
|
13
37
|
const error_manager_1 = require("./error-manager");
|
|
14
38
|
const websearch_manager_1 = require("./websearch-manager");
|
|
15
39
|
const signal_forwarder_1 = require("./signal-forwarder");
|
|
40
|
+
const claude_subcommand_detector_1 = require("./claude-subcommand-detector");
|
|
16
41
|
const shared_manager_1 = __importDefault(require("../management/shared-manager"));
|
|
17
42
|
const config_loader_facade_1 = require("../config/config-loader-facade");
|
|
18
43
|
/**
|
|
@@ -52,6 +77,7 @@ const TMUX_SYNC_ENV_KEYS = [
|
|
|
52
77
|
...ANTHROPIC_MODEL_ENV_KEYS,
|
|
53
78
|
...ANTHROPIC_ROUTING_ENV_KEYS,
|
|
54
79
|
];
|
|
80
|
+
const DEFAULT_WINDOWS_CMD_SHELL = 'C:\\Windows\\System32\\cmd.exe';
|
|
55
81
|
/**
|
|
56
82
|
* Strip inherited Anthropic routing/auth env while preserving model intent.
|
|
57
83
|
* Used for nested settings-profile Claude launches where `--settings` already
|
|
@@ -204,14 +230,30 @@ exports.escapeShellArg = escapeShellArg;
|
|
|
204
230
|
/**
|
|
205
231
|
* Return the shell that matches escapeShellArg() quoting semantics.
|
|
206
232
|
*
|
|
207
|
-
* On Windows,
|
|
208
|
-
*
|
|
233
|
+
* On Windows, use an absolute, trusted system cmd.exe path instead of a bare
|
|
234
|
+
* executable name so wrapper launches cannot be hijacked through the current
|
|
235
|
+
* directory or PATH. ComSpec is accepted only when it resolves to that same
|
|
236
|
+
* system shell.
|
|
209
237
|
*/
|
|
210
238
|
function getWindowsEscapedCommandShell() {
|
|
211
239
|
if (process.platform !== 'win32') {
|
|
212
240
|
return true;
|
|
213
241
|
}
|
|
214
|
-
|
|
242
|
+
const systemRoot = [process.env.SystemRoot, process.env.SYSTEMROOT, process.env.windir].find((candidate) => Boolean(candidate && path.win32.isAbsolute(candidate)));
|
|
243
|
+
const trustedSystemCmd = systemRoot
|
|
244
|
+
? path.win32.normalize(path.win32.join(systemRoot, 'System32', 'cmd.exe'))
|
|
245
|
+
: DEFAULT_WINDOWS_CMD_SHELL;
|
|
246
|
+
const trustedSystemCmdLower = trustedSystemCmd.toLowerCase();
|
|
247
|
+
for (const candidate of [process.env.ComSpec, process.env.COMSPEC]) {
|
|
248
|
+
if (!candidate || !path.win32.isAbsolute(candidate)) {
|
|
249
|
+
continue;
|
|
250
|
+
}
|
|
251
|
+
const normalizedCandidate = path.win32.normalize(candidate);
|
|
252
|
+
if (normalizedCandidate.toLowerCase() === trustedSystemCmdLower) {
|
|
253
|
+
return normalizedCandidate;
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
return trustedSystemCmd;
|
|
215
257
|
}
|
|
216
258
|
exports.getWindowsEscapedCommandShell = getWindowsEscapedCommandShell;
|
|
217
259
|
/**
|
|
@@ -245,9 +287,19 @@ function execClaude(claudeCli, args, envVars = null, onExitCleanup) {
|
|
|
245
287
|
const effectiveMergedEnv = stripInheritedAnthropicRoutingEnv
|
|
246
288
|
? stripAnthropicRoutingEnv(mergedEnv, envVars ?? undefined)
|
|
247
289
|
: mergedEnv;
|
|
290
|
+
const effectiveArgs = (0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(args)
|
|
291
|
+
? (0, claude_subcommand_detector_1.stripClaudeSubcommandSessionArgs)(args)
|
|
292
|
+
: args;
|
|
248
293
|
// Strip Claude Code nested session guard env var to allow CCS delegation
|
|
249
294
|
// (Claude Code v2.1.39+ sets CLAUDECODE to detect nested sessions)
|
|
250
|
-
|
|
295
|
+
let env = (0, claude_subcommand_detector_1.stripClaudeCodeFeatureBlockingEnv)(stripClaudeCodeEnv(effectiveMergedEnv));
|
|
296
|
+
// For Claude subcommand invocations (`agents`, `mcp`, `doctor`, ...) strip
|
|
297
|
+
// telemetry-disable env vars that cause upstream Claude Code to fall back
|
|
298
|
+
// to non-interactive list mode instead of opening the subcommand TUI.
|
|
299
|
+
// Issue #1218.
|
|
300
|
+
if ((0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(effectiveArgs)) {
|
|
301
|
+
env = (0, claude_subcommand_detector_1.stripSubcommandBlockingEnv)(env);
|
|
302
|
+
}
|
|
251
303
|
if (profileType !== 'account') {
|
|
252
304
|
try {
|
|
253
305
|
new shared_manager_1.default().normalizeSharedPluginMetadataPathsLocked(env.CLAUDE_CONFIG_DIR);
|
|
@@ -261,7 +313,7 @@ function execClaude(claudeCli, args, envVars = null, onExitCleanup) {
|
|
|
261
313
|
syncTmuxNestedSessionEnv(env, profileType);
|
|
262
314
|
let child;
|
|
263
315
|
if (isPowerShellScript) {
|
|
264
|
-
child = (0, child_process_1.spawn)('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', claudeCli, ...
|
|
316
|
+
child = (0, child_process_1.spawn)('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', claudeCli, ...effectiveArgs], {
|
|
265
317
|
stdio: 'inherit',
|
|
266
318
|
windowsHide: true,
|
|
267
319
|
env,
|
|
@@ -269,7 +321,7 @@ function execClaude(claudeCli, args, envVars = null, onExitCleanup) {
|
|
|
269
321
|
}
|
|
270
322
|
else if (needsShell) {
|
|
271
323
|
// When shell needed: concatenate into string to avoid DEP0190 warning
|
|
272
|
-
const cmdString = [claudeCli, ...
|
|
324
|
+
const cmdString = [claudeCli, ...effectiveArgs].map(escapeShellArg).join(' ');
|
|
273
325
|
child = (0, child_process_1.spawn)(cmdString, {
|
|
274
326
|
stdio: 'inherit',
|
|
275
327
|
windowsHide: true,
|
|
@@ -279,7 +331,7 @@ function execClaude(claudeCli, args, envVars = null, onExitCleanup) {
|
|
|
279
331
|
}
|
|
280
332
|
else {
|
|
281
333
|
// When no shell needed: use array form (faster, no shell overhead)
|
|
282
|
-
child = (0, child_process_1.spawn)(claudeCli,
|
|
334
|
+
child = (0, child_process_1.spawn)(claudeCli, effectiveArgs, {
|
|
283
335
|
stdio: 'inherit',
|
|
284
336
|
windowsHide: true,
|
|
285
337
|
env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-executor.js","sourceRoot":"","sources":["../../src/utils/shell-executor.ts"],"names":[],"mappings":";AAAA;;;;GAIG
|
|
1
|
+
{"version":3,"file":"shell-executor.js","sourceRoot":"","sources":["../../src/utils/shell-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-tool-args.d.ts","sourceRoot":"","sources":["../../../src/utils/websearch/claude-tool-args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"claude-tool-args.d.ts","sourceRoot":"","sources":["../../../src/utils/websearch/claude-tool-args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgBH,eAAO,MAAM,qCAAqC;;;CAIjD,CAAC;AAgHF,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAK1E"}
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.appendThirdPartyWebSearchToolArgs = exports.THIRD_PARTY_WEBSEARCH_STEERING_PROMPT = void 0;
|
|
10
10
|
const claude_tool_args_1 = require("../claude-tool-args");
|
|
11
11
|
const prompt_injection_strategy_1 = require("../prompt-injection-strategy");
|
|
12
|
+
const claude_subcommand_detector_1 = require("../claude-subcommand-detector");
|
|
12
13
|
const NATIVE_WEBSEARCH_TOOL = 'WebSearch';
|
|
13
14
|
const DISALLOWED_TOOLS_FLAG = '--disallowedTools';
|
|
14
15
|
exports.THIRD_PARTY_WEBSEARCH_STEERING_PROMPT = {
|
|
@@ -96,6 +97,10 @@ function ensureWebSearchSteeringPrompt(args) {
|
|
|
96
97
|
return [...optionArgs, ...steeringArgs, ...trailingArgs];
|
|
97
98
|
}
|
|
98
99
|
function appendThirdPartyWebSearchToolArgs(args) {
|
|
100
|
+
// Claude subcommands (agents, doctor, mcp, ...) reject top-level session flags
|
|
101
|
+
// like `--append-system-prompt` and `--disallowedTools`. Issue #1218.
|
|
102
|
+
if ((0, claude_subcommand_detector_1.isClaudeSubcommandInvocation)(args))
|
|
103
|
+
return args;
|
|
99
104
|
return ensureWebSearchSteeringPrompt(ensureDisallowedNativeWebSearchTool(args));
|
|
100
105
|
}
|
|
101
106
|
exports.appendThirdPartyWebSearchToolArgs = appendThirdPartyWebSearchToolArgs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-tool-args.js","sourceRoot":"","sources":["../../../src/utils/websearch/claude-tool-args.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,0DAI6B;AAC7B,4EAIsC;
|
|
1
|
+
{"version":3,"file":"claude-tool-args.js","sourceRoot":"","sources":["../../../src/utils/websearch/claude-tool-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-checks.d.ts","sourceRoot":"","sources":["../../../src/web-server/health/profile-checks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"profile-checks.d.ts","sourceRoot":"","sources":["../../../src/web-server/health/profile-checks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAI3C;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CA6EzD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CA6B1D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CA0C3D"}
|
|
@@ -33,6 +33,7 @@ exports.checkDelegation = exports.checkInstances = exports.checkProfiles = void
|
|
|
33
33
|
const fs = __importStar(require("fs"));
|
|
34
34
|
const path = __importStar(require("path"));
|
|
35
35
|
const config_loader_facade_1 = require("../../config/config-loader-facade");
|
|
36
|
+
const instance_directory_1 = require("../../management/instance-directory");
|
|
36
37
|
/**
|
|
37
38
|
* Check profiles configuration (API profiles from config.json or config.yaml)
|
|
38
39
|
*/
|
|
@@ -120,9 +121,7 @@ function checkInstances(ccsDir) {
|
|
|
120
121
|
message: 'No account profiles',
|
|
121
122
|
};
|
|
122
123
|
}
|
|
123
|
-
const instances =
|
|
124
|
-
return fs.statSync(path.join(instancesDir, name)).isDirectory();
|
|
125
|
-
});
|
|
124
|
+
const instances = (0, instance_directory_1.listAccountInstanceNames)(instancesDir);
|
|
126
125
|
if (instances.length === 0) {
|
|
127
126
|
return {
|
|
128
127
|
id: 'instances',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-checks.js","sourceRoot":"","sources":["../../../src/web-server/health/profile-checks.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAG7B,4EAAqF;
|
|
1
|
+
{"version":3,"file":"profile-checks.js","sourceRoot":"","sources":["../../../src/web-server/health/profile-checks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"symlink-checks.d.ts","sourceRoot":"","sources":["../../../src/web-server/health/symlink-checks.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"symlink-checks.d.ts","sourceRoot":"","sources":["../../../src/web-server/health/symlink-checks.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAG3C;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,WAAW,CAiC9C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,CAsGpF"}
|
|
@@ -31,6 +31,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
31
31
|
exports.checkSettingsSymlinks = exports.checkCcsSymlinks = void 0;
|
|
32
32
|
const fs = __importStar(require("fs"));
|
|
33
33
|
const path = __importStar(require("path"));
|
|
34
|
+
const instance_directory_1 = require("../../management/instance-directory");
|
|
34
35
|
/**
|
|
35
36
|
* Check CCS symlinks health
|
|
36
37
|
*/
|
|
@@ -116,9 +117,7 @@ function checkSettingsSymlinks(ccsDir, claudeDir) {
|
|
|
116
117
|
message: 'Shared symlink valid',
|
|
117
118
|
};
|
|
118
119
|
}
|
|
119
|
-
const instances =
|
|
120
|
-
return fs.statSync(`${instancesDir}/${name}`).isDirectory();
|
|
121
|
-
});
|
|
120
|
+
const instances = (0, instance_directory_1.listAccountInstanceNames)(instancesDir);
|
|
122
121
|
let broken = 0;
|
|
123
122
|
for (const instance of instances) {
|
|
124
123
|
const instanceSettings = `${instancesDir}/${instance}/settings.json`;
|