agentsw 0.8.0 → 0.9.0

package/README.md

@@ -121,6 +121,12 @@ dsh        yes    openai+anthropic  vfing · glm-5.3-flash                 ~/.ds
 An agent that is not installed is skipped, not guessed at. `--apps codex,omp` narrows a run;
 `--apps` with an uninstalled agent forces it.
 
+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.
+An error in any config file (invalid JSON/YAML/TOML) is reported with the file and position, never
+with the offending line, and dry-run keeps that detail instead of hiding it.
+
 ## Import what you already configured
 
 `import` reads every agent's config **and cc-switch's SQLite store** (read-only), resolves

package/dist/commands.js

@@ -13,7 +13,7 @@ import { loadGatewayCatalog } from "./gateway.js";
 import { resolveTargets, supportsProtocol, targets } from "./targets/index.js";
 import { discoverProviderModels, probeProtocols } from "./discover.js";
 import { appCommand, appPackages, installedVersion, isNewer, latestVersion, normalizeAppVersion, runShell } from "./apps.js";
-import { drainPendingWrites, readTextIfExists, setDryRun } from "./fsutil.js";
+import { SafeConfigError, drainPendingWrites, readTextIfExists, setDryRun } from "./fsutil.js";
 import { applyModelFilter } from "./filter.js";
 import { availableProviderId, providerIdFromBaseUrl, providerNameFromBaseUrl } from "./slug.js";
 import { t } from "./i18n.js";
@@ -443,7 +443,8 @@ async function runTargets(op, provider, appsFilter, redactErrors = false) {
             results.push(await target[op](provider));
         }
         catch (err) {
-            results.push({ app: target.id, changed: [], notes: [], skipped: pc.red(redactErrors ? "failed: configuration could not be previewed safely" : `failed: ${err.message}`) });
+            const safe = redactErrors && !(err instanceof SafeConfigError);
+            results.push({ app: target.id, changed: [], notes: [], skipped: pc.red(`failed: ${safe ? "configuration could not be previewed safely" : err.message}`) });
             process.exitCode = 1;
         }
     }

package/dist/fsutil.js

@@ -3,6 +3,13 @@ import os from "node:os";
 import path from "node:path";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomUUID } from "node:crypto";
+/**
+ * An error whose message is guaranteed to carry no file content. Dry-run redacts
+ * unknown errors wholesale (parser messages can embed credentials), so config
+ * parsers must throw this to stay actionable there.
+ */
+export class SafeConfigError extends Error {
+}
 // AGENTSW_HOME is an explicit portable/test override. Native Windows otherwise
 // uses USERPROFILE/os.homedir(), while Unix follows HOME as expected.
 export const home = process.env.AGENTSW_HOME?.trim() ||
@@ -88,7 +95,13 @@ export function readJsonIfExists(file) {
     const text = readTextIfExists(file);
     if (text === undefined)
         return undefined;
-    return JSON.parse(text);
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        // Node quotes surrounding input in the message, which may hold credentials.
+        throw new SafeConfigError(`${file}: invalid JSON configuration`);
+    }
 }
 /** Compatibility preview switch. Each target captures its value when its scoped work starts. */
 let dryRun = false;

package/dist/i18n.js

