agentsw 0.9.2 → 0.10.1

package/README.md

@@ -113,14 +113,23 @@ dsh       yes    openai+anthropic  myproxy · glm-5.3-flash                 ~/.d
 | [Oh My Pi](https://omp.sh) (omp) | `~/.omp/agent/models.yml` (comments preserved) | both |
 | [pi](https://www.npmjs.com/package/@earendil-works/pi-coding-agent) | `~/.pi/agent/models.json` + `settings.json` | both |
 | [prime-agent](https://github.com/PrimeIntellect-ai/prime-agent) | `~/.prime/agent/models.json` + `settings.json` | both |
-| [opencode](https://opencode.ai) | `~/.config/opencode/opencode.json` | both |
+| [opencode](https://opencode.ai) | `~/.config/opencode/opencode.json`, `.jsonc` or `config.json` (the one that exists; comments preserved) | both |
 | [Hermes](https://pypi.org/project/hermes-agent/) | `~/.hermes/config.yaml` + `.env` (comments preserved) | both |
-| WorkBuddy | `~/.workbuddy/models.json` + `settings.json` | openai |
+| WorkBuddy | `~/.workbuddy/models.json` + `settings.json` (`%APPDATA%\workbuddy` on Windows) | openai |
 | [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (dsh) | `~/.dsh/settings.yaml` + `.credentials.yaml` | both |
 
 An agent that is not installed is skipped, not guessed at. `--apps codex,omp` narrows a run;
 `--apps` with an uninstalled agent forces it.
 
+Every adapter honors the configuration-directory variable its app defines, and resolves it on
+each command, so `use`, `sync`, `status`, `rename` and `remove` always agree on the same files:
+`CLAUDE_CONFIG_DIR` (Claude Code), `CODEX_HOME` (Codex), `PI_CODING_AGENT_DIR` /
+`PRIME_AGENT_CODING_AGENT_DIR` (pi / prime-agent), `OPENCODE_CONFIG_DIR` and `OPENCODE_CONFIG`
+(opencode), `HERMES_HOME` (Hermes), `DSH_HOME` (dsh), `WORKBUDDY_CONFIG_DIR` (WorkBuddy, with
+the legacy `CODEBUDDY_CONFIG_DIR` as fallback). An empty value is ignored, a leading `~` is
+expanded, and opencode is edited in place whichever of `opencode.json`, `opencode.jsonc` or
+`config.json` exists.
+
 The interactive menu asks the same question before writing: a multi-select where the first row
 is **all detected apps**, detected agents are listed first and undetected ones are marked. The
 last selection is remembered, so a menu `use`/`sync` keeps rewriting only the agents you picked.
@@ -233,7 +242,9 @@ Import still skips already configured accounts.
   `refresh --provider <id> --metadata-mode on` to request fresh reference prices.
 - **Auditable and optional:** `metadata.fields` records origins, value snapshots and timestamps;
   `metadata.conflicts` records disagreements with retained values. This audit stays in agentsw, never runtime agent configs.
-  Gateway has a separate 24-hour cache; failures use stale cached data or skip supplementation.
+  Gateway has a separate 24-hour cache; a failed request is retried once before falling back to stale cached data
+  (or skipping supplementation when there is none). `AGENTSW_DEBUG=1` reports why an attempt failed, and
+  `AGENTSW_GATEWAY_TIMEOUT_MS` overrides the 15-second whole-request budget.
 - **Automatic lookup is not automatic sync:** enrichment updates saved metadata during add/quick/discover/import/refresh.
   It does not add an automatic push to agents. Sync behavior is unchanged: ordinary `sync` only writes saved settings
   and fetches neither model lists nor metadata catalogs.
@@ -294,6 +305,38 @@ Do not combine `--apps` and `--prune`. Renames and removals preflight changes an
 private backups before writes. App-only removal leaves the store intact, so a later explicit
 sync of a managed provider can add it back to that app.
 
+### Global options
+
+These work with every command, written before or after the subcommand:
+
+| Option | Effect |
+|---|---|
+| `--json` | write exactly one JSON document to stdout and nothing else; interactive prompts and progress are disabled, so a scripted run never blocks on input |
+| `-q, --quiet` | suppress progress, hints and warnings; results and errors are kept |
+| `--no-color` | disable colored output (`NO_COLOR=1` does the same; `FORCE_COLOR=1` forces color, `--no-color` wins) |
+| `--lang en\|zh-CN` | interface language |
+
+```bash
+asw status --json | jq '.data.apps[] | select(.current != .id)'
+asw use myproxy -a codex --dry-run --json   # file paths only, never config bodies
+asw list --quiet
+```
+
+Success is `{"ok":true,"command":"status","version":"…","data":{…}}`; a failure is
+`{"ok":false,…,"error":{"message":"…"}}` on stdout with exit code 1. `--json` overrides
+`--quiet`. Credentials never appear in a JSON payload, and `--json --dry-run` reports the file
+paths a run would touch — never the staged configuration. `install` and `upgrade` hand their
+stdio to the package manager, whose own output still reaches the terminal (under `--json` its
+stdout is routed to stderr so the JSON document stays parseable).
+
+Results go to stdout; progress, warnings and the dimmed next-step hints go to stderr. So
+`agentsw status > out.txt` captures only the table, and a script can read stderr for what
+happened without parsing it out of the result.
+
+Exit codes: `0` success, `1` error, `130` cancelled at a prompt. Without `--json`,
+`models --provider <id> --metadata` keeps printing its bare JSON object, so existing scripts
+are unaffected.
+
 ## How your configs are treated
 
 - Existing provider-store and agent configuration files are backed up before committed
@@ -311,7 +354,10 @@ sync of a managed provider can add it back to that app.
 - A sync overwrites only the fields agentsw owns. Unmodeled provider-level keys and per-model
   extras survive; an owned field that stops applying is cleared rather than left stale, and a
   per-model `api`/`baseUrl` override that contradicts the route is dropped (it would silently
-  win over the entry) and reported.
+  win over the entry) and reported. Clearing needs the entry to say something in the first
+  place: a model the store knows nothing about — an id no catalog row matched — is written as
+  an id and its capabilities alone, and the limits already in the file are kept rather than
+  deleted.
 - YAML configs (omp, Hermes, dsh) keep their comments. `~/.codex/config.toml` does not —
   TOML round-trip drops them, which is why the backup happens first.
 - OpenAI endpoints come in two wires: `/v1/chat/completions` and `/v1/responses`. Imported

package/README.zh-CN.md

@@ -108,14 +108,22 @@ dsh       yes    openai+anthropic  myproxy · glm-5.3-flash                 ~/.d
 | [Oh My Pi](https://omp.sh) (omp) | `~/.omp/agent/models.yml`（保留注释） | 双协议 |
 | [pi](https://www.npmjs.com/package/@earendil-works/pi-coding-agent) | `~/.pi/agent/models.json` + `settings.json` | 双协议 |
 | [prime-agent](https://github.com/PrimeIntellect-ai/prime-agent) | `~/.prime/agent/models.json` + `settings.json` | 双协议 |
-| [opencode](https://opencode.ai) | `~/.config/opencode/opencode.json` | 双协议 |
+| [opencode](https://opencode.ai) | `~/.config/opencode/` 下已存在的 `opencode.json`、`.jsonc` 或 `config.json`（保留注释） | 双协议 |
 | [Hermes](https://pypi.org/project/hermes-agent/) | `~/.hermes/config.yaml` + `.env`（保留注释） | 双协议 |
-| WorkBuddy | `~/.workbuddy/models.json` + `settings.json` | openai |
+| WorkBuddy | `~/.workbuddy/models.json` + `settings.json`(Windows 下为 `%APPDATA%\workbuddy`) | openai |
 | [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (dsh) | `~/.dsh/settings.yaml` + `.credentials.yaml` | 双协议 |
 
 未安装的应用会被跳过，而不是瞎猜。`--apps codex,omp` 只跑指定应用；
 对未检测到的应用显式传 `--apps` 可强制写入。
 
+每个适配器都会遵循对应应用自己的配置目录环境变量，并在每次命令中重新解析，因此
+`use`、`sync`、`status`、`rename`、`remove` 始终指向同一批文件：`CLAUDE_CONFIG_DIR`
+（Claude Code）、`CODEX_HOME`（Codex）、`PI_CODING_AGENT_DIR` / `PRIME_AGENT_CODING_AGENT_DIR`
+（pi / prime-agent）、`OPENCODE_CONFIG_DIR` 与 `OPENCODE_CONFIG`（opencode）、`HERMES_HOME`
+（Hermes）、`DSH_HOME`（dsh）、`WORKBUDDY_CONFIG_DIR`（WorkBuddy，回退到旧的
+`CODEBUDDY_CONFIG_DIR`）。空值会被忽略，开头的 `~` 会展开；opencode 会就地编辑实际存在的
+`opencode.json`、`opencode.jsonc` 或 `config.json`。
+
 交互菜单写配置前会问同一个问题：多选框第一行是**全部检测到的应用**，已检测到的排在前面，
 未检测到的会标注出来。上次的选择会被记住，所以菜单里的 `use`/`sync` 只会继续写你勾选的那几个。
 任何配置文件解析失败（JSON/YAML/TOML 非法）都会报出文件与位置，绝不回显出错那一行；
@@ -219,7 +227,9 @@ asw sync --provider myproxy
   自动模式不会仅为刷新参考价格而查询：可查看 `metadata.gateway.fetchedAt` 判断快照时间，
   需要重新查询参考价格时使用 `refresh --provider <id> --metadata-mode on`。
 - **可追溯、可降级：** `metadata.fields` 记录来源、原值快照和时间，`metadata.conflicts` 记录保留值与冲突。
-  审计信息仅保存在 agentsw，不写入智能体运行配置。Gateway 目录独立缓存 24 小时；请求失败可使用旧缓存，无缓存时只跳过补充。
+  审计信息仅保存在 agentsw，不写入智能体运行配置。Gateway 目录独立缓存 24 小时；请求失败会先重试一次，
+  仍失败才使用旧缓存，无缓存时只跳过补充。`AGENTSW_DEBUG=1` 会说明该次尝试失败的原因，
+  `AGENTSW_GATEWAY_TIMEOUT_MS` 可覆盖默认 15 秒的整体请求预算。
 - **自动查询不等于自动同步：** 添加、快速添加、发现、导入、刷新时补全保存的元数据，并不新增自动推送。
   同步行为不变：普通 `sync` 仅写入已保存的设置，既不获取模型列表，也不请求元数据目录。
 
@@ -278,6 +288,35 @@ asw remove unused-provider --apps omp
 重命名和删除会先检查全部计划变更，再创建私有备份并写入。
 仅从智能体删除时中央条目仍保留，之后主动同步该供应商会重新写入该智能体。
 
+### 全局选项
+
+所有命令都支持，写在子命令前后均可：
+
+| 选项 | 作用 |
+|---|---|
+| `--json` | stdout 只输出一份 JSON 文档；同时关闭交互提问与进度，脚本运行绝不因等待输入而挂起 |
+| `-q, --quiet` | 抑制进度、提示与警告；结果与错误保留 |
+| `--no-color` | 关闭彩色输出（`NO_COLOR=1` 等效；`FORCE_COLOR=1` 强制彩色，`--no-color` 优先） |
+| `--lang en\|zh-CN` | 界面语言 |
+
+```bash
+asw status --json | jq '.data.apps[] | select(.current != .id)'
+asw use myproxy -a codex --dry-run --json   # 只给文件路径，不含配置正文
+asw list --quiet
+```
+
+成功时输出 `{"ok":true,"command":"status","version":"…","data":{…}}`；失败时 stdout 输出
+`{"ok":false,…,"error":{"message":"…"}}` 并以退出码 1 结束。`--json` 优先于 `--quiet`。
+JSON 载荷一律不含凭据；`--json --dry-run` 只报告将要改动的文件路径，绝不输出待写入的配置内容。
+`install` 与 `upgrade` 把 stdio 交给包管理器，其输出仍会到达终端（`--json` 下会把它的 stdout
+转到 stderr，以保证 JSON 文档可解析）。
+
+结果写 stdout，进度、警告与灰字的下一步提示写 stderr。因此 `agentsw status > out.txt` 只截到
+表格本身，脚本也可以单独读 stderr 了解过程中发生了什么，而不用从结果里把它剥出来。
+
+退出码：`0` 成功，`1` 出错，`130` 在交互提问处取消。不带 `--json` 时
+`models --provider <id> --metadata` 仍输出原来的裸 JSON 对象，现有脚本不受影响。
+
 ## 它如何对待你的配置
 
 - 正式提交变更前，已有中央存储和智能体配置先备份到
@@ -293,6 +332,8 @@ asw remove unused-provider --apps omp
 - 同步只覆盖 agentsw 自己管理的字段：未建模的供应商级键与模型级扩展字段保留；
   自己管理但本次不再写出的字段会被清除而非留成陈旧值；与新路由矛盾的模型级
   `api`/`baseUrl` 覆盖会被删除（否则它会静默盖过供应商条目）并在输出中点名。
+  但"清除"要求这一条本身说了点什么：store 完全不认识的模型（没有任何目录行匹配到的 id）
+  只带 id 和能力写入，文件里已有的上下文长度等参数会保留而不是被删掉。
 - YAML 配置（omp、Hermes、dsh）保留注释；`~/.codex/config.toml` 不行——TOML 往返会丢注释，
   所以才先备份。
 - OpenAI 端点有两种接口形态：`/v1/chat/completions` 与 `/v1/responses`。导入时沿用配置里

package/dist/app-paths.js

@@ -0,0 +1,127 @@
+import fs from "node:fs";
+import path from "node:path";
+import { appDataDir, expandHome, home, localAppDataDir } from "./fsutil.js";
+/**
+ * Every app path lives here and is resolved on each call, so one command's `use`/`sync`
+ * targets the same files as `remove`/`rename`/`status` — including when the app's own
+ * config-directory environment variable is set. An empty value is ignored (the apps do
+ * the same); a relative value is kept as-is, exactly as the app would resolve it against
+ * its own working directory.
+ */
+function envPath(name) {
+    const raw = process.env[name]?.trim();
+    return raw ? expandHome(raw) : undefined;
+}
+export function claudeDir() {
+    return envPath("CLAUDE_CONFIG_DIR") ?? path.join(home, ".claude");
+}
+export function claudeSettingsFile() {
+    return path.join(claudeDir(), "settings.json");
+}
+export function codexDir() {
+    return envPath("CODEX_HOME") ?? path.join(home, ".codex");
+}
+export function codexConfigFile() {
+    return path.join(codexDir(), "config.toml");
+}
+export function codexAuthFile() {
+    return path.join(codexDir(), "auth.json");
+}
+const PI_LAYOUT = {
+    pi: { env: "PI_CODING_AGENT_DIR", dir: ".pi/agent" },
+    prime: { env: "PRIME_AGENT_CODING_AGENT_DIR", dir: ".prime/agent" },
+};
+export function piDir(id) {
+    return envPath(PI_LAYOUT[id].env) ?? path.join(home, PI_LAYOUT[id].dir);
+}
+export function piModelsFile(id) {
+    return path.join(piDir(id), "models.json");
+}
+export function piSettingsFile(id) {
+    return path.join(piDir(id), "settings.json");
+}
+export function ompAgentDir() {
+    return path.join(home, ".omp", "agent");
+}
+/** An existing models.yaml wins only when models.yml is absent (omp precedence). */
+export function ompModelsFiles() {
+    return ["models.yml", "models.yaml"].map((name) => path.join(ompAgentDir(), name));
+}
+export function ompConfigFiles() {
+    return ["config.yml", "config.yaml"].map((name) => path.join(ompAgentDir(), name));
+}
+export function hermesDir() {
+    return envPath("HERMES_HOME") ?? localAppDataDir("hermes");
+}
+export function hermesConfigFile() {
+    return path.join(hermesDir(), "config.yaml");
+}
+export function hermesEnvFile() {
+    return path.join(hermesDir(), ".env");
+}
+export function dshDir() {
+    return envPath("DSH_HOME") ?? localAppDataDir("dsh");
+}
+/** The extension picks the document format, so an existing .yml/.json is written in place. */
+export function dshSettingsFiles() {
+    return ["settings.yaml", "settings.yml", "settings.json"].map((name) => path.join(dshDir(), name));
+}
+export function dshSettingsFile() {
+    return dshSettingsFiles().find((file) => fs.existsSync(file)) ?? path.join(dshDir(), "settings.yaml");
+}
+export function dshCredentialsFile() {
+    return path.join(dshDir(), ".credentials.yaml");
+}
+export function workbuddyDir() {
+    return envPath("WORKBUDDY_CONFIG_DIR") ?? envPath("CODEBUDDY_CONFIG_DIR") ??
+        (process.platform === "win32" ? appDataDir("workbuddy") : path.join(home, ".workbuddy"));
+}
+export function workbuddyModelsFile() {
+    return path.join(workbuddyDir(), "models.json");
+}
+export function workbuddySettingsFile() {
+    return path.join(workbuddyDir(), "settings.json");
+}
+/** opencode's loader accepts any of these names in its config directory. */
+export const OPENCODE_CONFIG_FILENAMES = ["opencode.json", "opencode.jsonc", "config.json"];
+export function opencodeConfigDirs() {
+    const dirs = [];
+    const custom = envPath("OPENCODE_CONFIG_DIR");
+    if (custom)
+        dirs.push(custom);
+    const fallback = appDataDir("opencode");
+    if (!dirs.includes(fallback))
+        dirs.push(fallback);
+    return dirs;
+}
+/** Every file a management command must consider, across both directories and the explicit file. */
+export function opencodeConfigFiles() {
+    const files = [];
+    const add = (file) => {
+        if (!files.includes(file))
+            files.push(file);
+    };
+    for (const dir of opencodeConfigDirs()) {
+        for (const name of OPENCODE_CONFIG_FILENAMES)
+            add(path.join(dir, name));
+    }
+    const explicit = envPath("OPENCODE_CONFIG");
+    if (explicit)
+        add(explicit);
+    return files;
+}
+/** OPENCODE_CONFIG (an explicit file), else the first existing config in the search order, else the creation default. */
+export function opencodePrimaryConfigFile() {
+    const explicit = envPath("OPENCODE_CONFIG");
+    if (explicit)
+        return explicit;
+    const dirs = opencodeConfigDirs();
+    for (const dir of dirs) {
+        for (const name of OPENCODE_CONFIG_FILENAMES) {
+            const file = path.join(dir, name);
+            if (fs.existsSync(file))
+                return file;
+        }
+    }
+    return path.join(dirs[0] ?? appDataDir("opencode"), "opencode.json");
+}

package/dist/apps.js

@@ -2,7 +2,9 @@ import { execFileSync, execSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import semver from "semver";
-import { appDataDir, home, readJsonIfExists } from "./fsutil.js";
+import { home, readJsonIfExists } from "./fsutil.js";
+import { dshDir, workbuddyDir } from "./app-paths.js";
+import { isJson } from "./ui.js";
 export const appPackages = [
     {
         id: "claude",
@@ -68,7 +70,7 @@ export const appPackages = [
         name: "WorkBuddy",
         // Electron desktop app: version from its data dir; managed by its own updater.
         localVersion: () => {
-            const dir = workbuddyDataDir();
+            const dir = workbuddyDir();
             const j = readJsonIfExists(path.join(dir, "last-launch.json"));
             const v = (j?.version ?? j?.appVersion);
             if (v)
@@ -90,12 +92,6 @@ export const appPackages = [
         localVersion: () => dshLocalVersion(),
     },
 ];
-// dsh config dir; respects $DSH_HOME.
-function dshHome() {
-    const env = process.env.DSH_HOME?.trim();
-    return env ? (env.startsWith("~") ? path.join(home, env.slice(1)) : env) :
-        process.platform === "win32" ? path.join(home, "AppData", "Local", "dsh") : path.join(home, ".dsh");
-}
 /** dsh version: search npx cache for @deepseek-ai/dsh, fall back to "?" if config dir exists. */
 function dshLocalVersion() {
     // 1. Fast path: check global node_modules directly (no subprocess)
@@ -125,14 +121,10 @@ function dshLocalVersion() {
         }
     }
     // 3. Config dir exists -> used via npx, version unknown
-    if (fs.existsSync(dshHome()))
+    if (fs.existsSync(dshDir()))
         return "?";
     return undefined;
 }
-function workbuddyDataDir() {
-    return process.env.WORKBUDDY_CONFIG_DIR?.trim() || process.env.CODEBUDDY_CONFIG_DIR?.trim() ||
-        (process.platform === "win32" ? appDataDir("workbuddy") : path.join(home, ".workbuddy"));
-}
 const SEMVERISH = /\d+\.\d+(\.\d+)?([-.+][\w.-]+)?/;
 export function installedVersion(app) {
     if (app.binary) {
@@ -224,11 +216,15 @@ export function isNewer(installed, latest) {
 }
 /** Run an install/upgrade command with live output. Throws on nonzero exit. */
 export function runShell(command) {
+    // --json owns stdout, so the child's output moves to stderr to keep the document parseable.
+    const stdio = isJson()
+        ? ["inherit", process.stderr.fd, "inherit"]
+        : "inherit";
     if (process.platform === "win32") {
-        execSync(command, { stdio: "inherit", env: process.env });
+        execSync(command, { stdio, env: process.env });
     }
     else {
-        execFileSync("bash", ["-o", "pipefail", "-c", command], { stdio: "inherit", env: process.env });
+        execFileSync("bash", ["-o", "pipefail", "-c", command], { stdio, env: process.env });
     }
 }
 /** Resolve the platform-specific command while keeping the package table readable. */