@caishenai/cli 0.0.174 → 0.0.176
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/cli.js +1 -1
- package/dist/commands/base.js +1 -1
- package/dist/commands/codex-sessions.js +1 -1
- package/dist/commands/components.js +1 -1
- package/dist/commands/doctor.js +1 -1
- package/dist/commands/sessions.js +1 -1
- package/dist/commands/setup.js +1 -1
- package/dist/commands/upgrade.js +1 -1
- package/dist/lib/app-update.js +1 -1
- package/dist/lib/auto-update.js +1 -1
- package/dist/lib/claude-code-manager.js +1 -1
- package/dist/lib/client-config-sync.js +1 -1
- package/dist/lib/codex-sessions.js +1 -1
- package/dist/lib/command.js +1 -1
- package/dist/lib/components.js +1 -1
- package/dist/lib/config.js +1 -1
- package/dist/lib/env-cleanup.js +1 -1
- package/dist/lib/gateway-addresses.js +1 -1
- package/dist/lib/install-script.js +1 -0
- package/dist/lib/model-refresh.js +1 -1
- package/dist/lib/persistent-env.js +1 -1
- package/dist/lib/post-apply.js +1 -1
- package/dist/lib/signals.js +1 -0
- package/dist/lib/system-report.js +1 -0
- package/dist/lib/telemetry.js +1 -1
- package/dist/lib/tool-manager.js +1 -1
- package/dist/lib/tool-upgrade.js +1 -1
- package/dist/lib/tools/backup.js +1 -1
- package/dist/lib/tools/claude-code.js +1 -1
- package/dist/lib/tools/claude-desktop-cli.js +1 -1
- package/dist/lib/tools/claude-desktop.js +1 -1
- package/dist/lib/tools/claude-plugins.js +1 -1
- package/dist/lib/tools/codex.js +1 -1
- package/dist/lib/tools/desktop-app-installer.js +1 -1
- package/dist/lib/tools/elevated-reg.js +1 -1
- package/dist/lib/tools/tool-installs.js +1 -1
- package/dist/lib/written-values.js +1 -1
- package/dist/locales/en_US.json +12 -3
- package/dist/locales/zh_CN.json +12 -3
- package/dist/utils/process-alive.js +1 -0
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
if(Number(process.versions.node.split(".")[0])<20){const{brand:e}=await import("./lib/brand.js"),r=e().productName;console.error(`无法启动 ${r}:需要 Node.js 20 或更高版本,当前是 v${process.versions.node}。\n请安装 Node.js LTS 版(国内镜像:https://registry.npmmirror.com/binary.html?path=node/ ,也可以运行 nvm install --lts),安装后重新打开终端再运行。\n${r} needs Node.js 20 or later (found v${process.versions.node}); install the LTS release and open a new terminal.`),process.exit(1)}const{Command:e}=await import("./lib/command.js"),{logger:r}=await import("./utils/logger.js"),{reportCliError:
|
|
2
|
+
if(Number(process.versions.node.split(".")[0])<20){const{brand:e}=await import("./lib/brand.js"),r=e().productName;console.error(`无法启动 ${r}:需要 Node.js 20 或更高版本,当前是 v${process.versions.node}。\n请安装 Node.js LTS 版(国内镜像:https://registry.npmmirror.com/binary.html?path=node/ ,也可以运行 nvm install --lts),安装后重新打开终端再运行。\n${r} needs Node.js 20 or later (found v${process.versions.node}); install the LTS release and open a new terminal.`),process.exit(1)}const{Command:e}=await import("./lib/command.js"),{logger:r}=await import("./utils/logger.js"),{reportCliError:s}=await import("./lib/errors.js"),{telemetryPending:o,reportCrash:t}=await import("./lib/telemetry.js");let n=!1;const i=e=>{n&&process.exit(1),n=!0,process.exitCode=1,console.error(e instanceof Error?e.stack??e.message:e);try{r.logError("CLI crash",e)}catch{}t(e).finally(()=>process.exit(1))};process.on("uncaughtException",i),process.on("unhandledRejection",i),(await import("./lib/signals.js")).installSignalHandlers();try{await(new e).execute(process.argv.slice(2))}catch(e){r.logError("CLI",e),s(e)}o()&&process.exit();export{};
|
package/dist/commands/base.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import e from"chalk";import{configManager as r,DEFAULT_BASE_URL as t}from"../lib/config.js";import{i18n as o}from"../lib/i18n.js";import{toolManager as s}from"../lib/tool-manager.js";import{listAdapters as a}from"../lib/tools/registry.js";import{postApplyPrompts as n}from"../lib/post-apply.js";import{emitJson as l,isJsonMode as i}from"../lib/runtime-options.js";import{logger as u}from"../utils/logger.js";import{reportCliError as c,usageError as p,authenticationError as d,networkError as f,operationError as m}from"../lib/errors.js";import{gatewayAddresses as b,normalizeBaseUrl as y,probeGatewayAddress as g}from"../lib/gateway-addresses.js";import{CLI_NAME as h}from"../lib/brand.js";export async function baseCommand(s){const a=r.getBaseUrl(),n=addressesWithCurrent(),u=s?.trim().toLowerCase();if(!u)return void await async function(r,t){const s=savedApiKey(),a=await probeAll(r,{apiKey:s,samples:3});i()?l({ok:!0,current:t,addresses:r.map((e,r)=>({...e,...a[r],current:e.url===t}))}):(console.log(e.bold(o.t("base.current",{url:t}))),console.log(e.gray(o.t(s?"base.probe_with_key":"base.probe_without_key"))+"\n")
|
|
1
|
+
import e from"chalk";import{configManager as r,DEFAULT_BASE_URL as t}from"../lib/config.js";import{i18n as o}from"../lib/i18n.js";import{toolManager as s}from"../lib/tool-manager.js";import{listAdapters as a}from"../lib/tools/registry.js";import{postApplyPrompts as n}from"../lib/post-apply.js";import{emitJson as l,isJsonMode as i}from"../lib/runtime-options.js";import{logger as u}from"../utils/logger.js";import{reportCliError as c,usageError as p,authenticationError as d,networkError as f,operationError as m}from"../lib/errors.js";import{gatewayAddresses as b,normalizeBaseUrl as y,probeGatewayAddress as g}from"../lib/gateway-addresses.js";import{CLI_NAME as h}from"../lib/brand.js";import{track as _}from"../lib/telemetry.js";export async function baseCommand(s){const a=r.getBaseUrl(),n=addressesWithCurrent(),u=s?.trim().toLowerCase();if(!u)return void await async function(r,t){const s=savedApiKey(),a=await probeAll(r,{apiKey:s,samples:3});i()?l({ok:!0,current:t,addresses:r.map((e,r)=>({...e,...a[r],current:e.url===t}))}):(console.log(e.bold(o.t("base.current",{url:t}))),console.log(e.gray(o.t(s?"base.probe_with_key":"base.probe_without_key"))+"\n"),$(r,a,t),console.log("\n"+e.gray(o.t("base.usage_hint"))))}(n,a);if("auto"===u){const e=await probeAll(n,{apiKey:savedApiKey()}),r=e.find(e=>e.ok);if(!r){const r=e.every(e=>"key_rejected"===e.error);return x(r?"key_rejected":"no_reachable",o.t(r?"base.key_rejected_everywhere":"base.none_reachable")),void $(n,e,a)}return void await switchGatewayAddress(r.url)}let c;if("default"===u||"reset"===u)c=t;else if(/^\d+$/.test(u)){if(c=n[Number(u)-1]?.url??null,!c)return void x("bad_index",o.t("base.bad_index",{index:u,count:String(n.length)}))}else if(c=y(s),!c)return void x("bad_url",o.t("base.bad_url",{value:s}));const p=await g(c,{apiKey:savedApiKey()});p.ok?await switchGatewayAddress(c):x("unreachable",o.t("base.unreachable",{url:c,reason:reasonText(p)}))}export async function ensureReachableGatewayAddress(s=savedApiKey(),a={}){if(r.hasRuntimeBaseUrl())return null;const n=r.getBaseUrl(),l=await g(n,{apiKey:s});if(l.ok||"key_rejected"===l.error)return null;const u=b().filter(e=>e.url!==n),c=(await probeAll(u,{apiKey:s})).find(e=>e.ok);if(!c)return null;if(_("gateway-fallback","fallback",{error:reasonText(l),detail:{from:n,to:c.url}}),!1===a.save?(r.setBaseUrl(c.url,!1),w=c.url):k(c.url),!i()){const r=c.url===t?"base.setup_fallback_main":"base.setup_fallback";console.log(e.yellow(o.t(r,{from:n,reason:reasonText(l),url:c.url})))}return c.url}let w=null;function k(e){e===t?r.resetBaseUrl():r.setBaseUrl(e,!0)}export function saveGatewayFallback(){if(!w)return;const e=w;w=null,k(e)}export function addressesWithCurrent(){const e=r.getBaseUrl(),t=b();return t.some(r=>r.url===e)||t.push({url:e,label:o.t("base.custom_label")}),t}export function savedApiKey(){return r.getApiKey()||a().map(e=>r.getApiKeyForTool(e.name)).find(Boolean)}export async function probeAll(e,r={}){return Promise.all(e.map(e=>g(e.url,r)))}export function probeSummary(r,t){if(!r.ok)return e.red(`× ${reasonText(r)}`);const s=[`${r.ms} ms`];return void 0!==r.models&&s.push(o.t("base.models_count",{count:String(r.models)})),t&&s.push(o.t("base.fastest")),e.green(`√ ${s.join(" · ")}`)}export function fastestIndex(e){let r=-1;return e.forEach((t,o)=>{t.ok&&(r<0||t.ms<e[r].ms)&&(r=o)}),r}export function reasonText(e){if(!e.error)return"";const r=o.t(`base.error_${e.error}`);return e.detail?`${r}(${e.detail})`:r}function x(e,r){const t="bad_index"===e||"bad_url"===e?p(r,o.t("errors.next_step",{command:`${h} base --help`}),e):"key_rejected"===e?d(r,o.t("errors.next_step",{command:`${h} setup --key ${o.t("errors.key_placeholder")}`}),e):f(r,o.t("base.next_addresses"),e);c(t)}function $(r,t,s){if(i())return;const a=t.length>1?fastestIndex(t):-1;r.forEach((r,n)=>{const l=r.url===s?e.cyan(` ← ${o.t("base.current_mark")}`):"";console.log(`${n+1}. ${r.url} ${e.gray(r.label)}\n ${probeSummary(t[n],n===a)}${l}`)})}export async function switchGatewayAddress(p){const d=r.getBaseUrl();p===t?r.resetBaseUrl():r.setBaseUrl(p,!0);const f=[],b=[];for(const e of function(){const e=[];for(const t of a()){const o=r.getApiKeyForTool(t.name);if(o)try{t.detectCurrentConfig().apiKey===o&&e.push(t.name)}catch(e){u.logError(`base.detectCurrentConfig(${t.name})`,e)}}return e}()){const t=r.getApiKeyForTool(e);try{await s.applyPrivateConfig(e,t,r.getModelsForTool(e)),f.push(e)}catch(r){b.push({tool:e,reason:r instanceof Error?r.message:String(r)})}}if(b.length>0&&c(m(b.map(({tool:e,reason:r})=>`${e}: ${r}`).join("; "),o.t("errors.next_step",{command:`${h} setup --key ${o.t("errors.key_placeholder")}`}),"config_write_failed")),i()&&0===b.length)l({ok:0===b.length,previous:d,base_url:p,applied:f,failed:b});else{console.log(e.green(o.t(p===d?"base.kept":"base.switched",{url:p}))),f.length>0&&console.log(o.t("base.tools_moved"));for(const e of f)s.printApplied(e);for(const{tool:r,reason:t}of b)console.error(e.red(`× ${o.t("setup.apply_failed",{tool:r,reason:t})}`));0===f.length&&0===b.length&&console.log(e.yellow(o.t("base.no_tools",{url:p}))),await n(f)}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import o from"chalk";import{i18n as s}from"../lib/i18n.js";import{isDryRun as e}from"../lib/runtime-options.js";import{currentCodexProvider as n,moveSessionsToProvider as i,NO_STATE_DB as
|
|
1
|
+
import o from"chalk";import{i18n as s}from"../lib/i18n.js";import{isDryRun as e}from"../lib/runtime-options.js";import{currentCodexProvider as n,moveSessionsToProvider as i,NO_STATE_DB as r,runningCodexPids as t,SessionMoveError as d,undoSessionMove as c}from"../lib/codex-sessions.js";import{forgetDeclinedSessions as l}from"../lib/tools/codex.js";import{operationError as m}from"../lib/errors.js";import{CLI_NAME as a}from"../lib/brand.js";export async function codexSessionsCommand(p){const g=t();if(g.length>0)return console.error(o.yellow(s.t("codex_sessions.codex_running",{pids:g.join(", ")}))),void(process.exitCode=1);if(p.undo){const{files:e,dbRows:n}=await c(p.undo);return void console.log(o.green("√ "+s.t("codex_sessions.undone",{files:String(e),rows:String(n)})))}const f=p.to?.trim()||n();let u;try{u=await i(f,{dryRun:e()})}catch(o){if(!(o instanceof d))throw o;throw m(s.t("codex_sessions.move_failed",{reason:o.message.replace(/\s+/g," ").trim()}),`${a} codex sessions --undo "${o.backupDir}"`,"sessions_move_failed")}const b=Math.max(u.moved.length,u.dbRows);if(0===b)return void console.log(s.t("codex_sessions.nothing",{target:f,scanned:String(u.scanned)}));const x=[...new Set(u.moved.map(o=>o.from))].join("、")||"-";e()?console.log(s.t("codex_sessions.dry_run",{count:String(b),from:x,target:f})):(l(),console.log(o.green("√ "+s.t("codex_sessions.moved",{count:String(b),from:x,target:f}))),u.dbSkipped&&u.dbSkipped!==r&&console.log(o.yellow(" ! "+s.t("codex_sessions.db_skipped",{reason:u.dbSkipped}))),console.log(o.gray(" "+s.t("codex_sessions.backup",{dir:u.backupDir??""}))))}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import t from"chalk";import{appUpgradeCommand as e,upgradeApp as n}from"../lib/app-update.js";import{CLI_NAME as o}from"../lib/brand.js";import{componentStatus as
|
|
1
|
+
import t from"chalk";import{appUpgradeCommand as e,upgradeApp as n}from"../lib/app-update.js";import{CLI_NAME as o}from"../lib/brand.js";import{componentStatus as a,listComponents as r,prefetchLatest as l,resolveComponent as s,resumePendingMigration as i,runRuntime as c,upgradeAdvice as u}from"../lib/components.js";import{i18n as d}from"../lib/i18n.js";import{emitJson as p,isJsonMode as m,progressToStderr as f}from"../lib/runtime-options.js";import{mirrorInstall as g,upgradeTool as _}from"../lib/tool-upgrade.js";import{getAdapter as y}from"../lib/tools/registry.js";import{findInstallsIncludingNative as b,forgetInstalls as w}from"../lib/tools/tool-installs.js";function h(t){m()?process.stderr.write(t+"\n"):console.log(t)}function k(t){let e=0;for(const n of t)e+=/[ᄀ-ᅟ⺀-가-힣豈-︰-﹏-⦆¢-₩]/.test(n)?2:1;return e}function v(t,e){return t+" ".repeat(Math.max(0,e-k(t)))}export function resolveTargets(t){const e=[],n=[],o=(t,e)=>{if(!n.includes(t)&&!e.includes(t.id)){for(const n of t.requires){const a=s(n);a&&o(a,[...e,t.id])}n.push(t)}};for(const n of t){const t=s(n);t?o(t,[]):e.push(n)}return{specs:n,unknown:e}}function j(e){return e.supported?!e.installed&&e.blocker?t.gray(function(t){for(const e of[`components.reason_${t}`,`app_update.reason_${t}`]){const t=d.t(e);if(t!==e)return t}return t}(e.blocker)):e.installed?e.outdated?t.yellow(e.auto_upgrade?d.t("components.state.outdated_auto",{command:`${o} upgrade ${e.id}`}):d.t("components.state.outdated_manual",{how:e.hint??d.t(`components.how_${e.managed_by??"other"}`,{tool:e.name})})):e.latest?t.green(d.t("components.state.latest")):t.gray(d.t("components.state.unknown_latest")):t.gray(d.t("components.state.missing",{command:`${o} install ${e.id}`})):t.gray(d.t("components.state.unsupported"))}export async function listCommand(e={}){const n=r(),o=await l(n,{refresh:e.refresh}),s=[];for(const t of n)s.push(await a(t,{latest:o.get(t.id)}));if(m())return void p({components:s});const i=s.map(t=>({s:t,cells:[t.name,t.installed?t.current??"?":"—",t.latest??"—",t.installed?d.t(`components.by.${t.managed_by??"other"}`):"—"]})),c=[d.t("components.col.name"),d.t("components.col.current"),d.t("components.col.latest"),d.t("components.col.managed")],u=c.map((t,e)=>Math.max(k(t),...i.map(t=>k(t.cells[e])))+2);for(const e of["runtime","cli","app"]){const n=i.filter(t=>t.s.category===e);if(n.length){console.log(t.bold(`\n${d.t(`components.category.${e}`)}`)),console.log(t.gray(" "+c.map((t,e)=>v(t,u[e])).join("")+d.t("components.col.state")));for(const{s:e,cells:o}of n)console.log(" "+o.map((t,e)=>v(t,u[e])).join("")+j(e)),e.source&&e.supported&&console.log(t.gray(" "+d.t("components.source",{source:e.source})))}}const f=s.filter(t=>t.error&&!t.latest);f.length&&console.log(t.yellow("\n ! "+d.t("components.latest_unknown",{tools:f.map(t=>t.name).join("、")})))}export async function installComponent(o,r){return m()||console.log(t.bold(`\n${o.name}`)),"runtime"===o.category?c(o,"install",{force:r}):"cli"===o.category?async function(e,n){const o=y(e.adapter),r=await a(e,{refresh:!0}),l={tool:e.id,category:"cli",current:r.current,latest:r.latest,version_after:null};if(!o?.installSpec)return{...l,result:"unavailable",ok:!1,reason:"no_install_spec"};if(r.blocker)return h(t.yellow(" ! "+d.t(`components.blocked_${r.blocker}`,{tool:e.name}))),{...l,result:"unavailable",ok:!1,reason:r.blocker};if(r.installed&&!n){const n=t.gray(`(${r.path})`);return r.outdated?(h(t.green(" √ "+d.t("components.already_installed",{tool:e.name,current:r.current??"?"}))+n),h(t.yellow(" ! "+u(r))),{...l,result:"already_installed",ok:!0,hint:u(r)}):(h(t.green(" √ "+d.t(r.latest?"components.up_to_date":"components.already_installed",{tool:e.name,current:r.current??"?"}))+n),{...l,result:"already_installed",ok:!0})}let s;r.installed?(h(t.yellow(" ! "+d.t("components.reinstalling",{tool:e.name,current:r.current??"?"}))),s=await g(o.installSpec)):s=await _(o.name),w();const i=b(o.installSpec)[0];r.installed&&s&&h(t.green(" √ "+d.t("components.reinstalled",{tool:e.name,version:i?.version??"?"})));const c=s&&i?r.installed?"reinstalled":"installed":"failed";return{...l,result:c,ok:"failed"!==c,version_after:i?.version??null}}(o,r):async function(o,r){const l=await a(o,{refresh:!0});if(l.installed&&!r){const n={tool:o.id,category:"app",current:l.current,latest:l.latest,version_after:null};if(l.outdated){h(t.green(" √ "+d.t("components.already_installed",{tool:o.name,current:l.current??"?"})));const a=d.t("app_update.upgrade_hint",{tool:o.name,current:l.current??"?",latest:l.latest??"?",command:e(o.app)});return h(t.yellow(" ! "+a)),{...n,result:"already_installed",ok:!0,hint:a}}return h(t.green(" √ "+d.t(l.latest?"components.up_to_date":"components.already_installed",{tool:o.name,current:l.current??"?"}))),{...n,result:"already_installed",ok:!0}}return function(t,e){const n={installed:"installed",upgraded:e.current&&e.latest&&e.current===e.version_after?"reinstalled":"upgraded",up_to_date:"up_to_date",declined:"manual",offered:"already_installed",left_running:"manual",not_installed:"unavailable",unavailable:"unavailable",failed:"failed"}[e.result]??"failed";return{tool:t.id,category:"app",current:e.current,latest:e.latest,result:n,version_after:e.version_after,ok:["installed","upgraded","reinstalled","up_to_date","already_installed"].includes(n),...e.reason?{reason:e.reason}:{}}}(o,await n(o.app,{install:!0,force:r}))}(o,r)}export async function installCommand(e,n={}){const{specs:o,unknown:a}=resolveTargets(e);if(a.length||!o.length)return console.error(t.red(d.t("components.unknown",{names:a.join(", ")||"—"}))),console.error(d.t("components.known",{ids:r().map(t=>t.id).join(" / ")})),void(process.exitCode=1);await f(()=>i());const l=[];for(const t of o)l.push(await f(()=>installComponent(t,Boolean(n.force))));m()&&p({components:l}),l.some(t=>!t.ok)&&(process.exitCode=1)}export async function outdatedRuntimeHints(){const t=r().filter(t=>"runtime"===t.category);return(await Promise.all(t.map(t=>a(t,{offline:!0})))).filter(t=>t.installed&&t.outdated).map(t=>u(t))}
|
package/dist/commands/doctor.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import{refreshClientConfig as o}from"../lib/client-config-sync.js";import e from"chalk";import t from"ora";import{spawnSync as s}from"child_process";import{existsSync as n,readdirSync as r,readFileSync as a}from"fs";import{connect as c}from"net";import{join as i}from"path";import{configManager as l}from"../lib/config.js";import{savedApiKey as d}from"./base.js";import{toolManager as p}from"../lib/tool-manager.js";import{i18n as u}from"../lib/i18n.js";import{validateApiKey as m}from"../lib/api-validator.js";import{getAdapter as f}from"../lib/tools/registry.js";import{findInstalls as g,installLabel as _}from"../lib/tools/tool-installs.js";import{detectManagedOverrides as h}from"../lib/tools/claude-managed.js";import{codexAuthProblem as y,codexCatalogRejection as k,codexConfigPath as w,codexWorkModeOn as b}from"../lib/tools/codex.js";import{claudeAccountLoginPresent as v}from"../lib/tools/claude-code.js";import{toolHome as j}from"../lib/tools/types.js";import{gatewayAddresses as $,probeGatewayAddress as x}from"../lib/gateway-addresses.js";import{listAdapters as T}from"../lib/tools/registry.js";import{logger as A}from"../utils/logger.js";import{maskHome as P,maskSecrets as R,noteFailureReason as N,uploadReport as O}from"../lib/telemetry.js";import{CLI_NAME as I}from"../lib/brand.js";import{appStatus as C,appStatusText as H,appTools as L,appUpgradeCommand as S,getApp as U}from"../lib/app-update.js";import{balanceLookupEnabled as E,balanceNeedsAttention as K,balanceText as B,fetchKeyBalances as G}from"../lib/key-balance.js";const D=["HTTPS_PROXY","https_proxy","HTTP_PROXY","http_proxy","ALL_PROXY","all_proxy"];function q(o,e,t=3e3){return new Promise(s=>{const n=c({host:o,port:e}),r=o=>{n.destroy(),s(o)};n.setTimeout(t,()=>r(!1)),n.once("connect",()=>r(!0)),n.once("error",()=>r(!1))})}function F(){const o=A.getLogDir();if(!n(o))return"";const e=r(o).filter(o=>/^\d{4}-\d{2}-\d{2}\.log$/.test(o)).sort().slice(-2).map(e=>`== ${e}\n`+a(i(o,e),"utf-8")).join("\n");return R(e.slice(-15e4))}function M(){const o={};for(const e of D){const t=process.env[e]?.trim();if(t)try{const s=new URL(t.includes("://")?t:`http://${t}`);o[e]=`${s.protocol}//${s.host}`}catch{o[e]="(unparsable)"}}return o}export async function doctorCommand(n={}){const r=t(u.t("doctor.checking")).start(),c=[],A=Number(process.versions.node.split(".")[0]);c.push({name:"Node.js",status:A>=20?"pass":"fail",message:`v${process.versions.node}`}),r.text=u.t("doctor.check_proxy"),c.push(await async function(){const o=u.t("doctor.proxy"),e=new Map;for(const o of D){const t=process.env[o]?.trim();t&&!e.has(t)&&e.set(t,o)}if(0===e.size)return{name:o,status:"pass",message:u.t("doctor.proxy_none")};const t=[];for(const[o,s]of e){let e;try{e=new URL(o.includes("://")?o:`http://${o}`)}catch{t.push(`${s}=${o}`);continue}const n=Number(e.port)||("https:"===e.protocol?443:e.protocol.startsWith("socks")?1080:80);await q(e.hostname,n)||t.push(`${s}=${o}`)}return 0===t.length?{name:o,status:"pass",message:[...e.keys()].join(", ")}:{name:o,status:"fail",message:u.t("doctor.proxy_dead",{proxies:t.join(", ")})}}()),r.text=u.t("doctor.check_api_key_network");const R=d(),X=u.t("doctor.api_key_network");if(R){const o=await m(R);o.valid?(c.push({name:X,status:"pass"}),r.text=u.t("doctor.check_balance"),c.push(...await async function(o){if(!E())return[];const e=l.listToolApiKeys().map(o=>({tool:o,key:l.getApiKeyForTool(o)})).filter(e=>Boolean(e.key)&&e.key!==o),t=await G([o,...e.map(o=>o.key)]),s=[{name:u.t("doctor.balance"),key:o},...e.map(o=>({name:u.t("doctor.balance_tool",{tool:f(o.tool)?.displayName??o.tool}),key:o.key}))],n=[];for(const o of s){const e=t.get(o.key);e&&n.push({name:o.name,status:K(e)?"warn":"pass",message:B(e)})}return n}(R))):"invalid_api_key"===o.error?c.push({name:X,status:"fail",message:u.t("doctor.api_key_invalid")}):(c.push({name:X,status:"fail",message:`${u.t("doctor.network_error")}: ${o.message??o.error}`}),r.text=u.t("doctor.check_other_addresses"),c.push(await async function(){const o=u.t("doctor.other_addresses"),e=l.getBaseUrl(),t=$().filter(o=>o.url!==e),s=d(),n=await Promise.all(t.map(o=>x(o.url,{apiKey:s}))),r=t.filter((o,e)=>n[e].ok).map(o=>o.url);return 0===r.length?{name:o,status:"fail",message:u.t("doctor.other_addresses_none")}:{name:o,status:"warn",message:u.t("doctor.other_addresses_found",{urls:r.join(", ")})}}()))}else c.push({name:X,status:"fail",message:u.t("doctor.api_key_missing")});r.text=u.t("doctor.check_client_config");const Y=await o();c.push({name:u.t("doctor.client_config"),status:"cloud"===Y.source||"cache"===Y.source&&!Y.problem?"pass":"warn",message:[Y.source?u.t(`refresh.source.${Y.source}`):u.t("refresh.source.none"),Y.revision?u.t("doctor.client_config_revision",{revision:Y.revision}):"",Y.problem??""].filter(Boolean).join(" · ")}),r.text=u.t("doctor.check_tools");const V=p.getInstalledTools();c.push({name:u.t("doctor.installed_tools"),status:V.length>0?"pass":"warn",message:V.length>0?V.map(o=>f(o)?.displayName??o).join(u.t("setup.list_separator")):u.t("doctor.no_tools_installed")}),c.push(...function(){const o=[];for(const e of p.getInstalledTools()){const t=f(e);if(!t?.installSpec)continue;const s=g(t.installSpec);if(0===s.length)continue;const n=[],r=p.outdatedVersion(e);r&&n.push(u.t("doctor.tool_outdated",{min:r.min})),s.length>1&&n.push(u.t("doctor.tool_duplicates",{others:s.slice(1).map(_).join("、")})),o.push({name:t.displayName,status:n.length>0?"warn":"pass",message:[_(s[0]),...n,...n.length>0?[u.t("doctor.run_upgrade",{tool:e})]:[]].join("\n ")})}return o}()),c.push(...await async function(){const o=[];for(const e of L()){const t=await C(e,{refresh:!0});if(!t.installed||!t.current)continue;const s=u.t("doctor.app_version",{tool:t.name});if(t.outdated){const n=t.blocker?u.t(`app_update.blocked_${t.blocker}`,{tool:t.name,url:U(e)?.appInstaller.downloadPage??"",command:S(e)}):u.t("doctor.run_app_upgrade",{command:S(e)});o.push({name:s,status:"warn",message:`${H(t)}\n ${n}`})}else o.push({name:s,status:"pass",message:H(t)})}return o}());const W=function(){if(!p.isToolInstalled("claude-code"))return null;const o=u.t("doctor.claude_config"),e=h();if(e.length>0){const t=e.map(o=>`${o.source}: ${o.keys.join(", ")}`).join("; ");return{name:o,status:"fail",message:u.t("doctor.claude_managed",{detail:t})}}let t={};try{t=JSON.parse(a(i(process.env.CLAUDE_CONFIG_DIR?.trim()||i(j(),".claude"),"settings.json"),"utf-8")).env??{}}catch{}const s=l.getApiKeyForTool("claude-code");return t.ANTHROPIC_AUTH_TOKEN&&t.ANTHROPIC_BASE_URL?t.ANTHROPIC_BASE_URL!==l.getBaseUrl()||s&&t.ANTHROPIC_AUTH_TOKEN!==s?{name:o,status:"warn",message:u.t("doctor.claude_config_changed")}:{name:o,status:"pass"}:{name:o,status:"warn",message:u.t("doctor.claude_not_configured")}}();W&&c.push(W),V.includes("claude-code")&&v()&&c.push({name:u.t("doctor.claude_login"),status:"pass",message:u.t("tools.claude_code.account_login_overridden")});const z=V.includes("codex")?y():null;if(V.includes("codex")&&c.push({name:u.t("doctor.codex_auth"),status:z?"fail":"pass",message:z?u.t(`doctor.codex_${z}`,{path:P(w())}):void 0}),V.includes("codex")){const o=k();c.push({name:u.t("doctor.codex_catalog"),status:o?"fail":"pass",message:o?u.t("doctor.codex_catalog_rejected",{path:o.bin,version:o.version??"?",error:o.error}):void 0})}V.includes("codex")&&b()&&c.push({name:u.t("doctor.codex_work_mode"),status:"warn",message:u.t("tools.codex.work_mode_on")}),"win32"===process.platform&&V.includes("claude-code")&&!process.env.CLAUDE_CODE_GIT_BASH_PATH&&c.push({name:"Git for Windows",status:p.isGitInstalled()?"pass":"warn",message:p.isGitInstalled()?void 0:u.t("tools.claude_code.no_git_bash")}),n.deep&&V.includes("claude-code")&&(r.text=u.t("doctor.check_claude_request"),c.push(function(){const o=u.t("doctor.claude_request"),e=g(f("claude-code").installSpec)[0];if(!e)return{name:o,status:"warn",message:u.t("doctor.claude_request_skipped")};const t={encoding:"utf-8",timeout:12e4,windowsHide:!0,stdio:["ignore","pipe","pipe"]},n=["-p","Reply with the single word OK."],r=/\.cmd$/i.test(e.path)?s(`"${e.path}" ${n.map(o=>`"${o}"`).join(" ")}`,{...t,shell:!0}):s(e.path,n,t),a=`${r.stdout??""}`.trim();if(0===r.status&&a)return{name:o,status:"pass",message:a.slice(0,80)};const c=(`${r.stderr??""}`.trim()||a||r.error?.message||`exit ${r.status}`).slice(0,300);return{name:o,status:"fail",message:u.t("doctor.claude_request_failed",{reason:c})}}())),r.stop(),console.log("\n"+e.bold(u.t("doctor.results_title"))+"\n");const J={pass:e.green("√"),warn:e.yellow("!"),fail:e.red("×")};for(const o of c)console.log(`${J[o.status]} ${o.name}`),o.message&&console.log(e.gray(` ${o.message}`));if(c.every(o=>"pass"===o.status)&&console.log("\n"+e.green.bold(u.t("doctor.all_good"))),!n.deep&&V.includes("claude-code")&&console.log(e.gray("\n"+u.t("doctor.deep_hint"))),n.report){const o=t(u.t("doctor.report_uploading")).start(),e=await O(function(o,e){const t={};for(const o of T()){if(o.hidden)continue;let e=null;try{e=p.detectCurrentConfig(o.name).apiKey?"has_key":"no_key"}catch{e="unreadable"}t[o.name]={installed:p.isToolInstalled(o.name),version:p.installedVersion(o.name),copies:o.installSpec?g(o.installSpec).map(o=>({kind:o.kind,version:o.version,path:o.path})):void 0,config:e}}const s=l.getProfile();return{checks:o,tools:t,settings:{base_url:l.getBaseUrl(),profile:l.getActiveProfileName(),profiles:l.listProfiles().length,key_fingerprint:l.getApiKeyFingerprint()||null,tool_keys:Object.keys(s.tool_api_keys??{}),models:s.models,tool_models:s.tool_models??{},tool_settings:s.tool_settings??{},lang:l.getLang()},client_config:e,env:{shell:process.env.SHELL??process.env.ComSpec??null,term:process.env.TERM_PROGRAM??null,proxies:M()},log:F()}}(c,{source:Y.source??void 0,revision:Y.revision,problem:Y.problem}));e?o.succeed(u.t("doctor.report_done",{code:e})):o.fail(u.t("doctor.report_failed",{cli:I}))}else c.some(o=>"fail"===o.status)&&console.log(e.gray("\n"+u.t("doctor.report_hint",{cli:I})));const Q=c.filter(o=>"fail"===o.status);Q.length>0&&(N(Q.map(o=>o.message?`${o.name}: ${o.message}`:o.name).join("; ")),process.exitCode=1)}
|
|
1
|
+
import{refreshClientConfig as o}from"../lib/client-config-sync.js";import t from"chalk";import e from"ora";import{spawnSync as s}from"child_process";import{existsSync as r,readdirSync as n,readFileSync as a}from"fs";import{connect as c}from"net";import{join as i}from"path";import{configManager as l}from"../lib/config.js";import{savedApiKey as d}from"./base.js";import{toolManager as p}from"../lib/tool-manager.js";import{i18n as u}from"../lib/i18n.js";import{validateApiKey as m}from"../lib/api-validator.js";import{getAdapter as f}from"../lib/tools/registry.js";import{findInstalls as g,installLabel as _}from"../lib/tools/tool-installs.js";import{detectManagedOverrides as h}from"../lib/tools/claude-managed.js";import{codexAuthProblem as y,codexCatalogRejection as k,codexConfigPath as b,codexWorkModeOn as w}from"../lib/tools/codex.js";import{claudeAccountLoginPresent as j}from"../lib/tools/claude-code.js";import{toolHome as v}from"../lib/tools/types.js";import{gatewayAddresses as $,probeGatewayAddress as x}from"../lib/gateway-addresses.js";import{listAdapters as T}from"../lib/tools/registry.js";import{logger as A}from"../utils/logger.js";import{maskHome as P,maskSecrets as R,noteFailureReason as N,uploadReport as O}from"../lib/telemetry.js";import{systemReport as I}from"../lib/system-report.js";import{CLI_NAME as C}from"../lib/brand.js";import{appStatus as H,appStatusText as L,appTools as S,appUpgradeCommand as U,getApp as E}from"../lib/app-update.js";import{balanceLookupEnabled as K,balanceNeedsAttention as B,balanceText as G,fetchKeyBalances as D}from"../lib/key-balance.js";const q=["HTTPS_PROXY","https_proxy","HTTP_PROXY","http_proxy","ALL_PROXY","all_proxy"];function F(o,t,e=3e3){return new Promise(s=>{const r=c({host:o,port:t}),n=o=>{r.destroy(),s(o)};r.setTimeout(e,()=>n(!1)),r.once("connect",()=>n(!0)),r.once("error",()=>n(!1))})}function M(){const o=A.getLogDir();if(!r(o))return"";const t=n(o).filter(o=>/^\d{4}-\d{2}-\d{2}\.log$/.test(o)).sort().slice(-2).map(t=>`== ${t}\n`+a(i(o,t),"utf-8")).join("\n");return R(t.slice(-15e4))}function X(){const o={};for(const t of q){const e=process.env[t]?.trim();if(e)try{const s=new URL(e.includes("://")?e:`http://${e}`);o[t]=`${s.protocol}//${s.host}`}catch{o[t]="(unparsable)"}}return o}export async function doctorCommand(r={}){const n=e(u.t("doctor.checking")).start(),c=[],A=Number(process.versions.node.split(".")[0]);c.push({name:"Node.js",status:A>=20?"pass":"fail",message:`v${process.versions.node}`}),n.text=u.t("doctor.check_proxy"),c.push(await async function(){const o=u.t("doctor.proxy"),t=new Map;for(const o of q){const e=process.env[o]?.trim();e&&!t.has(e)&&t.set(e,o)}if(0===t.size)return{name:o,status:"pass",message:u.t("doctor.proxy_none")};const e=[];for(const[o,s]of t){let t;try{t=new URL(o.includes("://")?o:`http://${o}`)}catch{e.push(`${s}=${o}`);continue}const r=Number(t.port)||("https:"===t.protocol?443:t.protocol.startsWith("socks")?1080:80);await F(t.hostname,r)||e.push(`${s}=${o}`)}return 0===e.length?{name:o,status:"pass",message:[...t.keys()].join(", ")}:{name:o,status:"fail",message:u.t("doctor.proxy_dead",{proxies:e.join(", ")})}}()),n.text=u.t("doctor.check_api_key_network");const R=d(),Y=u.t("doctor.api_key_network");if(R){const o=await m(R);o.valid?(c.push({name:Y,status:"pass"}),n.text=u.t("doctor.check_balance"),c.push(...await async function(o){if(!K())return[];const t=l.listToolApiKeys().map(o=>({tool:o,key:l.getApiKeyForTool(o)})).filter(t=>Boolean(t.key)&&t.key!==o),e=await D([o,...t.map(o=>o.key)]),s=[{name:u.t("doctor.balance"),key:o},...t.map(o=>({name:u.t("doctor.balance_tool",{tool:f(o.tool)?.displayName??o.tool}),key:o.key}))],r=[];for(const o of s){const t=e.get(o.key);t&&r.push({name:o.name,status:B(t)?"warn":"pass",message:G(t)})}return r}(R))):"invalid_api_key"===o.error?c.push({name:Y,status:"fail",message:u.t("doctor.api_key_invalid")}):(c.push({name:Y,status:"fail",message:`${u.t("doctor.network_error")}: ${o.message??o.error}`}),n.text=u.t("doctor.check_other_addresses"),c.push(await async function(){const o=u.t("doctor.other_addresses"),t=l.getBaseUrl(),e=$().filter(o=>o.url!==t),s=d(),r=await Promise.all(e.map(o=>x(o.url,{apiKey:s}))),n=e.filter((o,t)=>r[t].ok).map(o=>o.url);return 0===n.length?{name:o,status:"fail",message:u.t("doctor.other_addresses_none")}:{name:o,status:"warn",message:u.t("doctor.other_addresses_found",{urls:n.join(", ")})}}()))}else c.push({name:Y,status:"fail",message:u.t("doctor.api_key_missing")});n.text=u.t("doctor.check_client_config");const V=await o();c.push({name:u.t("doctor.client_config"),status:"cloud"===V.source||"cache"===V.source&&!V.problem?"pass":"warn",message:[V.source?u.t(`refresh.source.${V.source}`):u.t("refresh.source.none"),V.revision?u.t("doctor.client_config_revision",{revision:V.revision}):"",V.problem??""].filter(Boolean).join(" · ")}),n.text=u.t("doctor.check_tools");const W=p.getInstalledTools();c.push({name:u.t("doctor.installed_tools"),status:W.length>0?"pass":"warn",message:W.length>0?W.map(o=>f(o)?.displayName??o).join(u.t("setup.list_separator")):u.t("doctor.no_tools_installed")}),c.push(...function(){const o=[];for(const t of p.getInstalledTools()){const e=f(t);if(!e?.installSpec)continue;const s=g(e.installSpec);if(0===s.length)continue;const r=[],n=p.outdatedVersion(t);n&&r.push(u.t("doctor.tool_outdated",{min:n.min})),s.length>1&&r.push(u.t("doctor.tool_duplicates",{others:s.slice(1).map(_).join("、")})),o.push({name:e.displayName,status:r.length>0?"warn":"pass",message:[_(s[0]),...r,...r.length>0?[u.t("doctor.run_upgrade",{tool:t})]:[]].join("\n ")})}return o}()),c.push(...await async function(){const o=[];for(const t of S()){const e=await H(t,{refresh:!0});if(!e.installed||!e.current)continue;const s=u.t("doctor.app_version",{tool:e.name});if(e.outdated){const r=e.blocker?u.t(`app_update.blocked_${e.blocker}`,{tool:e.name,url:E(t)?.appInstaller.downloadPage??"",command:U(t)}):u.t("doctor.run_app_upgrade",{command:U(t)});o.push({name:s,status:"warn",message:`${L(e)}\n ${r}`})}else o.push({name:s,status:"pass",message:L(e)})}return o}());const z=function(){if(!p.isToolInstalled("claude-code"))return null;const o=u.t("doctor.claude_config"),t=h();if(t.length>0){const e=t.map(o=>`${o.source}: ${o.keys.join(", ")}`).join("; ");return{name:o,status:"fail",message:u.t("doctor.claude_managed",{detail:e})}}let e={};try{e=JSON.parse(a(i(process.env.CLAUDE_CONFIG_DIR?.trim()||i(v(),".claude"),"settings.json"),"utf-8")).env??{}}catch{}const s=l.getApiKeyForTool("claude-code");return e.ANTHROPIC_AUTH_TOKEN&&e.ANTHROPIC_BASE_URL?e.ANTHROPIC_BASE_URL!==l.getBaseUrl()||s&&e.ANTHROPIC_AUTH_TOKEN!==s?{name:o,status:"warn",message:u.t("doctor.claude_config_changed")}:{name:o,status:"pass"}:{name:o,status:"warn",message:u.t("doctor.claude_not_configured")}}();z&&c.push(z),W.includes("claude-code")&&j()&&c.push({name:u.t("doctor.claude_login"),status:"pass",message:u.t("tools.claude_code.account_login_overridden")});const J=W.includes("codex")?y():null;if(W.includes("codex")&&c.push({name:u.t("doctor.codex_auth"),status:J?"fail":"pass",message:J?u.t(`doctor.codex_${J}`,{path:P(b())}):void 0}),W.includes("codex")){const o=k();c.push({name:u.t("doctor.codex_catalog"),status:o?"fail":"pass",message:o?u.t("doctor.codex_catalog_rejected",{path:o.bin,version:o.version??"?",error:o.error}):void 0})}W.includes("codex")&&w()&&c.push({name:u.t("doctor.codex_work_mode"),status:"warn",message:u.t("tools.codex.work_mode_on")}),"win32"===process.platform&&W.includes("claude-code")&&!process.env.CLAUDE_CODE_GIT_BASH_PATH&&c.push({name:"Git for Windows",status:p.isGitInstalled()?"pass":"warn",message:p.isGitInstalled()?void 0:u.t("tools.claude_code.no_git_bash")}),r.deep&&W.includes("claude-code")&&(n.text=u.t("doctor.check_claude_request"),c.push(function(){const o=u.t("doctor.claude_request"),t=g(f("claude-code").installSpec)[0];if(!t)return{name:o,status:"warn",message:u.t("doctor.claude_request_skipped")};const e={encoding:"utf-8",timeout:12e4,windowsHide:!0,stdio:["ignore","pipe","pipe"]},r=["-p","Reply with the single word OK."],n=/\.cmd$/i.test(t.path)?s(`"${t.path}" ${r.map(o=>`"${o}"`).join(" ")}`,{...e,shell:!0}):s(t.path,r,e),a=`${n.stdout??""}`.trim();if(0===n.status&&a)return{name:o,status:"pass",message:a.slice(0,80)};const c=(`${n.stderr??""}`.trim()||a||n.error?.message||`exit ${n.status}`).slice(0,300);return{name:o,status:"fail",message:u.t("doctor.claude_request_failed",{reason:c})}}())),n.stop(),console.log("\n"+t.bold(u.t("doctor.results_title"))+"\n");const Q={pass:t.green("√"),warn:t.yellow("!"),fail:t.red("×")};for(const o of c)console.log(`${Q[o.status]} ${o.name}`),o.message&&console.log(t.gray(` ${o.message}`));if(c.every(o=>"pass"===o.status)&&console.log("\n"+t.green.bold(u.t("doctor.all_good"))),!r.deep&&W.includes("claude-code")&&console.log(t.gray("\n"+u.t("doctor.deep_hint"))),r.report){const o=e(u.t("doctor.report_uploading")).start(),t=await O(function(o,t){const e={};for(const o of T()){if(o.hidden)continue;let t=null;try{t=p.detectCurrentConfig(o.name).apiKey?"has_key":"no_key"}catch{t="unreadable"}e[o.name]={installed:p.isToolInstalled(o.name),version:p.installedVersion(o.name),copies:o.installSpec?g(o.installSpec).map(o=>({kind:o.kind,version:o.version,path:o.path})):void 0,config:t}}const s=l.getProfile();return{checks:o,tools:e,settings:{base_url:l.getBaseUrl(),profile:l.getActiveProfileName(),profiles:l.listProfiles().length,key_fingerprint:l.getApiKeyFingerprint()||null,tool_keys:Object.keys(s.tool_api_keys??{}),models:s.models,tool_models:s.tool_models??{},tool_settings:s.tool_settings??{},lang:l.getLang()},client_config:t,env:{shell:process.env.SHELL??process.env.ComSpec??null,term:process.env.TERM_PROGRAM??null,proxies:X()},system:I(),log:M()}}(c,{source:V.source??void 0,revision:V.revision,problem:V.problem}));t?o.succeed(u.t("doctor.report_done",{code:t})):o.fail(u.t("doctor.report_failed",{cli:C}))}else c.some(o=>"fail"===o.status)&&console.log(t.gray("\n"+u.t("doctor.report_hint",{cli:C})));const Z=c.filter(o=>"fail"===o.status);Z.length>0&&(N(Z.map(o=>o.message?`${o.name}: ${o.message}`:o.name).join("; ")),process.exitCode=1)}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import s from"chalk";import{spawnSync as
|
|
1
|
+
import{handTerminalOver as s}from"../lib/signals.js";import o from"chalk";import{spawnSync as t}from"child_process";import{existsSync as e,mkdirSync as i,writeFileSync as n}from"fs";import{dirname as r,join as l,resolve as c}from"path";import{i18n as d}from"../lib/i18n.js";import{emitJson as m,isColorEnabled as a,isJsonMode as f}from"../lib/runtime-options.js";import{maskHome as u}from"../lib/telemetry.js";import{operationError as p,usageError as g}from"../lib/errors.js";import{CLI_NAME as h}from"../lib/brand.js";import{clip as w}from"../lib/sessions/formats.js";import{listSessions as _,readSession as b,resolveSession as $,resumeCommand as v,resumeLine as x,roleLabel as N,sessionMarkdown as y}from"../lib/sessions/index.js";import{padString as j,stringWidth as S}from"../utils/string-width.js";function A(s){return s.replace(/[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g,"")}function C(s){return a()?s:s=>s}function M(s){const o=new Date(s);if(Number.isNaN(o.getTime()))return s;const t=s=>String(s).padStart(2,"0");return`${o.getFullYear()}-${t(o.getMonth()+1)}-${t(o.getDate())} ${t(o.getHours())}:${t(o.getMinutes())}`}function k(s,o){const t=A(s).replace(/\s+/g," ").trim();if(S(t)<=o)return t;let e="";for(const s of t){if(S(e+s)>o-1)break;e+=s}return e+"…"}function D(s){const o=v(s);return{id:s.id,tool:s.tool,title:s.title,cwd:s.cwd,started_at:s.startedAt??null,updated_at:s.updatedAt,provider:s.provider??null,file:s.file,resume:o?x(o):null}}export async function sessionsListCommand(s={}){const t=s.all?0:Number(s.limit??20);if(!s.all&&(!Number.isInteger(t)||t<=0))throw g(d.t("sessions.bad_limit",{value:String(s.limit)}),d.t("sessions.bad_limit_hint",{cli:h}));const e=s.here?process.cwd():s.dir,i=_({tool:s.tool,dir:e,limit:t});if(f())return void m(i.map(D));if(0===i.length)return void console.log(d.t("sessions.none"));const n=C(o.gray),r=C(o.cyan),l=Math.max(...i.map(s=>S(s.toolName)),4);for(const s of i){const o=`${r(s.id.slice(0,8))} ${j(s.toolName,l)} ${n(M(s.updatedAt))}`;console.log(`${o} ${k(s.title||"-",60)}`),s.cwd&&console.log(n(` ${A(u(s.cwd))}`))}console.log(n("\n"+d.t("sessions.list_footer",{cli:h,count:String(i.length)})))}export async function sessionsShowCommand(s,t={}){const e=Number(t.messages??6);if(!Number.isInteger(e)||e<0)throw g(d.t("sessions.bad_limit",{value:String(t.messages)}),d.t("sessions.bad_limit_hint",{cli:h}));const i=$(s),n=b(i);if(f())return void m({...D(i),message_count:n.length,messages:n.slice(0,e)});const r=C(o.gray),l=C(o.cyan),c=C(o.bold),a=v(i);console.log("\n"+c(A(i.title||i.id))+"\n");const p=[[d.t("sessions.field.tool"),i.toolName],[d.t("sessions.field.id"),i.id],[d.t("sessions.field.started"),i.startedAt?M(i.startedAt):void 0],[d.t("sessions.field.updated"),M(i.updatedAt)],[d.t("sessions.field.cwd"),i.cwd?u(i.cwd):void 0],[d.t("sessions.field.provider"),i.provider],[d.t("sessions.field.messages"),String(n.length)],[d.t("sessions.field.file"),u(i.file)],[d.t("sessions.field.resume"),a?x(a):d.t("sessions.no_resume")]],_=Math.max(...p.map(([s])=>S(s)));for(const[s,o]of p)o&&console.log(` ${l(j(s,_))} ${A(o)}`);for(const s of n.slice(0,e))console.log("\n"+c(`[${N(s.role)}]`)+(s.timestamp?r(` ${M(s.timestamp)}`):"")),console.log(A(w(s.text,500)));n.length>e&&console.log(r("\n"+d.t("sessions.more_messages",{more:String(n.length-e),cli:h,id:i.id.slice(0,8)})))}export async function sessionsResumeCommand(i,n={}){const r=$(i),l=v(r);if(!l)throw g(d.t("sessions.cannot_resume",{tool:r.toolName}),d.t("sessions.cannot_resume_hint",{tool:r.toolName}));const c=x(l);if(!n.run)return void(f()?m({id:r.id,tool:r.tool,command:l.command,args:l.args,cwd:l.cwd||null,line:c}):console.log(c));const a=l.cwd&&e(l.cwd)?l.cwd:void 0;l.cwd&&!a&&console.error(C(o.yellow)(d.t("sessions.cwd_missing",{dir:l.cwd})));const u=s(()=>t(l.command,l.args,{cwd:a,stdio:"inherit",shell:"win32"===process.platform}));if(u.error)throw p(d.t("sessions.run_failed",{command:l.command,error:u.error.message}),d.t("sessions.run_failed_hint",{line:c}));"number"==typeof u.status&&0!==u.status&&(process.exitCode=u.status)}function I(s,o,t){const i=`${o.tool}-${o.id}`.replace(/[^A-Za-z0-9_-]/g,"_");let n=l(s,`${i}.md`);for(let o=2;t.has(n)||e(n);o++)n=l(s,`${i}-${o}.md`);if(r(c(n))!==c(s))throw p(d.t("sessions.export_bad_path",{path:n}),"");return t.add(n),n}export async function sessionsExportCommand(s,t={}){if(!t.output)throw g(d.t("sessions.export_needs_output"),d.t("sessions.export_hint",{cli:h}));const e=s.map($),r=c(t.output);i(r,{recursive:!0});const l=new Set,a=[];for(const s of e){const o=I(r,s,l);n(o,y(s,b(s,{details:t.tools})),"utf-8"),a.push({id:s.id,tool:s.tool,path:o})}if(f())m({written:a});else for(const s of a)console.log(C(o.green)("√ ")+u(s.path))}
|
package/dist/commands/setup.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import o from"chalk";import{getAdapter as e}from"../lib/tools/registry.js";import{postApplyPrompts as t}from"../lib/post-apply.js";import{ensureReachableGatewayAddress as l}from"./base.js";import{i18n as i}from"../lib/i18n.js";import{configManager as s}from"../lib/config.js";import{toolManager as a,SUPPORTED_TOOLS as n}from"../lib/tool-manager.js";import{validateApiKey as r,fetchModels as d}from"../lib/api-validator.js";import{CODEX_ONE_MILLION_CONTEXT_SETTING as p,setCodexOneMillionContext as c}from"../lib/tools/codex.js";import{resolveModelCatalog as u}from"../lib/model-catalog.js";import{CLAUDE_DESKTOP_FORCE_REGISTRY_SETTING as f,CLAUDE_DESKTOP_HIDE_OFFICIAL_LOGIN_SETTING as m}from"../lib/tools/claude-desktop.js";import{operationError as g,authenticationError as y,networkError as k,EXIT_CODES as _}from"../lib/errors.js";import{canPrompt as h,emitJson as b,hasExplicitYes as w,isColorEnabled as v,isDryRun as x,isJsonMode as C,isNonInteractive as j,shouldAutoConfirm as T}from"../lib/runtime-options.js";import{appsForTools as K,appUpgradeCommand as $,getApp as M}from"../lib/app-update.js";import{join as G}from"path";import{confirmAction as I}from"../lib/confirm.js";import{asksBeforeWriting as O,confirmWritePlan as S,printWritePlan as N,toolWritePlan as E}from"../lib/write-plan.js";import A from"inquirer";import{logger as B}from"../utils/logger.js";import{forgetInstalls as D}from"../lib/tools/tool-installs.js";import{CLI_NAME as F,brandEnv as q}from"../lib/brand.js";export const DEDICATED_KEYS=[{option:"claudekey",tool:"claude-code",need:"claude"},{option:"codexkey",tool:"codex",need:"gpt"},{option:"grokkey",tool:"grok",need:"grok"},{option:"desktopkey",tool:"claude-desktop",need:"claude"},{option:"agykey",tool:"agy",need:"gemini"},{option:"openclawkey",tool:"openclaw",need:"any",hidden:!0},{option:"hermeskey",tool:"hermes",need:"any",hidden:!0},{option:"atomcodekey",tool:"atomcode",need:"any",hidden:!0},{option:"codebuddykey",tool:"codebuddy",need:"any"},{option:"workbuddykey",tool:"workbuddy",need:"any"},{option:"dshkey",tool:"dsh",need:"any"}];async function L(o){const e=await d(o);if(!e.ok)return{hasClaude:!0,hasGpt:!0,hasGrok:!0,hasGemini:!0,probed:!1};const t=e.models.map(o=>o.toLowerCase());return{hasClaude:t.some(o=>o.includes("claude")),hasGpt:t.some(o=>o.startsWith("gpt")||o.includes("gpt-")||/^o\d/.test(o)),hasGrok:t.some(o=>o.includes("grok")),hasGemini:t.some(o=>o.startsWith("gemini")),probed:!0}}function R(o,e){switch(e){case"claude":return o.hasClaude;case"gpt":return o.hasGpt;case"grok":return o.hasGrok;case"gemini":return o.hasGemini;default:return!0}}export function parseOnOff(o){const e=(o??"").trim().toLowerCase();return!!["on","true","show","1","yes","y"].includes(e)||!["off","false","hide","0","no","n"].includes(e)&&void 0}function P(e){console.log(o.green(e))}function Y(e){console.log(o.yellow(e))}function z(e){console.error(o.red(e))}let H=null;function W(o){const e={operation:1,authentication:2,network:3};(!H||e[o]>e[H])&&(H=o)}async function U(e,t){C()||console.log(o.gray(i.t("setup.validating",{label:e})));const l=await r(t);if(l.valid)return!0;const a=i.t("errors.key_placeholder"),n="--key"===e?`${F} setup --key ${a}`:`${F} setup ${e} ${a}`;let d;if("network_error"===l.error?(W("network"),d=k(i.t("setup.unreachable",{url:s.getBaseUrl(),reason:l.message||"network error"}),`${F} base auto`,"network_error")):"invalid_api_key"===l.error?(W("authentication"),d=y(i.t("setup.invalid_key",{label:e,reason:l.message||"invalid"}),n,"invalid_api_key")):(W("operation"),d=g(i.t("setup.validate_failed",{label:e,reason:l.message||l.error||"unknown"}),n,l.error)),C())throw d;return z(d.message),console.log(o.gray(i.t("errors.next_step",{command:d.hint}))),!1}async function V(t,l,r={}){const{oneMillion:d,officialLogin:c,desktopRegistry:u,force:y,takeOver:k}=r,_=n[t];try{"claude-desktop"===t&&void 0!==u&&s.setToolSetting("claude-desktop",f,u),"codex"===t&&void 0!==d&&s.setToolSetting("codex",p,d),"claude-desktop"===t&&void 0!==c&&s.setToolSetting("claude-desktop",m,!c),await a.applyPrivateConfig(t,l,s.getModelsForTool(t),{force:y,takeOver:k})}catch(o){if(C())throw g(o instanceof Error?o.message:String(o),`${F} setup --key ${i.t("errors.key_placeholder")}`,"config_write_failed");const e=(o instanceof Error?o.message:String(o)).replace(/\s+/g," ").trim();return z("× "+i.t("setup.apply_failed",{tool:_.displayName,reason:e})),!1}return a.printApplied(t),y&&console.log(o.gray(" "+i.t("config.force_done",{tool:_.displayName,name:t}))),"codex"===t&&void 0!==d&&console.log(o.gray(" "+i.t(d?"setup.codex_1m_enabled":"setup.codex_1m_disabled"))),e(t)?.isInstalled&&!a.isToolInstalled(t)&&console.log(o.yellow(" ! "+i.t("setup.gui_preconfigured",{tool:_.displayName,install:_.installCommand}))),!0}function J(o){return!e(o)?.isInstalled&&!a.isToolInstalled(o)}async function Q(o){if(w())return!0;const e=n[o]?.displayName??o;return h()?I({message:i.t("setup.ask_detected_tool",{tool:e}),defaultValue:!0}):(Y(i.t("setup.detected_tool_hint",{tool:e,name:o})),!1)}export async function installMissingApps(e,t){const l=K(e).filter(o=>{const e=M(o)?.appInstaller;try{return Boolean(e&&!e.blocker()&&!e.installedPath())}catch(e){return B.logError(`setup: app installed? ${o}`,e),!1}});if(0===l.length)return!1;const s=o=>M(o)?.displayName??o;let a=t;if(void 0===a&&!C())if(T())a=!j();else if(h()){const o=l.map(s).join(i.t("setup.list_separator")),e=l.reduce((o,e)=>o+(M(e)?.appInstaller.sizeMb()??0),0);console.log(""),a=(await A.prompt([{type:"confirm",name:"go",message:i.t("setup.install_app_confirm",{tools:o,size:String(e)}),default:!0}])).go}if(!a&&!C())for(const e of l)console.log(o.gray(i.t("setup.install_app_hint",{tool:s(e),command:$(e)})));return Boolean(a)}function X(o){Y(i.t("setup.still_missing",{tools:o.map(o=>n[o].displayName).join(i.t("setup.list_separator")),commands:o.map(o=>`${F} config ${o} --yes`).join(i.t("setup.list_separator"))}))}function Z(e,t,l=[]){const a=E(e),n=G(s.getConfigDir(),"config.yaml");if(C())b({dry_run:!0,tools:a,install_first:l,key_file:t?n:null});else{if(0===a.length&&0===l.length){const e=(v()?o.cyan:o=>o)(i.t("runtime.dry_run_label"));return void console.log(`${e} ${i.t("setup.dry_run_none")}`)}N(a,{label:i.t("runtime.dry_run_label"),keyFile:t?n:void 0,installFirst:l})}}function oo(){return"darwin"===process.platform||"win32"===process.platform||a.isToolInstalled("claude-desktop")}export async function setupCommand(r){H=null;const d=r.key?.trim(),f=DEDICATED_KEYS.map(o=>({...o,apiKey:r[o.option]?.trim()})).filter(o=>Boolean(o.apiKey)),m=void 0!==r.oneMillion,g=void 0!==r.claudeOfficial;let y;if(g&&(y=parseOnOff(r.claudeOfficial),void 0===y))return z(i.t("setup.claude_official_invalid",{value:String(r.claudeOfficial)})),void(process.exitCode=1);const k=void 0!==r.desktopRegistry;let h;if(k&&(h=parseOnOff(r.desktopRegistry),void 0===h))return z(i.t("setup.desktop_registry_invalid",{value:String(r.desktopRegistry)})),void(process.exitCode=1);const b=g||k,w=Boolean(d||f.length>0),v={oneMillion:r.oneMillion,officialLogin:y,desktopRegistry:h,force:r.force};if(!w&&(m||b)&&x())return void Z([...m?["codex"]:[],...b?["claude-desktop"]:[]],!1);if(!w&&(m||b)){if(m){const o=s.getApiKeyForTool("codex");if(o)try{const e=!0===r.oneMillion;s.setToolSetting("codex",p,e);const t=await u(o);c(e,t??void 0),P(i.t(e?"setup.codex_1m_enabled":"setup.codex_1m_disabled"))}catch(o){z(i.t("setup.apply_failed",{tool:n.codex.displayName,reason:o instanceof Error?o.message:String(o)})),process.exitCode=1}else z(i.t("setup.codex_1m_missing_key")),process.exitCode=1}if(b){const o=s.getApiKeyForTool("claude-desktop");o?await V("claude-desktop",o,{...v,oneMillion:void 0,takeOver:!0})?await t(["claude-desktop"],{apps:{install:!1}}):process.exitCode=1:(z(i.t("setup.desktop_official_login_missing_key")),process.exitCode=1)}return}if(!w)return z(i.t("setup.usage")),void(process.exitCode=1);const K=x();K||await l(d||f[0].apiKey);const $=[],M=[];let I,N=0,E=0;const W=new Set,eo=f.map(o=>({tool:o.tool,label:`--${o.option}`,apiKey:o.apiKey,need:o.need}));for(const o of eo){if(!await U(o.label,o.apiKey)){E+=1;continue}const e=await L(o.apiKey);!e.probed||R(e,o.need)?(e.probed||Y(i.t("setup.probe_failed",{label:o.label})),$.push({tool:o.tool,apiKey:o.apiKey,dedicated:!0}),W.add(o.tool)):(z(i.t(`setup.key_no_${o.need}`,{label:o.label,tool:n[o.tool].displayName})),E+=1)}const to=!!d&&await U("--key",d);d&&!to&&(I=_[H??"operation"]);const lo=d&&to?await L(d):void 0;if(d&&lo&&!lo.probed&&Y(i.t("setup.probe_failed",{label:"--key"})),!(d&&lo&&lo.probed)||lo.hasClaude||lo.hasGpt||lo.hasGrok||lo.hasGemini||(z(i.t("setup.key_no_family")),I=1),d&&lo&&void 0===I){const o=lo.hasClaude||lo.hasGpt||lo.hasGrok||lo.hasGemini,e=[{tool:"claude-code",capable:lo.hasClaude,skipMsg:i.t(oo()?"setup.skip_no_claude_desktop":"setup.skip_no_claude")},{tool:"codex",capable:lo.hasGpt,skipMsg:i.t("setup.skip_no_gpt")},{tool:"grok",capable:lo.hasGrok,skipMsg:i.t("setup.skip_no_grok")},{tool:"claude-desktop",capable:lo.hasClaude&&oo(),skipMsg:"",quiet:!0},{tool:"agy",capable:lo.hasGemini,skipMsg:i.t("setup.skip_no_gemini")},{tool:"codebuddy",capable:o&&a.isToolInstalled("codebuddy"),skipMsg:"",quiet:!0},{tool:"workbuddy",capable:o&&a.isToolInstalled("workbuddy"),skipMsg:"",quiet:!0},{tool:"dsh",capable:o&&a.isToolInstalled("dsh"),skipMsg:"",quiet:!0,ask:!0}];for(const o of e)W.has(o.tool)||(o.capable?(!o.ask||K||await Q(o.tool))&&($.push({tool:o.tool,apiKey:d,dedicated:!1}),W.add(o.tool)):o.quiet||Y(o.skipMsg))}const io=Boolean(d&&to&&void 0===I);if(K)return Z($.filter(o=>!J(o.tool)).map(o=>o.tool),$.length>0,$.filter(o=>J(o.tool)).map(o=>o.tool)),void((E>0||void 0!==I)&&(process.exitCode=I??_[H??"operation"]));const so=$.filter(o=>!J(o.tool)),ao=io||$.some(o=>o.dedicated),no=!r.fromInstaller&&O();if(($.length>0||ao)&&!r.fromInstaller&&!await S(so.map(o=>o.tool),{keyFile:ao?G(s.getConfigDir(),"config.yaml"):void 0,installFirst:$.filter(o=>J(o.tool)).map(o=>o.tool)}))return void(process.exitCode=_.cancelled);io&&d&&s.setApiKey(d);for(const o of $)o.dedicated&&s.setToolApiKey(o.tool,o.apiKey),J(o.tool)?M.push({tool:o.tool,apiKey:o.apiKey}):await V(o.tool,o.apiKey,{...v,takeOver:o.dedicated||no})?N+=1:(E+=1,W.delete(o.tool));if(void 0!==I)return M.length>0&&X(M.map(o=>o.tool)),void(process.exitCode=I);let ro=[];if(M.length>0){const e=await async function(e,t,l){const s=e.map(o=>o.tool);if(0===s.length)return{still:[],applied:[],failed:[]};const r=s.map(o=>n[o].displayName).join(i.t("setup.list_separator"));let d=t;if(void 0!==d||C()||(T()?d=!j():process.stdin.isTTY&&(console.log(""),d=(await A.prompt([{type:"confirm",name:"go",message:i.t("setup.install_confirm",{tools:r}),default:!0}])).go)),!d){console.log("");for(const e of s)console.log(o.yellow("! "+i.t("setup.install_hint",{tool:n[e].displayName,install:n[e].installCommand})));return C()||console.log(o.gray(i.t("setup.install_all_hint",{cli:F}))),{still:s,applied:[],failed:[]}}const p=[];for(const e of s){console.log(o.bold(`\n${n[e].displayName}`));try{await a.installTool(e)}catch(o){B.logError(`setup: install ${e}`,o)}D(),a.isToolInstalled(e)||p.push(e)}const c=s.filter(o=>!p.includes(o));c.length>0&&console.log("");const u=[],f=[];for(const{tool:o,apiKey:t}of e.filter(o=>c.includes(o.tool)))await V(o,t,l)?u.push(o):f.push(o);return{still:p,applied:u,failed:f}}(M,r.install,v);ro=e.still,N+=e.applied.length,E+=e.failed.length;for(const o of[...ro,...e.failed])W.delete(o)}if(N>0){const t=[...W].filter(o=>!e(o)?.isInstalled&&!ro.includes(o)),l=t.map(o=>n[o]?.command).filter(Boolean).join(" / "),s=i.t("setup.done",{count:String(N)});P("\n"+(l?`${s}${i.t("setup.done_commands",{commands:l})}`:s)),ro.length>0&&X(ro);for(const o of t){const e=a.ensureNativeOnPath(o);e&&P(i.t("setup.path_added",{tool:n[o].displayName,dir:e}))}const r=t.filter(o=>!a.isOnPath(o));if(r.length>0&&!C()&&"1"!==q("PATH_HINT_BY_CALLER")){const e=r.map(o=>n[o].command).join(" / ");console.log(o.yellow(" ! "+i.t("win32"===process.platform?"setup.path_reload_windows":"setup.path_reload",{commands:e})))}}0===N&&ro.length>0&&X(ro),E>0&&(z(i.t("setup.failed_summary",{count:String(E)})),C()||console.error(`${F} setup --key ${i.t("errors.key_placeholder")}`)),await t([...W],{apps:{install:await installMissingApps([...W],r.install)}}),(E>0||0===N&&0===ro.length)&&(process.exitCode=_[H??"operation"])}
|
|
1
|
+
import o from"chalk";import{getAdapter as e}from"../lib/tools/registry.js";import{postApplyPrompts as t}from"../lib/post-apply.js";import{ensureReachableGatewayAddress as l,saveGatewayFallback as i}from"./base.js";import{i18n as s}from"../lib/i18n.js";import{configManager as a}from"../lib/config.js";import{toolManager as n,SUPPORTED_TOOLS as r}from"../lib/tool-manager.js";import{validateApiKey as d,fetchModels as p}from"../lib/api-validator.js";import{CODEX_ONE_MILLION_CONTEXT_SETTING as c,setCodexOneMillionContext as u}from"../lib/tools/codex.js";import{resolveModelCatalog as f}from"../lib/model-catalog.js";import{CLAUDE_DESKTOP_FORCE_REGISTRY_SETTING as m,CLAUDE_DESKTOP_HIDE_OFFICIAL_LOGIN_SETTING as g}from"../lib/tools/claude-desktop.js";import{operationError as y,authenticationError as k,networkError as _,EXIT_CODES as h}from"../lib/errors.js";import{canPrompt as b,emitJson as w,hasExplicitYes as v,isColorEnabled as x,isDryRun as C,isJsonMode as j,isNonInteractive as K,shouldAutoConfirm as T}from"../lib/runtime-options.js";import{appsForTools as $,appUpgradeCommand as M,getApp as G}from"../lib/app-update.js";import{join as I}from"path";import{confirmAction as O}from"../lib/confirm.js";import{asksBeforeWriting as S,confirmWritePlan as N,printWritePlan as A,toolWritePlan as E}from"../lib/write-plan.js";import B from"inquirer";import{logger as D}from"../utils/logger.js";import{forgetInstalls as F}from"../lib/tools/tool-installs.js";import{CLI_NAME as q,brandEnv as L}from"../lib/brand.js";export const DEDICATED_KEYS=[{option:"claudekey",tool:"claude-code",need:"claude"},{option:"codexkey",tool:"codex",need:"gpt"},{option:"grokkey",tool:"grok",need:"grok"},{option:"desktopkey",tool:"claude-desktop",need:"claude"},{option:"agykey",tool:"agy",need:"gemini"},{option:"openclawkey",tool:"openclaw",need:"any",hidden:!0},{option:"hermeskey",tool:"hermes",need:"any",hidden:!0},{option:"atomcodekey",tool:"atomcode",need:"any",hidden:!0},{option:"codebuddykey",tool:"codebuddy",need:"any"},{option:"workbuddykey",tool:"workbuddy",need:"any"},{option:"dshkey",tool:"dsh",need:"any"}];async function R(o){const e=await p(o);if(!e.ok)return{hasClaude:!0,hasGpt:!0,hasGrok:!0,hasGemini:!0,probed:!1};const t=e.models.map(o=>o.toLowerCase());return{hasClaude:t.some(o=>o.includes("claude")),hasGpt:t.some(o=>o.startsWith("gpt")||o.includes("gpt-")||/^o\d/.test(o)),hasGrok:t.some(o=>o.includes("grok")),hasGemini:t.some(o=>o.startsWith("gemini")),probed:!0}}function P(o,e){switch(e){case"claude":return o.hasClaude;case"gpt":return o.hasGpt;case"grok":return o.hasGrok;case"gemini":return o.hasGemini;default:return!0}}export function parseOnOff(o){const e=(o??"").trim().toLowerCase();return!!["on","true","show","1","yes","y"].includes(e)||!["off","false","hide","0","no","n"].includes(e)&&void 0}function Y(e){console.log(o.green(e))}function z(e){console.log(o.yellow(e))}function H(e){console.error(o.red(e))}let W=null;function U(o){const e={operation:1,authentication:2,network:3};(!W||e[o]>e[W])&&(W=o)}async function V(e,t){j()||console.log(o.gray(s.t("setup.validating",{label:e})));const l=await d(t);if(l.valid)return!0;const i=s.t("errors.key_placeholder"),n="--key"===e?`${q} setup --key ${i}`:`${q} setup ${e} ${i}`;let r;if("network_error"===l.error?(U("network"),r=_(s.t("setup.unreachable",{url:a.getBaseUrl(),reason:l.message||"network error"}),`${q} base auto`,"network_error")):"invalid_api_key"===l.error?(U("authentication"),r=k(s.t("setup.invalid_key",{label:e,reason:l.message||"invalid"}),n,"invalid_api_key")):(U("operation"),r=y(s.t("setup.validate_failed",{label:e,reason:l.message||l.error||"unknown"}),n,l.error)),j())throw r;return H(r.message),console.log(o.gray(s.t("errors.next_step",{command:r.hint}))),!1}async function J(t,l,i={}){const{oneMillion:d,officialLogin:p,desktopRegistry:u,force:f,takeOver:k}=i,_=r[t];try{"claude-desktop"===t&&void 0!==u&&a.setToolSetting("claude-desktop",m,u),"codex"===t&&void 0!==d&&a.setToolSetting("codex",c,d),"claude-desktop"===t&&void 0!==p&&a.setToolSetting("claude-desktop",g,!p),await n.applyPrivateConfig(t,l,a.getModelsForTool(t),{force:f,takeOver:k})}catch(o){if(j())throw y(o instanceof Error?o.message:String(o),`${q} setup --key ${s.t("errors.key_placeholder")}`,"config_write_failed");const e=(o instanceof Error?o.message:String(o)).replace(/\s+/g," ").trim();return H("× "+s.t("setup.apply_failed",{tool:_.displayName,reason:e})),!1}return n.printApplied(t),f&&console.log(o.gray(" "+s.t("config.force_done",{tool:_.displayName,name:t}))),"codex"===t&&void 0!==d&&console.log(o.gray(" "+s.t(d?"setup.codex_1m_enabled":"setup.codex_1m_disabled"))),e(t)?.isInstalled&&!n.isToolInstalled(t)&&console.log(o.yellow(" ! "+s.t("setup.gui_preconfigured",{tool:_.displayName,install:_.installCommand}))),!0}function Q(o){return!e(o)?.isInstalled&&!n.isToolInstalled(o)}async function X(o){if(v())return!0;const e=r[o]?.displayName??o;return b()?O({message:s.t("setup.ask_detected_tool",{tool:e}),defaultValue:!0}):(z(s.t("setup.detected_tool_hint",{tool:e,name:o})),!1)}export async function installMissingApps(e,t){const l=$(e).filter(o=>{const e=G(o)?.appInstaller;try{return Boolean(e&&!e.blocker()&&!e.installedPath())}catch(e){return D.logError(`setup: app installed? ${o}`,e),!1}});if(0===l.length)return!1;const i=o=>G(o)?.displayName??o;let a=t;if(void 0===a&&!j())if(T())a=!K();else if(b()){const o=l.map(i).join(s.t("setup.list_separator")),e=l.reduce((o,e)=>o+(G(e)?.appInstaller.sizeMb()??0),0);console.log(""),a=(await B.prompt([{type:"confirm",name:"go",message:s.t("setup.install_app_confirm",{tools:o,size:String(e)}),default:!0}])).go}if(!a&&!j())for(const e of l)console.log(o.gray(s.t("setup.install_app_hint",{tool:i(e),command:M(e)})));return Boolean(a)}function Z(o){z(s.t("setup.still_missing",{tools:o.map(o=>r[o].displayName).join(s.t("setup.list_separator")),commands:o.map(o=>`${q} config ${o} --yes`).join(s.t("setup.list_separator"))}))}function oo(e,t,l=[]){const i=E(e),n=I(a.getConfigDir(),"config.yaml");if(j())w({dry_run:!0,tools:i,install_first:l,key_file:t?n:null});else{if(0===i.length&&0===l.length){const e=(x()?o.cyan:o=>o)(s.t("runtime.dry_run_label"));return void console.log(`${e} ${s.t("setup.dry_run_none")}`)}A(i,{label:s.t("runtime.dry_run_label"),keyFile:t?n:void 0,installFirst:l})}}function eo(){return"darwin"===process.platform||"win32"===process.platform||n.isToolInstalled("claude-desktop")}export async function setupCommand(d){W=null;const p=d.key?.trim(),m=DEDICATED_KEYS.map(o=>({...o,apiKey:d[o.option]?.trim()})).filter(o=>Boolean(o.apiKey)),g=void 0!==d.oneMillion,y=void 0!==d.claudeOfficial;let k;if(y&&(k=parseOnOff(d.claudeOfficial),void 0===k))return H(s.t("setup.claude_official_invalid",{value:String(d.claudeOfficial)})),void(process.exitCode=1);const _=void 0!==d.desktopRegistry;let b;if(_&&(b=parseOnOff(d.desktopRegistry),void 0===b))return H(s.t("setup.desktop_registry_invalid",{value:String(d.desktopRegistry)})),void(process.exitCode=1);const w=y||_,v=Boolean(p||m.length>0),x={oneMillion:d.oneMillion,officialLogin:k,desktopRegistry:b,force:d.force};if(!v&&(g||w)&&C())return void oo([...g?["codex"]:[],...w?["claude-desktop"]:[]],!1);if(!v&&(g||w)){if(g){const o=a.getApiKeyForTool("codex");if(o)try{const e=!0===d.oneMillion;a.setToolSetting("codex",c,e);const t=await f(o);u(e,t??void 0),Y(s.t(e?"setup.codex_1m_enabled":"setup.codex_1m_disabled"))}catch(o){H(s.t("setup.apply_failed",{tool:r.codex.displayName,reason:o instanceof Error?o.message:String(o)})),process.exitCode=1}else H(s.t("setup.codex_1m_missing_key")),process.exitCode=1}if(w){const o=a.getApiKeyForTool("claude-desktop");o?await J("claude-desktop",o,{...x,oneMillion:void 0,takeOver:!0})?await t(["claude-desktop"],{apps:{install:!1}}):process.exitCode=1:(H(s.t("setup.desktop_official_login_missing_key")),process.exitCode=1)}return}if(!v)return H(s.t("setup.usage")),void(process.exitCode=1);const $=C();$||await l(p||m[0].apiKey,{save:!1});const M=[],G=[];let O,A=0,E=0;const U=new Set,to=m.map(o=>({tool:o.tool,label:`--${o.option}`,apiKey:o.apiKey,need:o.need}));for(const o of to){if(!await V(o.label,o.apiKey)){E+=1;continue}const e=await R(o.apiKey);!e.probed||P(e,o.need)?(e.probed||z(s.t("setup.probe_failed",{label:o.label})),M.push({tool:o.tool,apiKey:o.apiKey,dedicated:!0}),U.add(o.tool)):(H(s.t(`setup.key_no_${o.need}`,{label:o.label,tool:r[o.tool].displayName})),E+=1)}const lo=!!p&&await V("--key",p);p&&!lo&&(O=h[W??"operation"]);const io=p&&lo?await R(p):void 0;if(p&&io&&!io.probed&&z(s.t("setup.probe_failed",{label:"--key"})),!(p&&io&&io.probed)||io.hasClaude||io.hasGpt||io.hasGrok||io.hasGemini||(H(s.t("setup.key_no_family")),O=1),p&&io&&void 0===O){const o=io.hasClaude||io.hasGpt||io.hasGrok||io.hasGemini,e=[{tool:"claude-code",capable:io.hasClaude,skipMsg:s.t(eo()?"setup.skip_no_claude_desktop":"setup.skip_no_claude")},{tool:"codex",capable:io.hasGpt,skipMsg:s.t("setup.skip_no_gpt")},{tool:"grok",capable:io.hasGrok,skipMsg:s.t("setup.skip_no_grok")},{tool:"claude-desktop",capable:io.hasClaude&&eo(),skipMsg:"",quiet:!0},{tool:"agy",capable:io.hasGemini,skipMsg:s.t("setup.skip_no_gemini")},{tool:"codebuddy",capable:o&&n.isToolInstalled("codebuddy"),skipMsg:"",quiet:!0},{tool:"workbuddy",capable:o&&n.isToolInstalled("workbuddy"),skipMsg:"",quiet:!0},{tool:"dsh",capable:o&&n.isToolInstalled("dsh"),skipMsg:"",quiet:!0,ask:!0}];for(const o of e)U.has(o.tool)||(o.capable?(!o.ask||$||await X(o.tool))&&(M.push({tool:o.tool,apiKey:p,dedicated:!1}),U.add(o.tool)):o.quiet||z(o.skipMsg))}const so=Boolean(p&&lo&&void 0===O);if($)return oo(M.filter(o=>!Q(o.tool)).map(o=>o.tool),M.length>0,M.filter(o=>Q(o.tool)).map(o=>o.tool)),void((E>0||void 0!==O)&&(process.exitCode=O??h[W??"operation"]));const ao=M.filter(o=>!Q(o.tool)),no=so||M.some(o=>o.dedicated),ro=!d.fromInstaller&&S();if((M.length>0||no)&&!d.fromInstaller&&!await N(ao.map(o=>o.tool),{keyFile:no?I(a.getConfigDir(),"config.yaml"):void 0,installFirst:M.filter(o=>Q(o.tool)).map(o=>o.tool)}))return void(process.exitCode=h.cancelled);(M.length>0||no)&&i(),so&&p&&a.setApiKey(p);for(const o of M)Q(o.tool)?(o.dedicated&&a.setToolApiKey(o.tool,o.apiKey),G.push({tool:o.tool,apiKey:o.apiKey})):await J(o.tool,o.apiKey,{...x,takeOver:o.dedicated||ro})?(o.dedicated&&a.setToolApiKey(o.tool,o.apiKey),A+=1):(E+=1,U.delete(o.tool));if(void 0!==O)return G.length>0&&Z(G.map(o=>o.tool)),void(process.exitCode=O);let po=[];if(G.length>0){const e=await async function(e,t,l){const i=e.map(o=>o.tool);if(0===i.length)return{still:[],applied:[],failed:[]};const a=i.map(o=>r[o].displayName).join(s.t("setup.list_separator"));let d=t;if(void 0!==d||j()||(T()?d=!K():process.stdin.isTTY&&(console.log(""),d=(await B.prompt([{type:"confirm",name:"go",message:s.t("setup.install_confirm",{tools:a}),default:!0}])).go)),!d){console.log("");for(const e of i)console.log(o.yellow("! "+s.t("setup.install_hint",{tool:r[e].displayName,install:r[e].installCommand})));return j()||console.log(o.gray(s.t("setup.install_all_hint",{cli:q}))),{still:i,applied:[],failed:[]}}const p=[];for(const e of i){console.log(o.bold(`\n${r[e].displayName}`));try{await n.installTool(e)}catch(o){D.logError(`setup: install ${e}`,o)}F(),n.isToolInstalled(e)||p.push(e)}const c=i.filter(o=>!p.includes(o));c.length>0&&console.log("");const u=[],f=[];for(const{tool:o,apiKey:t}of e.filter(o=>c.includes(o.tool)))await J(o,t,l)?u.push(o):f.push(o);return{still:p,applied:u,failed:f}}(G,d.install,x);po=e.still,A+=e.applied.length,E+=e.failed.length;for(const o of[...po,...e.failed])U.delete(o)}if(A>0){const t=[...U].filter(o=>!e(o)?.isInstalled&&!po.includes(o)),l=t.map(o=>r[o]?.command).filter(Boolean).join(" / "),i=s.t("setup.done",{count:String(A)});Y("\n"+(l?`${i}${s.t("setup.done_commands",{commands:l})}`:i)),po.length>0&&Z(po);for(const o of t){const e=n.ensureNativeOnPath(o);e&&Y(s.t("setup.path_added",{tool:r[o].displayName,dir:e}))}const a=t.filter(o=>!n.isOnPath(o));if(a.length>0&&!j()&&"1"!==L("PATH_HINT_BY_CALLER")){const e=a.map(o=>r[o].command).join(" / ");console.log(o.yellow(" ! "+s.t("win32"===process.platform?"setup.path_reload_windows":"setup.path_reload",{commands:e})))}}0===A&&po.length>0&&Z(po),E>0&&(H(s.t("setup.failed_summary",{count:String(E)})),j()||console.error(`${q} setup --key ${s.t("errors.key_placeholder")}`)),await t([...U],{apps:{install:await installMissingApps([...U],d.install)}}),(E>0||0===A&&0===po.length)&&(process.exitCode=h[W??"operation"])}
|
package/dist/commands/upgrade.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import o from"chalk";import{appTools as t,getApp as e,upgradeApp as n}from"../lib/app-update.js";import{i18n as l}from"../lib/i18n.js";import{emitJson as r,isJsonMode as i,progressToStderr as s}from"../lib/runtime-options.js";import{toolManager as a}from"../lib/tool-manager.js";import{listAdapters as p}from"../lib/tools/registry.js";import{upgradeTool as c}from"../lib/tool-upgrade.js";import{listComponents as d,resolveComponent as m,runRuntime as u}from"../lib/components.js";import{outdatedRuntimeHints as
|
|
1
|
+
import o from"chalk";import{appTools as t,getApp as e,upgradeApp as n}from"../lib/app-update.js";import{i18n as l}from"../lib/i18n.js";import{emitJson as r,isJsonMode as i,progressToStderr as s}from"../lib/runtime-options.js";import{toolManager as a}from"../lib/tool-manager.js";import{listAdapters as p}from"../lib/tools/registry.js";import{upgradeTool as c}from"../lib/tool-upgrade.js";import{listComponents as d,resolveComponent as m,runRuntime as u,resumePendingMigration as f}from"../lib/components.js";import{outdatedRuntimeHints as g}from"./components.js";export async function upgradeCommand(h,j={}){await f();const b=t(),w=new Set;h=h.map(o=>{const t=m(o);return t?("runtime"===t.category&&w.add(t.id),t.adapter??t.app??t.id):o});const y=[...p().filter(o=>o.installSpec).map(o=>o.name),...b,...w],k=h.length>0?h:y.filter(o=>b.includes(o)?(o=>{const t=e(o)?.appInstaller;return Boolean(t&&!t.blocker()&&t.installedPath())})(o):a.isToolInstalled(o)),x=k.filter(o=>!y.includes(o));if(x.length>0){console.error(o.red(l.t("upgrade.unsupported",{tool:x.join(", ")})));const t=d().filter(o=>"runtime"===o.category).map(o=>o.id);return console.error(l.t("upgrade.supported",{tools:[...new Set([...y,...t])].join(" / ")})),void(process.exitCode=1)}if(0===k.length)return void(i()?r({tools:[]}):console.log(l.t("upgrade.nothing_installed",{tools:y.join(" / ")})));let C=0;const S=[];for(const t of k){if(w.has(t)){const e=m(t);i()||console.log(o.bold(`\n${e.name}`));const n=await s(()=>u(e,"upgrade",{force:j.force}));n.ok||(C+=1),S.push(n);continue}if(b.includes(t)){const l=e(t)?.displayName??t;i()||console.log(o.bold(`\n${l}`));const r=await s(()=>n(t,{install:!0,force:j.force})),a=["installed","upgraded","up_to_date","declined"].includes(r.result);a||(C+=1),S.push({...r,ok:a});continue}const l=await s(()=>c(t));l||(C+=1),S.push({tool:t,ok:l})}if(i())r({tools:S});else if(0===h.length){const t=await g();t.length&&console.log("\n"+t.map(t=>o.yellow(" ! "+t)).join("\n"))}C>0&&(process.exitCode=1)}
|
package/dist/lib/app-update.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import t from"chalk";import e from"inquirer";import{existsSync as r,
|
|
1
|
+
import t from"chalk";import e from"inquirer";import{existsSync as r,readFileSync as n}from"fs";import{join as a}from"path";import{CLI_NAME as o}from"./brand.js";import{configManager as p}from"./config.js";import{i18n as l}from"./i18n.js";import{canPrompt as s,hasExplicitYes as i,isJsonMode as u}from"./runtime-options.js";import{track as d}from"./telemetry.js";import{compareVersions as c}from"./model-registry.js";import{listAdapters as f}from"./tools/registry.js";import{logger as m}from"../utils/logger.js";import{atomicWriteFile as g}from"./tools/backup.js";const _=["unsupported_platform","unsupported_arch","no_mirror"];function y(){return a(p.getConfigDir(),"app-releases.json")}function w(){try{if(!r(y()))return{};const t=JSON.parse(n(y(),"utf-8"));return t&&"object"==typeof t?t:{}}catch{return{}}}function v(t,e){try{g(y(),JSON.stringify({...w(),[t]:e},null,2))}catch(t){m.logError("app-update.writeCache",t)}}function h(){return f().flatMap(t=>[...t.appInstaller?[{name:t.name,displayName:t.displayName,appInstaller:t.appInstaller,installedVersion:t.installedVersion,runningApp:t.runningApp,tool:t.name}]:[],...(t.companionApps??[]).map(e=>({...e,tool:t.name}))])}export function appTools(){return h().map(t=>t.name)}export function getApp(t){return h().find(e=>e.name===t)}export function appsForTools(t){return h().filter(e=>t.includes(e.tool)).map(t=>t.name)}function k(t){const e=getApp(t);if(!e)throw new Error(`no app installer for ${t}`);return e}function b(t,e,r){try{return e()}catch(e){return m.logError(`app-update.${t}`,e),r}}function q(t){const e=k(t),r=e.appInstaller,n=b("installedPath",()=>null!==r.installedPath(),!1);return{tool:t,name:e.displayName,installed:n,current:n?b("installedVersion",()=>e.installedVersion?.()??null,null):null,running:!!n&&b("isRunning",()=>e.runningApp?.isRunning()??!1,!1),blocker:b("blocker",()=>r.blocker(),"unsupported_platform")}}function x(t,e,r){const n=Boolean(t.installed&&t.current&&e&&c(t.current,e)<0);return{...t,latest:e,outdated:n,...r?{error:r}:{}}}export async function appLatest(t,e={}){const r=w()[t],n=r?Date.now()-r.checked_at:-1,a=r&&n>=0&&n<(r.version&&!r.error?36e5:6e5);if(r&&a&&!e.refresh)return{version:r.version??null,...r.error?{error:r.error}:{}};try{const e=await k(t).appInstaller.latestVersion();return v(t,{version:e,checked_at:Date.now()}),{version:e}}catch(e){const n=e instanceof Error?e.message:String(e);return m.logError(`app-update.latest(${t})`,e),v(t,{...r?.version?{version:r.version}:{},error:n,checked_at:Date.now()}),{version:r?.version??null,error:n}}}export async function appStatus(t,e={}){const r=q(t);if(r.blocker&&"classic_install"!==r.blocker)return x(r,null);const{version:n,error:a}=await appLatest(t,e);return x(r,n,a)}export function appStatusWith(t,e){return x(q(t),e.version,e.error)}export function cachedAppStatus(t){const e=q(t);return x(e,e.blocker&&"classic_install"!==e.blocker?null:w()[t]?.version??null)}export function appStatusText(t){return t.installed?t.outdated?l.t("app_update.outdated",{current:t.current,latest:t.latest}):t.current&&t.latest?l.t("app_update.up_to_date",{current:t.current}):t.current??"":t.latest?l.t("app_update.not_installed",{latest:t.latest}):""}export function appUpgradeCommand(t){return`${o} upgrade ${t}`}function C(t){u()?process.stderr.write(t+"\n"):console.log(t)}async function S(t,r=!0){const{ok:n}=await e.prompt([{type:"confirm",name:"ok",message:t,default:r}]);return n}let U={totalMs:12e4,stepMs:1e3};export function setQuitWaitForTests(t){U=t}export async function upgradeApp(e,r={}){const n=Date.now(),a=await appStatus(e,{refresh:r.refresh??!0}),o=a.name,p=(t,r={})=>{const o={...a,result:t,upgraded:"upgraded"===t||"installed"===t,version_after:null,...r},p="offered"===t||"unavailable"===t&&!_.includes(r.reason??"");return!p&&["up_to_date","unavailable","not_installed","offered"].includes(t)||d(`app-upgrade:${e}`,p?"skip":"failed"===t?"fail":"ok",{duration_ms:Date.now()-n,detail:{result:t,current:a.current,latest:a.latest,...r.reason?{reason:r.reason}:{}}}),o};if(a.blocker)return!r.quiet&&a.installed&&a.outdated&&C(t.yellow(" ! "+l.t("app_update.outdated",{current:a.current,latest:a.latest}))),r.quiet||C(t.yellow(" ! "+l.t(`app_update.blocked_${a.blocker}`,{tool:o,url:k(e).appInstaller.downloadPage,command:appUpgradeCommand(e)}))),p("unavailable",{reason:a.blocker});if(!a.latest)return r.quiet||C(t.yellow(" ! "+l.t("app_update.latest_unknown",{tool:o,reason:a.error??""}))),p("unavailable",{reason:a.error});if(!a.installed&&!r.install)return p("not_installed");const c=Boolean(r.force&&a.installed&&!a.outdated);if(a.installed&&!a.outdated&&!c)return r.quiet||(C(t.green(" √ "+l.t("app_update.already_latest",{tool:o,current:a.current??a.latest}))),C(t.gray(" "+l.t("app_update.force_hint",{command:appUpgradeCommand(e)})))),p("up_to_date");if(c?C(t.yellow(" ! "+l.t("app_update.reinstalling",{tool:o,latest:a.latest,current:a.current??"?"}))):!a.installed||r.askBeforeUpgrade&&!a.running||C(t.yellow(` ! ${o} `+appStatusText(a))),a.installed&&r.askBeforeUpgrade&&!a.running){if(!s()||i())return C(t.gray(" "+l.t("app_update.upgrade_hint",{tool:o,current:a.current??"?",latest:a.latest,command:appUpgradeCommand(e)}))),p("offered");if(!await S(l.t("app_update.upgrade_offer",{tool:o,current:a.current??"?",latest:a.latest})))return C(t.gray(" "+l.t("app_update.declined_hint",{command:appUpgradeCommand(e)}))),p("declined")}let f=!1;if(a.running){if(!s()||i())return C(t.yellow(" ! "+l.t("app_update.running_hint",{tool:o,command:appUpgradeCommand(e)}))),p("left_running");if(!await S(l.t("app_update.offer_quit",{tool:o,latest:a.latest})))return C(t.gray(" "+l.t("app_update.declined_hint",{command:appUpgradeCommand(e)}))),p("declined");const r=k(e).runningApp;if(r?.quit?.())f=!0;else{if(!r?.quitRefused?.()||!await async function(e,r){C(t.yellow(" ! "+l.t("app_update.quit_confirm_in_app",{tool:e,seconds:String(Math.round(U.totalMs/1e3))})));const n=Date.now()+U.totalMs;for(;Date.now()<n;)if(await new Promise(t=>setTimeout(t,U.stepMs)),!r.isRunning())return await new Promise(t=>setTimeout(t,Math.min(1e3,U.stepMs))),!0;return!1}(o,r)){const n=r?.quitRefused?.()?"app_update.quit_refused":"app_update.quit_failed";return C(t.yellow(" ! "+l.t(n,{tool:o,command:appUpgradeCommand(e)}))),p(r?.quitRefused?.()?"left_running":"failed",{reason:r?.quitRefused?.()?"quit_refused":"quit_failed"})}f=!0}}d(`app-upgrade:${e}`,"start",{detail:{current:a.current,latest:a.latest,installed:a.installed}});try{const{version:r}=await async function(e){const r=k(e).appInstaller,n=!u()&&Boolean(process.stdout.isTTY);let a=-1;try{return await r.install({downloading:n=>C(t.gray(" "+l.t("app_update.downloading",{tool:k(e).displayName,version:n,size:String(r.sizeMb())}))),percent:e=>{!n||e-a<5||(a=e,process.stdout.write(t.gray(`\r ${e}%`)),e>=100&&process.stdout.write("\n"))},verifying:()=>{n&&a>=0&&a<100&&process.stdout.write("\n"),a=100,C(t.gray(" "+l.t("app_update.verifying",{vendor:r.vendor})))},installing:()=>C(t.gray(" "+l.t("app_update.installing"))),reusing:r=>C(t.gray(" "+l.t("app_update.reusing",{tool:k(e).displayName,version:r}))),elevate:async()=>!(!s()||!i()&&!await S(l.t("app_update.elevate_offer",{tool:k(e).displayName}))||(C(t.gray(" "+l.t("app_update.elevating"))),0))})}finally{n&&a>=0&&a<100&&process.stdout.write("\n")}}(e);return C(t.green(" √ "+(c?l.t("app_update.reinstalled",{tool:o,version:r}):a.installed?l.t("app_update.upgraded",{tool:o,from:a.current??"?",to:r}):l.t("app_update.installed",{tool:o,version:r})))),f&&!k(e).runningApp?.launch?.()&&C(t.yellow(" ! "+l.t("setup.reopen_hint",{tool:o}))),p(a.installed?"upgraded":"installed",{version_after:r,current:a.current})}catch(r){const n=r instanceof Error?r.message:String(r);return m.logError(`app-update.install(${e})`,r),C(t.yellow(" ! "+(a.installed?l.t("app_update.upgrade_failed",{tool:o,reason:n,current:a.current??"?",command:appUpgradeCommand(e)}):l.t("app_update.install_failed",{tool:o,reason:n,command:appUpgradeCommand(e)})))),f&&k(e).runningApp?.launch?.(),p("failed",{reason:n})}}
|
package/dist/lib/auto-update.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import{chmodSync as e,copyFileSync as t,existsSync as r,lstatSync as o,mkdirSync as n,readdirSync as s,readFileSync as a,readlinkSync as i,renameSync as l,rmSync as c,symlinkSync as u,writeFileSync as p}from"fs";import{homedir as d}from"os";import{basename as m,dirname as f,join as h,sep as
|
|
1
|
+
import{chmodSync as e,copyFileSync as t,existsSync as r,lstatSync as o,mkdirSync as n,readdirSync as s,readFileSync as a,readlinkSync as i,renameSync as l,rmSync as c,symlinkSync as u,writeFileSync as p}from"fs";import{homedir as d}from"os";import{basename as m,dirname as f,join as h,sep as g}from"path";import{spawnSync as _}from"child_process";import y from"chalk";import{checkForUpdate as v,readLocalPackage as x,UPDATE_SOURCES as w}from"../commands/update.js";import{i18n as k}from"./i18n.js";import{isColorEnabled as S}from"./runtime-options.js";import{logger as b}from"../utils/logger.js";import{isHelpRequest as $}from"./cli-help.js";import{brand as I,brandEnvName as E}from"./brand.js";import{flushTelemetry as P,track as j}from"./telemetry.js";import{processAlive as N}from"../utils/process-alive.js";import{endedByInterrupt as A}from"./signals.js";export const INSTALL_RETRY_INTERVAL_MS=36e5;export const INSTALL_TIMEOUT_MS=45e3;function T(e,t){return S()?e(t):t}export function resolveUpdateCachePath(e=process.env){const t=e[E("CONFIG_DIR")]?.trim();if(t)return h(t,"update-state.json");const r=e[E("TEST_HOME")]?.trim();return h(r||d(),I().configDirName,"update-state.json")}export function isGlobalPackageInstall(e){return e.split(g).includes("node_modules")}export function isNpxExecution(e=process.env){return"exec"===e.npm_command||"npx"===e.npm_lifecycle_event}export function isPnpmGlobalInstall(e){return e.includes(`${g}.pnpm${g}`)||e.includes(`${g}pnpm${g}global${g}`)}export function resolveNpmGlobalPrefix(e){const t=`${g}node_modules${g}`,r=e.indexOf(t);if(r<0)return null;const o=e.slice(0,r);return o.endsWith(`${g}lib`)?f(o):o}export function shouldSkipStartupUpdate(e,t=process.env){return"1"===t[E("SKIP_AUTO_UPDATE")]||"1"===t[E("DISABLE_AUTO_UPDATE")]||(!(!["--json","--non-interactive","--dry-run","--help","-h","--version","-v"].some(t=>e.includes(t))&&!$(e))||e.includes("update")||e.includes("completion"))}function U(t,r,o,s,a){try{n(f(t),{recursive:!0,mode:448});const i=`${t}.tmp-${process.pid}`,c={package_name:r,checked_at:o,latest:s.latest,source:s.source,registry:s.registry,errors:s.errors,...void 0===a?{}:{install_attempted_at:a,install_attempted_version:s.latest||void 0}};p(i,JSON.stringify(c),{encoding:"utf-8",mode:384}),l(i,t),e(t,384)}catch(e){b.warn("Failed to persist update check cache:",e)}}export function windowsShellCommand(e,t){return[e,...t.map(e=>`"${e}"`)].join(" ")}const D=(e,t)=>{const r={stdio:"inherit",timeout:45e3,killSignal:"SIGTERM"};return"win32"===process.platform?_(windowsShellCommand(e,t),{...r,shell:!0}):_(e,t,r)},O=(e,t)=>_(process.execPath,[process.argv[1],...e],{stdio:"inherit",env:t}),R="-update-";function C(e,t){const r=`.${t}${R}`;return s(e).filter(e=>e.startsWith(r)).map(t=>{const o=/^(old-)?(\d+)$/.exec(t.slice(r.length));return{path:h(e,t),old:Boolean(o?.[1]),pid:o?Number(o[2]):null}})}export function recoverInterruptedSwap(e){try{if(r(e)||!r(f(e)))return!1;const t=C(f(e),m(e)).filter(e=>e.old&&null!==e.pid&&!N(e.pid)).filter(e=>r(h(e.path,"package.json"))).sort((e,t)=>o(t.path).mtimeMs-o(e.path).mtimeMs);return 0!==t.length&&(M(t[0].path,e),!0)}catch(e){return b.warn("Failed to restore the package an interrupted update moved aside:",e),!1}}function M(e,t){for(let r=0;;r++)try{return void l(e,t)}catch(e){const t=e.code;if(r>=9||"EPERM"!==t&&"EACCES"!==t&&"EBUSY"!==t)throw e;Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,200)}}export function swapStagedPackage(e,s,l,p,d){const g=p.split("/"),_=[h(e,"node_modules",...g),h(e,"lib","node_modules",...g)].find(e=>r(h(e,"package.json")));if(!_)return!1;const y=JSON.parse(a(h(_,"package.json"),"utf-8"));if(y.version!==d)return!1;recoverInterruptedSwap(l);const v=h(f(l),`.${m(l)}${R}old-${process.pid}`),x=r(l);x&&M(l,v);try{M(_,l)}catch(e){throw x&&M(v,l),e}c(v,{recursive:!0,force:!0,maxRetries:3});const w="string"==typeof y.bin?[g[g.length-1]]:Object.keys(y.bin||{});for(const[r,a]of[[h(e,"bin"),h(s,"bin")],[e,s]])for(const e of w.flatMap(e=>["",".cmd",".ps1"].map(t=>e+t))){const s=h(r,e),l=h(a,e),c=o(s,{throwIfNoEntry:!1});if(!o(l,{throwIfNoEntry:!1})&&c&&!c.isDirectory())try{n(a,{recursive:!0}),c.isSymbolicLink()?u(i(s),l):t(s,l)}catch(e){b.warn("Failed to restore command shim:",e)}}return!0}export async function runStartupUpdate(e,t={}){const o=t.env||process.env,n=t.localPackage||x(),s=t.globalInstall??isGlobalPackageInstall(n.root),i=t.npx??isNpxExecution(o);if(!s||i||shouldSkipStartupUpdate(e,o))return{status:"skipped",handled:!1,source:null};const l=t.now??Date.now(),u=t.cachePath||resolveUpdateCachePath(o),p=function(e,t){try{if(!r(e))return null;const o=JSON.parse(a(e,"utf-8"));return o.package_name===t.name&&Number.isFinite(o.checked_at)?o:null}catch{return null}}(u,n);let d=function(e,t,r){if(!e||e.latest)return null;const o=r-e.checked_at;if(o<0||o>=6e5)return null;const n=Array.isArray(e.errors)?e.errors:[];return{current:t.version,latest:null,up_to_date:null,source:e.source,registry:e.registry,errors:n,error:n.map(e=>`${e.source}: ${e.error}`).join("; ")||"unknown"}}(p,n,l),_=null;if(d||(d=await v({localPackage:n,fetchFn:t.fetchFn}),d.latest&&p?.install_attempted_version===d.latest&&Number.isFinite(p.install_attempted_at)&&(_=p.install_attempted_at),U(u,n.name,l,d,_??void 0)),!d.latest)return{status:"unavailable",handled:!1,source:null};if(d.up_to_date)return{status:"current",handled:!1,source:d.source};if(null!==_&&l>=_&&l-_<36e5)return{status:"update_failed",handled:!1,source:d.source};const S=t.output||console.log,b=t.errorOutput||console.error,$=t.installRunner||D,I=isPnpmGlobalInstall(n.root),M=I?"win32"===process.platform?"pnpm.cmd":"pnpm":"win32"===process.platform?"npm.cmd":"npm",F=I?null:resolveNpmGlobalPrefix(n.root),G=n.root,L=F&&G.endsWith(g+n.name.split("/").join(g))?h(f(G),`.${m(G)}${R}${process.pid}`):null;L&&(recoverInterruptedSwap(G),function(e,t){try{for(const r of C(e,t))null!==r.pid&&r.pid!==process.pid&&N(r.pid)||c(r.path,{recursive:!0,force:!0})}catch{}}(f(G),m(G))),U(u,n.name,l,d,l),S(T(y.cyan,k.t("update.auto_installing",{version:d.latest})));const B={from:n.version,to:d.latest,staged:Boolean(L)};j("self-update","start",{detail:B}),await P();const J=[...d.registry?[d.registry]:[],...w.map(e=>e.registry).filter(e=>e!==d.registry)],W=Date.now();let K=null,Y="unknown",H=0;for(const e of J){if(Date.now()-W>=45e3)break;H++;const t=$(M,I?["add","--global",`${n.name}@${d.latest}`,"--registry",e]:["install","--global",...L?["--prefix",L]:F?["--prefix",F]:[],`${n.name}@${d.latest}`,"--registry",e,"--no-audit","--no-fund","--fetch-timeout=15000","--fetch-retries=1","--fetch-retry-mintimeout=1000","--fetch-retry-maxtimeout=3000"]);if(0===t.status){if(!L){K=e;break}try{if(!swapStagedPackage(L,F,G,n.name,d.latest)){Y="staged install incomplete";continue}K=e;break}catch(e){Y=e instanceof Error?e.message:String(e);break}finally{c(L,{recursive:!0,force:!0,maxRetries:3})}}else if(Y=t.error?.message||`exit ${t.status??"unknown"}`,L&&c(L,{recursive:!0,force:!0,maxRetries:3}),A(t)){Y="interrupted";break}}const V=Date.now()-W;if(j("self-update",K?"ok":V>=45e3?"timeout":"fail",{duration_ms:V,...K?{}:{error:Y},detail:{...B,attempts:H,registry:K}}),await P(),!K)return b(T(y.yellow,k.t("update.auto_failed",{error:Y}))),{status:"update_failed",handled:!1,source:d.source};S(T(y.green,k.t("update.auto_installed",{version:d.latest})));const q=(t.reexecRunner||O)(e,{...o,[E("SKIP_AUTO_UPDATE")]:"1"});return q.error?(b(T(y.yellow,k.t("update.reexec_failed",{error:q.error.message}))),{status:"update_failed",handled:!1,source:d.source}):(process.exitCode=q.status??1,j("command","skip",{duration_ms:Date.now()-W,detail:{reason:"self-update-rerun",exit_code:process.exitCode}}),{status:"reexecuted",handled:!0,source:d.source})}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{existsSync as e,mkdirSync as t,readFileSync as n,writeFileSync as o,renameSync as
|
|
1
|
+
import{existsSync as e,mkdirSync as t,readFileSync as n,writeFileSync as o,renameSync as i,unlinkSync as s}from"fs";import{join as r,dirname as a}from"path";import{toolHome as l}from"./tools/types.js";import{logger as c}from"../utils/logger.js";import{configManager as d,DEFAULT_MODELS as g}from"./config.js";import{loadSettingsTemplate as f}from"./settings-template.js";import{cleanupAnthropicEnvVars as u}from"./env-cleanup.js";import{getClaudeCodeTierChains as m,getGatewayModelRules as C,getRetiredDefaultModelIds as O}from"./model-registry.js";import{claimField as h,forgetField as p,ownsValue as _,recordAfterWrite as E,takeField as A}from"./written-values.js";import{atomicWriteFile as v}from"./tools/backup.js";import{noteWrittenGatewayUrl as T}from"./gateway-addresses.js";import{autoCompactTokens as P,modelBlurb as S,prettyModelName as N}from"./gateway-models.js";import{baseModelId as M}from"./model-catalog.js";export const MODEL_ENV_VARS=["ANTHROPIC_DEFAULT_HAIKU_MODEL","ANTHROPIC_DEFAULT_SONNET_MODEL","ANTHROPIC_DEFAULT_OPUS_MODEL","ANTHROPIC_DEFAULT_FABLE_MODEL","ANTHROPIC_MODEL","ANTHROPIC_REASONING_MODEL"];const D="claude-code.model",L=e=>`claude-code.env.${e}`;function R(e){const t=Object.values(m()).flat(),n=[...Object.values(g),...Object.values(e)].filter(e=>"string"==typeof e&&""!==e);return[...new Set(["opus[1m]",...n,...O(),...t])]}const y={opus:"ANTHROPIC_DEFAULT_OPUS_MODEL",sonnet:"ANTHROPIC_DEFAULT_SONNET_MODEL",haiku:"ANTHROPIC_DEFAULT_HAIKU_MODEL",fable:"ANTHROPIC_DEFAULT_FABLE_MODEL"},I="CLAUDE_CODE_MAX_CONTEXT_TOKENS";function U(){return r(d.getConfigDir(),"claude-code-picker.json")}function H(){try{const e=JSON.parse(n(U(),"utf-8")).ids;return Array.isArray(e)?e.map(String):[]}catch{return[]}}function b(e){try{v(U(),JSON.stringify({ids:e})+"\n")}catch(e){c.logError("claudeCode.recordWrittenPickerIds",e)}}let F=null;function j(e,t=[]){if(!e||"object"!=typeof e)return!1;const{options:n,replaceBuiltInOptions:o}=e;if(!Array.isArray(n)||o)return!1;const i=C(),s=new Set([...i.models.map(e=>e.id),...i.retired,...H(),...t]);return n.every(e=>e&&"object"==typeof e&&s.has(M(String(e.model))))}export function applyGatewayModels(e,t){if(void 0===t)return e;const n={...e};if(void 0!==n.modelPicker&&!j(n.modelPicker,t.map(e=>e.id)))return n;const o=j(n.modelPicker)?n.modelPicker.options.map(e=>M(e.model)):[],i={...n.env||{}},s={...n.modelSettings||{}};for(const e of o){if(!s[e])continue;const{autoCompactWindow:t,...n}=s[e];Object.keys(n).length>0?s[e]=n:delete s[e]}const r=e=>(e.contextWindow??0)>=1e6,a=t.filter(e=>!r(e)).map(e=>e.contextWindow).filter(e=>"number"==typeof e&&e>0);!function(e){const t=H(),n=[...new Set([...t,...e])];n.length!==t.length&&b(n),F=e}(t.map(e=>e.id));const l=e=>S(e.description,{millionContext:r(e)});if(0===t.length)delete n.modelPicker,delete i[I];else{n.modelPicker={options:t.map(e=>({model:r(e)?`${e.id}[1m]`:e.id,label:e.name||N(e.id),...l(e)?{description:l(e)}:{}}))},a.length>0?i[I]=String(Math.min(...a)):delete i[I];for(const e of t){if(!e.contextWindow)continue;const t=P(e.contextWindow,e.autoCompactTokens);s[e.id]={...s[e.id],autoCompactWindow:Math.min(Math.max(t,1e5),1e6)}}}return Object.keys(s).length>0?n.modelSettings=s:delete n.modelSettings,Object.keys(i).length>0?n.env=i:delete n.env,n}export function resolveTierFallbacks(e){if(!e||0===e.length)return[];const t=new Set(e.map(M)),n=[];for(const[e,o]of Object.entries(m())){const i=y[e],[s,...r]=o;if(!i||!s||t.has(s))continue;const a=r.find(e=>t.has(e));a&&n.push({tier:e,envVar:i,from:s,to:a})}return n}export class ClaudeCodeManager{static instance;settingsPath;mcpConfigPath;lastTierFallbacks=[];lastReplaced=[];constructor(){this.settingsPath=r(l(),".claude","settings.json"),this.mcpConfigPath=r(l(),".claude.json")}static getInstance(){return ClaudeCodeManager.instance||(ClaudeCodeManager.instance=new ClaudeCodeManager),ClaudeCodeManager.instance}ensureConfigDir(n){const o=a(n);e(o)||t(o,{recursive:!0})}atomicWrite(t,n){const r=`${t}.tmp`;try{o(r,n,"utf-8"),i(r,t)}catch(t){if(e(r))try{s(r)}catch{}throw t}}getSettings(){try{if(e(this.settingsPath)){const e=n(this.settingsPath,"utf-8");return JSON.parse(e)}}catch(e){c.warn("Failed to read Claude Code settings:",e),c.logError("ClaudeCodeManager.getSettings",e)}return{}}saveSettings(e){try{this.ensureConfigDir(this.settingsPath),this.atomicWrite(this.settingsPath,JSON.stringify(e,null,2))}catch(e){throw new Error(`Failed to save Claude Code settings: ${e}`)}!function(){if(!F)return;const e=F;F=null;const t=H();(t.length!==e.length||t.some(t=>!e.includes(t)))&&b(e)}()}getMCPConfig(){try{if(e(this.mcpConfigPath)){const e=n(this.mcpConfigPath,"utf-8");return JSON.parse(e)}}catch(e){c.warn("Failed to read Claude Code MCP config:",e),c.logError("ClaudeCodeManager.getMCPConfig",e)}return{}}saveMCPConfig(e){try{this.ensureConfigDir(this.mcpConfigPath),this.atomicWrite(this.mcpConfigPath,JSON.stringify(e,null,2))}catch(e){throw new Error(`Failed to save Claude Code MCP config: ${e}`)}}loadPrivateConfig(e,t,n,o){E(()=>this.writePrivateConfig(e,t,n,o))}writePrivateConfig(e,t,n,o){this.ensureOnboardingCompleted(),u();const i=f(),s=i.env||{},{env:r,...a}=i,l=this.getSettings(),{ANTHROPIC_API_KEY:c,...m}=l.env||{},C={...m},O={},h=e=>{const n=(t[e]||"").trim();return n&&n!==g[e]?n:null},E=h("haiku"),v=h("sonnet"),P=h("opus"),S=new Set([E&&"haiku",v&&"sonnet",P&&"opus"].filter(Boolean)),N=resolveTierFallbacks(n).filter(e=>!S.has(e.tier));for(const e of N)O[e.envVar]=e.to;const M=new Set;E&&(O.ANTHROPIC_DEFAULT_HAIKU_MODEL=E),v&&(O.ANTHROPIC_DEFAULT_SONNET_MODEL=v),P&&(O.ANTHROPIC_DEFAULT_OPUS_MODEL=P,O.ANTHROPIC_MODEL=P),E&&M.add("ANTHROPIC_DEFAULT_HAIKU_MODEL"),v&&M.add("ANTHROPIC_DEFAULT_SONNET_MODEL"),P&&["ANTHROPIC_DEFAULT_OPUS_MODEL","ANTHROPIC_MODEL"].forEach(e=>M.add(e));const y=R(t);this.lastReplaced=[];for(const e of MODEL_ENV_VARS){const t=C[e],n=O[e];if(void 0!==n)void 0===t||t===n||_(L(e),t,y)||this.lastReplaced.push(`${e}=${t}`),C[e]=n,A(L(e),n);else{if(void 0===t)continue;_(L(e),t,y)||this.lastReplaced.push(`${e}=${t}`),delete C[e],p(L(e))}}this.lastTierFallbacks=N.filter(e=>C[e.envVar]===e.to);const I={...l};for(const[e,t]of Object.entries(a))"model"!==e&&(e in I||(I[e]=t));I.showThinkingSummaries=!0;const U={...I,env:{...C,...Object.fromEntries(Object.entries(s).filter(([e])=>!(e in C))),ANTHROPIC_AUTH_TOKEN:e,ANTHROPIC_BASE_URL:d.getBaseUrl()}};T(d.getBaseUrl());const H=P??("string"==typeof a.model?a.model:void 0),b=l.model,F=void 0!==b&&b!==H&&!_(D,b,y);void 0===H?(delete U.model,p(D)):(U.model=H,A(D,H)),F&&this.lastReplaced.push(`model=${String(b)}`),this.saveSettings(applyGatewayModels(U,o))}ensureOnboardingCompleted(){try{const e=this.getMCPConfig();e.hasCompletedOnboarding||this.saveMCPConfig({...e,hasCompletedOnboarding:!0})}catch(e){c.warn("Failed to ensure onboarding completed:",e),c.logError("ClaudeCodeManager.ensureOnboardingCompleted",e)}}unloadPrivateConfig(){E(()=>this.removePrivateConfig())}removePrivateConfig(){const e=this.getSettings(),t=R(d.getModelsForTool("claude-code")),n=void 0!==e.model&&_(D,e.model,t);if(p(D),!e.env){if(n){const{model:t,...n}=e;this.saveSettings(n)}return}const{ANTHROPIC_AUTH_TOKEN:o,ANTHROPIC_BASE_URL:i,API_TIMEOUT_MS:s,CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC:r,CLAUDE_CODE_AUTO_MODE_SERVER:a,...l}=e.env,c={...l};for(const e of MODEL_ENV_VARS)e in c&&_(L(e),c[e],t)&&delete c[e],p(L(e));const g={...applyGatewayModels({...e,env:c},[])};g.env=g.env||{},n&&delete g.model,g.env&&0===Object.keys(g.env).length&&delete g.env,this.saveSettings(g)}clearPinnedModels(e){const t=this.getSettings(),n=t.env,o=n?.ANTHROPIC_AUTH_TOKEN?Object.fromEntries(resolveTierFallbacks(e).map(e=>[e.envVar,e.to])):{},i=[];for(const e of MODEL_ENV_VARS)n&&e in n&&n[e]!==o[e]&&i.push(e);void 0!==t.model&&i.push("model");const s=Object.entries(o).some(([e,t])=>n?.[e]!==t);if(0===i.length&&!s)return[];const r={...t};if(delete r.model,n){const e={...n};for(const t of MODEL_ENV_VARS)delete e[t];Object.assign(e,o),0===Object.keys(e).length?delete r.env:r.env=e}this.saveSettings(r),p(D);for(const e of MODEL_ENV_VARS)o[e]?h(L(e),o[e],o[e]):p(L(e));return i}getLastReplaced(){return[...this.lastReplaced]}getLastTierFallbacks(){return[...this.lastTierFallbacks]}detectCurrentConfig(){try{const e=this.getSettings();return e.env&&e.env.ANTHROPIC_AUTH_TOKEN?{apiKey:e.env.ANTHROPIC_AUTH_TOKEN}:{apiKey:null}}catch{return{apiKey:null}}}getExperimentalFeature(e){const t=this.getSettings();return t.env?.[e]}setExperimentalFeature(e,t){const n=this.getSettings(),o=n.env||{},i={...n,env:{...o,[e]:t}};this.saveSettings(i)}removeExperimentalFeature(e){const t=this.getSettings();if(!t.env)return;const{[e]:n,...o}=t.env,i={...t,env:o};this.saveSettings(i)}}export const claudeCodeManager=ClaudeCodeManager.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createHash as e}from"node:crypto";import{CLIENT_CONFIG_PATH as t}from"./gateway-protocol.js";import{logger as o}from"../utils/logger.js";import{bundledClientConfig as
|
|
1
|
+
import{createHash as e}from"node:crypto";import{CLIENT_CONFIG_PATH as t}from"./gateway-protocol.js";import{logger as o}from"../utils/logger.js";import{bundledClientConfig as i,parseClientConfig as n,readCachedClientConfig as r,setClientConfigSiteResolver as c,writeCachedClientConfig as s}from"./client-config.js";import{configManager as f}from"./config.js";import{getBuiltinGatewayAddresses as l,reloadRegistry as a}from"./model-registry.js";import{brandEnv as u,brand as g}from"./brand.js";import{track as d}from"./telemetry.js";export const CLIENT_CONFIG_TTL_MS=3e5;function m(e){try{return new URL(e).origin}catch{return e.replace(/\/+$/,"")}}export function clientConfigSite(e=f.getBaseUrl()){const t=m(e);return l().some(e=>m(e.url)===t)?g().id:t}c(()=>clientConfigSite());let p=null,h=!1;function C(e,t,o){if(h)return;h=!0;const i=t?.revision;d("client-config","fail",{error:e,detail:{..."string"==typeof i||"number"==typeof i?{revision:String(i)}:{},...o?.revision?{kept_revision:o.revision}:{},site:clientConfigSite()}})}export function resetClientConfigRefusalReportForTests(){h=!1}export function lastClientConfigStatus(){return p}function v(e){const t=r();if(t&&t.site===clientConfigSite())return{config:t.config,source:"cache",revision:t.config.revision,fetchedAt:t.fetchedAt,problem:e};const o=i();return o?{config:o,source:"bundled",revision:o.revision,problem:e}:{config:null,source:null,problem:e}}export async function refreshClientConfig(c={}){const{force:l=!1,timeoutMs:d=8e3,fetchFn:m=fetch,now:h=Date.now()}=c,y=c.apiKey??f.getApiKey(),A=function(t){return t?e("sha256").update(t).digest("hex").slice(0,16):void 0}(y);if("1"===u("DISABLE_CLIENT_CONFIG_FETCH"))return p=v(),p;const T=clientConfigSite(),w=r(),b=w&&w.site===T?w:null,S=b&&b.keyHash===A?b:null;if(!l&&S&&h-S.fetchedAt<3e5)return p={config:S.config,source:"cache",revision:S.config.revision,fetchedAt:S.fetchedAt},p;const $=b?.config??(T===g().id?i():null),j=new AbortController,E=setTimeout(()=>j.abort(),d);try{const e={};S?.etag&&(e["If-None-Match"]=S.etag),y&&(e.Authorization=`Bearer ${y}`);const i=await m(`${f.getBaseUrl()}${t}`,{method:"GET",headers:e,signal:j.signal});if(304===i.status&&S)return s({...S,fetchedAt:h}),p={config:S.config,source:"cloud",revision:S.config.revision,fetchedAt:h},p;if(!i.ok)return p=v(`HTTP ${i.status}`),C(`HTTP ${i.status}`,null,p.config),p;const r=await i.json(),{config:c,problem:l}=n(r?.data,$);if(!c)return o.warn(`Gateway client config refused: ${l}`),p=v(`refused: ${l}`),C(`refused: ${l}`,r?.data,p.config),p;l&&o.warn(`Gateway client config: ${l}`);const u=i.headers.get("etag")??void 0;return s({site:T,fetchedAt:h,config:c,...A?{keyHash:A}:{},...u?{etag:u}:{}}),a(),p={config:c,source:"cloud",revision:c.revision,fetchedAt:h,...l?{problem:l}:{}},p}catch(e){return o.logError("refreshClientConfig",e),p=v(e instanceof Error?e.message:String(e)),p}finally{clearTimeout(E)}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{spawnSync as t}from"child_process";import{closeSync as e,copyFileSync as o,createReadStream as r,createWriteStream as n,existsSync as s,mkdirSync as i,openSync as
|
|
1
|
+
import{spawnSync as t}from"child_process";import{closeSync as e,copyFileSync as o,createReadStream as r,createWriteStream as n,existsSync as s,mkdirSync as i,openSync as c,readFileSync as a,readSync as f,readdirSync as l,realpathSync as p,renameSync as u,statSync as d,utimesSync as m}from"fs";import{basename as h,join as g,resolve as b}from"path";import{pipeline as y}from"stream/promises";import*as E from"@iarna/toml";import{codexHome as S,toolHome as v}from"./tools/types.js";import{atomicWriteFile as _}from"./tools/backup.js";import{CLI_NAME as x}from"./brand.js";import{powerShellEnv as w}from"./powershell-env.js";export{S as codexHome};export function currentCodexProvider(){try{const t=E.parse(a(g(S(),"config.toml"),"utf-8"));return"string"==typeof t.model_provider&&t.model_provider.trim()?t.model_provider.trim():"openai"}catch{return"openai"}}let O=()=>{if("win32"===process.platform)return`${t("powershell.exe",["-NoProfile","-NonInteractive","-Command","(Get-Process -Name codex -ErrorAction SilentlyContinue).Id"],{encoding:"utf-8",windowsHide:!0,env:w()}).stdout??""}`.split(/\s+/).filter(Boolean).map(Number);const e=process.getuid?.(),o=`${t("pgrep",["-x","-i",...void 0===e?[]:["-u",String(e)],"codex"],{encoding:"utf-8"}).stdout??""}`.split(/\s+/).filter(Boolean).map(Number);if("linux"!==process.platform)return o;const r=N(S());return o.filter(t=>{let e;try{e=a(`/proc/${t}/environ`,"utf-8")}catch{return!0}const o=new Map(e.split("\0").map(t=>[t.slice(0,t.indexOf("=")),t.slice(t.indexOf("=")+1)])),n=o.get("CODEX_HOME")?.trim()||(o.get("HOME")?g(o.get("HOME"),".codex"):null);return null===n||N(n)===r})};function N(t){try{return p(t)}catch{return t}}export function setCodexProcessCheckForTests(t){O=t}export function runningCodexPids(){try{return O()}catch{return[]}}function $(t){const o=c(t,"r");try{const t=[],e=Buffer.alloc(65536);for(;;){const r=f(o,e,0,e.length,null);if(r<=0)break;const n=e.subarray(0,r).indexOf(10);if(n>=0){t.push(Buffer.from(e.subarray(0,n)));break}t.push(Buffer.from(e.subarray(0,r)))}return Buffer.concat(t).toString("utf-8")}finally{e(o)}}async function M(t,e,o){const{atime:s,mtime:i}=d(t),c=`${t}.${x}-tmp`,a=n(c);a.write(e),await y(r(t,{start:o}),a),u(c,t),m(t,s,i)}export function codexSqliteHome(){const t=S();try{const e=E.parse(a(g(t,"config.toml"),"utf-8")),o="string"==typeof e.sqlite_home?e.sqlite_home.trim():"";if(o)return"~"===o||o.startsWith("~/")?g(v(),o.slice(1)):b(t,o)}catch{}const e=process.env.CODEX_SQLITE_HOME?.trim();return e?b(e):t}function D(){const t=codexSqliteHome();if(!s(t))return null;const e=l(t).map(t=>/^state_(\d+)\.sqlite$/.exec(t)).filter(t=>!!t).sort((t,e)=>Number(e[1])-Number(t[1]));return e.length>0?g(t,e[0][0]):null}const T={threads:"id",local_thread_catalog:"thread_id"};function A(){const t=g(codexSqliteHome(),"sqlite");return s(t)?l(t).filter(t=>/\.(db|sqlite3?)$/.test(t)).map(e=>g(t,e)).sort():[]}function B(t,e,o){const r=function(t,e){return new Set(t.prepare(`PRAGMA table_info(${e})`).all().map(t=>String(t.name)))}(t,e),n=T[e];if(!r.has(n)||!r.has("model_provider"))return null;const s=r.has("host_id")?" AND host_id = 'local'":"";return t.prepare(`SELECT ${n} AS id, model_provider AS "from" FROM ${e} WHERE COALESCE(model_provider, '') NOT IN ('', ?)${s}`).all(o).map(t=>({id:String(t.id),from:String(t.from)}))}export class SessionMoveError extends Error{backupDir;constructor(t,e){super(t instanceof Error?t.message:String(t)),this.name="SessionMoveError",this.backupDir=e}}function C(t){try{t.exec("ROLLBACK")}catch{}}async function I(t){try{return new((await import("node:sqlite")).DatabaseSync)(t)}catch(t){return`node:sqlite unavailable (Node ${process.versions.node}; needs 22.13+): ${t instanceof Error?t.message:String(t)}`}}export const NO_STATE_DB="no state DB";export async function moveSessionsToProvider(t,e={}){const r=function(){const t=[],e=o=>{if(s(o))for(const r of l(o,{withFileTypes:!0})){const n=g(o,r.name);r.isDirectory()?e(n):r.isFile()&&r.name.endsWith(".jsonl")&&t.push(n)}};return e(g(S(),"sessions")),e(g(S(),"archived_sessions")),t}(),n=[];for(const e of r){let o,r;try{o=$(e)}catch{continue}try{r=JSON.parse(o)}catch{continue}const s=r.payload?.model_provider;"session_meta"===r.type&&"string"==typeof s&&s!==t&&(r.payload.model_provider=t,n.push({file:e,from:s,line:JSON.stringify(r),length:Buffer.byteLength(o,"utf-8")}))}const c=[D(),...A()].filter(t=>!!t);let a=c.length>0?null:NO_STATE_DB;const f=[];for(const e of c){const o=await I(e);if("string"==typeof o){a=o;break}const r=[];try{for(const n of Object.keys(T)){const s=B(o,n,t);s&&s.length>0&&r.push({db:e,table:n,rows:s})}}catch{}f.push({path:e,db:o,tables:r})}const p=f.flatMap(t=>t.tables),u=new Set(p.flatMap(t=>t.rows.map(t=>t.id))),d={target:t,scanned:r.length,moved:n.map(({file:t,from:e})=>({file:t,from:e})),dbRows:u.size,dbSkipped:a,backupDir:null},m=()=>f.forEach(t=>t.db.close());if(e.dryRun||0===n.length&&0===p.length)return m(),d;const b=g(S(),"backups",`${x}-sessions-${(new Date).toISOString().replace(/[:.]/g,"-")}`);i(b,{recursive:!0}),f.forEach(({path:t,tables:e},r)=>{if(0!==e.length)for(const e of["","-wal","-shm"])s(t+e)&&o(t+e,g(b,`${r}-${h(t)}${e}`))});const y={target:t,moved:d.moved,tables:p};_(g(b,"manifest.json"),JSON.stringify(y,null,2)+"\n");const E=f.filter(t=>t.tables.length>0),v=[];try{for(const{db:t}of E)t.exec("BEGIN IMMEDIATE"),v.push(t);for(const t of n)await M(t.file,t.line,t.length);for(const{db:e,tables:o}of E)for(const{table:r,rows:n}of o){const o=e.prepare(`UPDATE ${r} SET model_provider = ? WHERE ${T[r]} = ? AND model_provider = ?`);for(const{id:e,from:r}of n)o.run(t,e,r)}for(;v.length>0;)v.shift().exec("COMMIT")}catch(t){throw v.forEach(C),m(),new SessionMoveError(t,b)}return m(),d.backupDir=b,d}export async function undoSessionMove(t){const e=JSON.parse(a(g(t,"manifest.json"),"utf-8"));let o=0;for(const{file:t,from:r}of e.moved){if(!s(t))continue;const e=$(t),n=JSON.parse(e);n.payload&&(n.payload.model_provider=r,await M(t,JSON.stringify(n),Buffer.byteLength(e,"utf-8")),o+=1)}const r=e.tables??(e.db&&e.threads?[{db:e.db,table:"threads",rows:e.threads}]:[]),n=new Set;for(const{db:t,table:o,rows:i}of r){if(!s(t)||0===i.length||!T[o])continue;const r=await I(t);if("string"==typeof r)continue;const c=[];try{r.exec("BEGIN IMMEDIATE");const t=r.prepare(`UPDATE ${o} SET model_provider = ? WHERE ${T[o]} = ? AND model_provider = ?`);for(const{id:o,from:r}of i)Number(t.run(r,o,e.target).changes)>0&&c.push(o);r.exec("COMMIT")}catch(t){throw C(r),r.close(),t}r.close(),c.forEach(t=>n.add(t))}return{files:o,dbRows:n.size}}
|
package/dist/lib/command.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import{i18n as n,detectSystemLang as o}from"./i18n.js";import{configManager as r}from"./config.js";import{runModelRefresh as t}from"./model-refresh.js";import{refreshClientConfig as e}from"./client-config-sync.js";import{normalizeBaseUrl as i}from"./gateway-addresses.js";import s from"chalk";import{setRuntimeOptions as m,detectColorPreferenceFromEnv as a,isDryRun as c}from"./runtime-options.js";import{runStartupUpdate as
|
|
1
|
+
import{i18n as n,detectSystemLang as o}from"./i18n.js";import{configManager as r}from"./config.js";import{runModelRefresh as t}from"./model-refresh.js";import{refreshClientConfig as e}from"./client-config-sync.js";import{normalizeBaseUrl as i}from"./gateway-addresses.js";import s from"chalk";import{setRuntimeOptions as m,detectColorPreferenceFromEnv as a,isDryRun as c}from"./runtime-options.js";import{runStartupUpdate as l}from"./auto-update.js";import{buildProgram as d}from"./program.js";import{firstCommandWord as u,isHelpRequest as p,renderHelpTopic as g}from"./cli-help.js";import{reportCliError as f,usageError as h,CliError as _,EXIT_CODES as y}from"./errors.js";import{brandEnv as w,CLI_NAME as j}from"./brand.js";import{dryRunUnsupportedCommand as k}from"./dry-run.js";import{flushTelemetry as v,installClientHeaders as C,lastFailureReason as x,maskSecrets as A,setTelemetryCommand as O,track as b,watchConsoleErrors as D}from"./telemetry.js";export{buildProgram}from"./program.js";const M=new Set(["setup","init","auth","enter","config"]);export class Command{program;configuring=!1;constructor(){const t=r.isLangChosen()?r.getLang():o();n.loadFromConfig(t),this.program=d()}preflightArgs(n){const o=o=>n.includes(o),t=!o("--no-color")&&a();if(m({nonInteractive:o("--non-interactive"),json:o("--json"),yes:o("--yes")||o("-y"),dryRun:o("--dry-run"),color:t}),t||(s.level=0),this.configuring=!1,p(n))return;let e;for(let o=0;o<n.length;o+=1){const r=n[o];"--base"===r&&n[o+1]?(e=n[o+1],o+=1):r.startsWith("--base=")&&(e=r.slice(7))}const c=u(n),l=void 0===c&&!["--version","-v"].some(o);this.configuring=l||void 0!==c&&M.has(c),e&&r.setBaseUrl(i(e)??e,this.configuring&&!o("--dry-run"))}async execute(n){const o=Date.now();let r=!1;try{if(this.preflightArgs(n),C(),!p(n)&&!["--version","-v"].some(o=>n.includes(o))){O(u(n)??"wizard");const o=w("INSTALLER_NOTE")?.trim();b("command","start",{detail:{args:n.filter(n=>n.startsWith("-")&&!/key/i.test(n)),...o?{installer:A(o).slice(0,400)}:{}}}),r=!0,D()}if("help"===n[0]&&n[1]){const o=g(n[1]);if(o)return void process.stdout.write(o)}if(this.rejectUnknownCommand(n),!p(n)){if(c()&&this.rejectUnsupportedDryRun(n),(await l(n)).handled)return;this.configuring&&await e({timeoutMs:5e3}),await t(n)}if(await this.program.parseAsync(n,{from:"user"}),r){const n=Boolean(process.exitCode)&&0!==process.exitCode,r=Number(process.exitCode)===y.cancelled;b("command",r?"cancel":n?"fail":"ok",{duration_ms:Date.now()-o,...n?{error:x(),detail:{exit_code:process.exitCode}}:{}})}}catch(t){if("commander.helpDisplayed"===t?.code||"commander.version"===t?.code)return;const e=this.normalizeCommanderError(t,n),i=f(e);if(r){const n=e instanceof _?`${e.type}${e.subtype?"/"+e.subtype:""}`:void 0;b("command",130===i?"cancel":"fail",{duration_ms:Date.now()-o,error:e,detail:{exit_code:i,...n?{type:n}:{}}})}}finally{r&&await v()}}rejectUnsupportedDryRun(o){const r=k(o);if(null!==r)throw h(n.t("runtime.dry_run_unsupported",{command:r,cli:j}),n.t("runtime.dry_run_unsupported_hint",{cli:j}),"dry_run_unsupported")}rejectUnknownCommand(o){const r=u(o);if(!r||"help"===r)return;if(this.program.commands.some(n=>n.name()===r))return;const t=this.suggestCommand(r),e=t?n.t("cli.unknown_hint_suggestion",{command:t}):n.t("cli.unknown_hint");throw h(n.t("cli.error_unknown",{command:r}),e,"unknown_command")}suggestCommand(n){const o=(n,o)=>{const r=Array.from({length:o.length+1},(n,o)=>o);for(let t=1;t<=n.length;t+=1){let e=r[0];r[0]=t;for(let i=1;i<=o.length;i+=1){const s=r[i];r[i]=Math.min(r[i]+1,r[i-1]+1,e+(n[t-1]===o[i-1]?0:1)),e=s}}return r[o.length]};return this.program.commands.map(n=>n.name()).map(r=>({name:r,score:o(n,r)})).filter(({score:o})=>o<=Math.max(2,Math.floor(n.length/2))).sort((n,o)=>n.score-o.score)[0]?.name}normalizeCommanderError(o,r){if(o instanceof _)return o;const t=o?.code,e=o instanceof Error?o.message:String(o);if("commander.unknownOption"===t||"commander.missingArgument"===t||"commander.missingMandatoryOption"===t||"commander.invalidArgument"===t){const o=u(r),i=/'([^']+)'/.exec(e)?.[1]??"",s="commander.unknownOption"===t?"cli.err_unknown_option":"commander.missingArgument"===t?"cli.err_missing_argument":"commander.missingMandatoryOption"===t?"cli.err_missing_option":null,m="commander.unknownOption"===t?this.gluedOption(i):void 0,a=A(i),c=m?n.t("cli.err_glued_option",{name:a,option:m}):s&&i?n.t(s,{name:a}):A(e.replace(/^error:\s*/,""));return h(c,o?n.t("cli.unknown_option_hint",{command:o}):n.t("cli.unknown_option_hint_root"),t)}return o}gluedOption(n){const o=new Set,r=n=>{for(const r of n.options)r.long&&o.add(r.long);for(const o of n.commands)r(o)};return r(this.program),[...o].filter(o=>n.length>o.length&&n.startsWith(o)).sort((n,o)=>o.length-n.length)[0]}getProgram(){return this.program}}
|