@@ -123,6 +123,10 @@ const messages = {
     "menu.defaultModel": { en: "default model", "zh-CN": "默认模型" },
     "menu.keepDefault": { en: "keep current default ({model})", "zh-CN": "保持当前默认模型({model})" },
     "menu.active": { en: "current in agentsw", "zh-CN": "agentsw 当前" },
+    "menu.pickApps": { en: "which agent configs should this write to?", "zh-CN": "写入哪些智能体配置？" },
+    "menu.appsAll": { en: "all {count} detected apps", "zh-CN": "全部 {count} 个检测到的应用" },
+    "menu.appNotDetected": { en: "(not detected)", "zh-CN": "(未检测到)" },
+    "menu.appsHint": { en: "↑/↓ move · Space toggle · Enter confirm", "zh-CN": "↑/↓ 移动 · 空格切换 · Enter 确认" },
     "menu.discoverFor": { en: "which provider's model list should be updated?", "zh-CN": "选择要更新模型列表的供应商" },
     "menu.pushRefresh": { en: "also sync this provider to agent configs after updating its model list?", "zh-CN": "更新模型列表后，是否同时将该供应商同步到智能体配置？" },
     "menu.removeProvider": { en: "which provider configuration should be deleted?", "zh-CN": "选择要删除配置的供应商" },

package/dist/jsonc.js

@@ -1,4 +1,4 @@
-import { readTextIfExists } from "./fsutil.js";
+import { SafeConfigError, readTextIfExists } from "./fsutil.js";
 import { applyEdits, createScanner, getNodeValue, modify, parseTree, printParseErrorCode, } from "jsonc-parser";
 export function isJsonObject(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -9,11 +9,10 @@ function parseJsoncObject(file, text) {
     const root = parseTree(source, errors, { allowTrailingComma: true });
     const error = errors[0];
     if (error) {
-        // Do not quote source text: config files can contain credentials.
-        throw new Error(`${file}: invalid JSONC (${printParseErrorCode(error.error)} at offset ${error.offset})`);
+        throw new SafeConfigError(`${file}: invalid JSONC (${printParseErrorCode(error.error)} at offset ${error.offset})`);
     }
     if (root?.type !== "object")
-        throw new Error(`${file}: expected a JSON object at the document root`);
+        throw new SafeConfigError(`${file}: expected a JSON object at the document root`);
     // Parsing resolves duplicate keys last-wins, but modify edits the first occurrence.
     // Reject that ambiguity at any depth rather than syncing a value the agent will not read.
     const checkDuplicates = (node) => {
@@ -22,7 +21,7 @@ function parseJsoncObject(file, text) {
             if (names) {
                 const name = child.children[0].value;
                 if (names.has(name)) {
-                    throw new Error(`${file}: invalid JSONC (duplicate object property at offset ${child.offset})`);
+                    throw new SafeConfigError(`${file}: invalid JSONC (duplicate object property at offset ${child.offset})`);
                 }
                 names.add(name);
             }

package/dist/menu.js

@@ -62,6 +62,42 @@ async function pickProvider(message) {
     const p = store.providers[id];
     return { id, defaultModel: p.defaultModel, models: p.models.map((m) => m.id) };
 }
+/**
+ * Multi-select target apps, remembering the previous choice. The first row selects
+ * every detected app; picking it (or toggling everything off) returns undefined,
+ * which keeps the CLI default of "all detected apps". A narrower selection becomes
+ * an explicit --apps filter, which force-writes even undetected apps — so only
+ * offer real choices.
+ */
+async function pickApps(message) {
+    const remembered = (loadStore().syncTargets ?? []).filter((id) => targets.some((target) => target.id === id));
+    const detected = targets.filter((target) => target.detect());
+    const { apps } = await prompts({
+        type: "multiselect",
+        name: "apps",
+        message,
+        hint: t("menu.appsHint"),
+        instructions: false,
+        choices: [
+            { title: t("menu.appsAll", { count: detected.length }), value: "all", selected: remembered.length === 0 },
+            // Detected apps first, and say so: choosing an undetected one force-creates its config.
+            ...[...targets].sort((a, b) => Number(b.detect()) - Number(a.detect())).map((target) => ({
+                title: `${target.id} · ${target.name}${target.detect() ? "" : ` ${pc.dim(t("menu.appNotDetected"))}`}`,
+                value: target.id,
+                selected: remembered.includes(target.id),
+            })),
+        ],
+    }, cancel);
+    const picked = (Array.isArray(apps) ? apps : []).filter((value) => value !== "all");
+    const all = picked.length === 0 || apps.includes("all") || picked.length === targets.length;
+    const store = loadStore();
+    if (all)
+        delete store.syncTargets;
+    else
+        store.syncTargets = picked;
+    saveStore(store);
+    return all ? undefined : picked.join(",");
+}
 async function renameFromMenu() {
     const picked = await pickProvider(t("menu.renameProvider"));
     if (!picked)
@@ -201,6 +237,7 @@ export async function cmdMenu() {
             const picked = await pickProvider(t("menu.pickProvider"));
             if (!picked)
                 continue;
+            const apps = await pickApps(t("menu.pickApps"));
             const { model } = await prompts({
                 type: picked.models.length > 1 ? "select" : null,
                 name: "model",
@@ -211,7 +248,7 @@ export async function cmdMenu() {
                     ...picked.models.filter((m) => m !== picked.defaultModel).map((m) => ({ title: m, value: m })),
                 ],
             }, cancel);
-            await cmdUse(picked.id, { model: model || undefined });
+            await cmdUse(picked.id, { model: model || undefined, apps });
         }
         else if (action === "status") {
             cmdStatus();
@@ -220,14 +257,14 @@ export async function cmdMenu() {
             cmdList();
         }
         else if (action === "sync") {
-            await cmdSync({});
+            await cmdSync({ apps: await pickApps(t("menu.pickApps")) });
         }
         else if (action === "discover") {
             const picked = await pickProvider(t("menu.discoverFor"));
             if (!picked)
                 continue;
             const sync = await askToggle(t("menu.pushRefresh"));
-            await cmdDiscover(picked.id, { sync });
+            await cmdDiscover(picked.id, { sync, apps: sync ? await pickApps(t("menu.pickApps")) : undefined });
         }
         else if (action === "metadata") {
             const picked = await pickProvider(t("menu.metadataProvider"));

package/dist/targets/codex.js

@@ -1,12 +1,23 @@
 import fs from "node:fs";
 import path from "node:path";
 import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
-import { backupFile, home, readJsonIfExists, readTextIfExists, writeFileAtomic } from "../fsutil.js";
+import { SafeConfigError, backupFile, home, readJsonIfExists, readTextIfExists, writeFileAtomic } from "../fsutil.js";
 import { isJsonObject } from "../jsonc.js";
 import { transactionalTarget } from "../target-transaction.js";
 const dir = path.join(home, ".codex");
 const configFile = path.join(dir, "config.toml");
 const authFile = path.join(dir, "auth.json");
+/** smol-toml quotes the offending source line, which may hold a key: report only the position. */
+function parseConfigToml(file, text) {
+    try {
+        return parseToml(text);
+    }
+    catch (err) {
+        const { line, column } = err;
+        const position = line === undefined ? "" : ` (line ${line}${column === undefined ? "" : `, col ${column}`})`;
+        throw new SafeConfigError(`${file}: invalid TOML configuration${position}`);
+    }
+}
 /**
  * Codex CLI: [model_providers.<id>] in ~/.codex/config.toml selects a custom
  * OpenAI-protocol endpoint; the key ships via ~/.codex/auth.json OPENAI_API_KEY.
@@ -21,7 +32,7 @@ export const codex = transactionalTarget({
     async apply(provider) {
         const notes = [];
         const text = readTextIfExists(configFile);
-        const config = (text ? parseToml(text) : {});
+        const config = text ? parseConfigToml(configFile, text) : {};
         const authValue = readJsonIfExists(authFile);
         const auth = authValue === undefined ? {} : authValue;
         if (!isJsonObject(auth))
@@ -84,7 +95,7 @@ export const codex = transactionalTarget({
         const text = readTextIfExists(configFile);
         if (!text)
             return { app: this.id, changed: [], notes: [], skipped: "no config.toml" };
-        const config = parseToml(text);
+        const config = parseConfigToml(configFile, text);
         if (config.model_providers !== undefined && !isJsonObject(config.model_providers)) {
             throw new Error(`${configFile}: expected model_providers to be a table`);
         }
@@ -114,7 +125,7 @@ export const codex = transactionalTarget({
         if (!text)
             return undefined;
         try {
-            const config = parseToml(text);
+            const config = parseConfigToml(configFile, text);
             if (!config.model_provider)
                 return undefined;
             return `${String(config.model_provider)} · ${String(config.model ?? "?")}`;

package/dist/yaml.js

@@ -1,12 +1,33 @@
 import YAML from "yaml";
+import { SafeConfigError } from "./fsutil.js";
+/** YAML errors embed the offending source line, which may hold credentials: keep only the code and position. */
+function describeYamlErrors(file, errors) {
+    const details = [...new Set(errors.map((error) => {
+            const position = error.linePos?.[0];
+            return [
+                error.code,
+                position ? `line ${position.line}` : undefined,
+                position ? `col ${position.col}` : undefined,
+            ].filter(Boolean).join(" ");
+        }))].slice(0, 3);
+    return details.length
+        ? `${file}: invalid YAML configuration (${details.join("; ")})`
+        : `${file}: invalid YAML configuration`;
+}
 /** Resolve aliases in document context before edits can mutate or remove anchors. */
 export function parseYamlMapping(file, text) {
+    let doc;
+    try {
+        doc = text ? YAML.parseDocument(text) : new YAML.Document({});
+    }
+    catch {
+        throw new SafeConfigError(`${file}: invalid YAML configuration`);
+    }
+    if (doc.errors.length)
+        throw new SafeConfigError(describeYamlErrors(file, doc.errors));
+    if (doc.contents == null)
+        doc.contents = doc.createNode({});
     try {
-        const doc = text ? YAML.parseDocument(text) : new YAML.Document({});
-        if (doc.errors.length)
-            throw new Error("parse error");
-        if (doc.contents == null)
-            doc.contents = doc.createNode({});
         // YAML permits cycles; application configuration does not. The document
         // conversion also enforces YAML's alias expansion limit before we detach.
         JSON.stringify(doc.toJS());
@@ -27,8 +48,8 @@ export function parseYamlMapping(file, text) {
         return doc;
     }
     catch {
-        // Parser messages include source lines, which may contain credentials.
-        throw new Error(`${file}: invalid YAML configuration (expected an acyclic mapping with valid aliases)`);
+        // Parser and conversion messages include source lines, which may contain credentials.
+        throw new SafeConfigError(`${file}: invalid YAML configuration (expected an acyclic mapping with valid aliases)`);
     }
 }
 /** Validate the emitted configuration before any backup or write. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentsw",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "CLI provider switcher for coding agents: manage OpenAI/Anthropic-protocol providers in one place and sync them, with models.dev metadata, into Claude Code, Codex, omp, pi, prime-agent, opencode, Hermes, WorkBuddy and DeepSeek Harness",
   "type": "module",
   "repository": {