agentsw 0.10.2 → 0.11.1

package/dist/targets/pistyle.js

@@ -1,22 +1,14 @@
 import fs from "node:fs";
 import path from "node:path";
-import { backupFile, writeFileAtomic } from "../fsutil.js";
+import { backupFile, SafeConfigError, writeFileAtomic } from "../fsutil.js";
 import { piDir, piModelsFile, piSettingsFile } from "../app-paths.js";
 import { editJsoncObject, isJsonObject, readJsoncObject } from "../jsonc.js";
 import { looksLikeEnvName } from "../slug.js";
 import { transactionalTarget } from "../target-transaction.js";
-import { apiValue, classifyApi, entryApi, mergeModels, sdkBaseUrl, stripConflictingOverrides } from "./wire.js";
-/** Per-model keys this adapter writes; one a metadata-bearing entry stops emitting is cleared, not inherited. */
-const OWNED_MODEL_KEYS = [
-    "id",
-    "name",
-    "reasoning",
-    "thinkingLevelMap",
-    "input",
-    "contextWindow",
-    "maxTokens",
-    "cost",
-];
+import { t } from "../i18n.js";
+import { apiValue, applyDeepseekCompat, classifyApi, entryApi, mergeModels, OWNED_MODEL_METADATA_KEYS, ownedModelMetadata, sdkBaseUrl, stripConflictingOverrides, } from "./wire.js";
+/** pi writes the shared metadata plus its own thinking-level map. */
+const OWNED_MODEL_KEYS = [...OWNED_MODEL_METADATA_KEYS, "thinkingLevelMap"];
 function readModels(file) {
     const document = readJsoncObject(file);
     const providers = document.value.providers;
@@ -64,11 +56,12 @@ export function piStyleTarget(opts) {
         id: opts.id,
         name: opts.name,
         protocols: ["openai", "anthropic"],
+        supportsKeepDefault: true,
         get configPaths() {
             return [piModelsFile(id), piSettingsFile(id)];
         },
         detect: () => fs.existsSync(path.dirname(resolveDir())),
-        async apply(provider) {
+        async apply(provider, options = {}) {
             const dir = resolveDir();
             const modelsFile = path.join(dir, "models.json");
             const settingsFile = path.join(dir, "settings.json");
@@ -76,6 +69,11 @@ export function piStyleTarget(opts) {
             // Validate both files before preparing any writes, including a malformed settings file.
             const modelsDocument = readModels(modelsFile);
             const settingsDocument = readSettings(settingsFile);
+            const current = settingsDocument.value;
+            if (options.keepDefault && current.defaultProvider === provider.id && current.defaultModel &&
+                !provider.models.some((model) => model.id === current.defaultModel)) {
+                throw new SafeConfigError(t("sync.keepDefaultMissing", { file: settingsFile, id: provider.id, model: current.defaultModel }));
+            }
             const modelsConfig = { ...modelsDocument.value };
             const providers = { ...modelsConfig.providers };
             // Keys agentsw does not model (headers, authHeader, oauth, ...) and per-model extras
@@ -84,26 +82,17 @@ export function piStyleTarget(opts) {
             const api = apiValue(provider.protocol, provider.openaiApi, prev.api ?? entryApi(prev));
             const baseUrl = sdkBaseUrl(provider.protocol, provider.baseUrl);
             const models = mergeModels(prev.models, provider.models.map((m) => ({
-                id: m.id,
-                ...(m.name ? { name: m.name } : {}),
-                ...(m.reasoning !== undefined ? { reasoning: m.reasoning } : {}),
+                ...ownedModelMetadata(m),
                 ...(m.reasoning && m.reasoningEfforts?.length
                     ? { thinkingLevelMap: thinkingLevelMap(m.reasoningEfforts) }
                     : {}),
-                input: m.imageInput ? ["text", "image"] : ["text"],
-                ...(m.contextWindow ? { contextWindow: m.contextWindow } : {}),
-                ...(m.maxOutput ? { maxTokens: m.maxOutput } : {}),
-                ...(m.cost
-                    ? {
-                        cost: {
-                            input: m.cost.input ?? 0,
-                            output: m.cost.output ?? 0,
-                            cacheRead: m.cost.cacheRead ?? 0,
-                            cacheWrite: m.cost.cacheWrite ?? 0,
-                        },
-                    }
-                    : {}),
             })), OWNED_MODEL_KEYS);
+            // pi/prime key their DeepSeek wire rules by provider name, so a gateway
+            // entry never picks them up; the flags below are what their own deepseek
+            // catalog entries carry. Anthropic-wire entries replay differently.
+            if (provider.protocol === "openai") {
+                applyDeepseekCompat(models, { requiresReasoningContentOnAssistantMessages: true, thinkingFormat: "deepseek" });
+            }
             const conflicts = stripConflictingOverrides(models, api, baseUrl);
             if (conflicts.length)
                 notes.push(`dropped model overrides pointing elsewhere: ${conflicts.join(", ")}`);
@@ -116,22 +105,25 @@ export function piStyleTarget(opts) {
                 models,
             };
             modelsConfig.providers = providers;
-            const settings = {
+            const modelsText = editJsoncObject(modelsDocument, modelsConfig);
+            const settingsText = options.keepDefault ? undefined : editJsoncObject(settingsDocument, {
                 ...settingsDocument.value,
                 defaultProvider: provider.id,
                 defaultModel: provider.defaultModel,
-            };
-            const modelsText = editJsoncObject(modelsDocument, modelsConfig);
-            const settingsText = editJsoncObject(settingsDocument, settings);
+            });
+            const changed = [modelsFile];
             const modelsBackup = backupFile(modelsFile);
             if (modelsBackup)
                 notes.push(`backup: ${modelsBackup}`);
             writeFileAtomic(modelsFile, modelsText);
-            const settingsBackup = backupFile(settingsFile);
-            if (settingsBackup)
-                notes.push(`backup: ${settingsBackup}`);
-            writeFileAtomic(settingsFile, settingsText);
-            return { app: opts.id, changed: [modelsFile, settingsFile], notes };
+            if (settingsText !== undefined) {
+                const settingsBackup = backupFile(settingsFile);
+                if (settingsBackup)
+                    notes.push(`backup: ${settingsBackup}`);
+                writeFileAtomic(settingsFile, settingsText);
+                changed.push(settingsFile);
+            }
+            return { app: opts.id, changed, notes };
         },
         async prune(provider) {
             const dir = resolveDir();

package/dist/targets/wire.js

@@ -99,6 +99,11 @@ derived = ["input"]) {
         const old = prev.get(m.id);
         if (!old)
             return m;
+        // An entry that carries nothing but its id says nothing about the model: it
+        // is no evidence that the config's metadata went stale, so clearing owned
+        // keys on its behalf would delete what a richer sync or the user put there.
+        if (Object.keys(m).length === 1)
+            return { ...m, ...old };
         const kept = { ...old };
         const known = informative.some((key) => key in m);
         if (known)
@@ -108,6 +113,66 @@ derived = ["input"]) {
         return { ...kept, ...m };
     });
 }
+/** Per-model keys every pi-family adapter owns; see `ownedModelMetadata`. */
+export const OWNED_MODEL_METADATA_KEYS = ["id", "name", "reasoning", "input", "contextWindow", "maxTokens", "cost"];
+const DEEPSEEK_MODEL_ID = /deepseek/i;
+/**
+ * omp/pi/prime key their DeepSeek wire rules by provider name ("deepseek",
+ * "opencode-go", ...), so a gateway or reseller entry matches none of them: its
+ * reasoning replay then breaks and DeepSeek answers 400. Match on the model id
+ * instead and write the adapter's own flags per model; an explicit user value wins.
+ */
+export function applyDeepseekCompat(models, flags) {
+    for (const model of models) {
+        if (!DEEPSEEK_MODEL_ID.test(String(model.id)))
+            continue;
+        const compat = (model.compat ?? {});
+        model.compat = { ...flags, ...compat };
+    }
+}
+/**
+ * Whether a store entry describes the model at all. A bare id is ignorance,
+ * not a catalog statement, so adapters must not clear what the app config
+ * already holds on its behalf.
+ */
+export function hasModelMetadata(m) {
+    return (m.name !== undefined ||
+        m.reasoning !== undefined ||
+        m.reasoningEfforts !== undefined ||
+        m.imageInput !== undefined ||
+        m.contextWindow !== undefined ||
+        m.maxInput !== undefined ||
+        m.maxOutput !== undefined ||
+        m.cost !== undefined);
+}
+/**
+ * The per-model metadata agentsw writes into a pi-family models config. omp and
+ * the pi/prime adapters share the shape; only the extras around it differ, so
+ * keeping one builder is what stops the two from drifting apart.
+ */
+export function ownedModelMetadata(m) {
+    // `input` is a guess for a spec that says nothing; writing it would make the
+    // entry look authoritative to mergeModels and clear the config's own values.
+    const known = hasModelMetadata(m);
+    return {
+        id: m.id,
+        ...(m.name ? { name: m.name } : {}),
+        ...(m.reasoning !== undefined ? { reasoning: m.reasoning } : {}),
+        ...(known ? { input: m.imageInput ? ["text", "image"] : ["text"] } : {}),
+        ...(m.contextWindow ? { contextWindow: m.contextWindow } : {}),
+        ...(m.maxOutput ? { maxTokens: m.maxOutput } : {}),
+        ...(m.cost
+            ? {
+                cost: {
+                    input: m.cost.input ?? 0,
+                    output: m.cost.output ?? 0,
+                    cacheRead: m.cost.cacheRead ?? 0,
+                    cacheWrite: m.cost.cacheWrite ?? 0,
+                },
+            }
+            : {}),
+    };
+}
 /**
  * Drop per-model `api`/`baseUrl` overrides that contradict the route being
  * written. A model-level override wins over the provider entry in omp and pi,

package/dist/targets/workbuddy.js

@@ -6,6 +6,7 @@ import { workbuddyDir } from "../app-paths.js";
 import { localProviderId } from "../provider-identity.js";
 import { providerIdFromBaseUrl, providerNameFromBaseUrl } from "../slug.js";
 import { transactionalTarget } from "../target-transaction.js";
+import { hasModelMetadata } from "./wire.js";
 function configDir() {
     return workbuddyDir();
 }
@@ -101,12 +102,15 @@ export const workbuddy = transactionalTarget({
         const previous = new Map(owned.map((row) => [row.id, row]));
         const ours = provider.models.map((model) => {
             const custom = { ...previous.get(model.id) };
-            for (const key of OWNED_MODEL_KEYS)
-                delete custom[key];
+            // A bare id says nothing about the model; the row keeps what it already has.
+            const known = hasModelMetadata(model);
+            if (known)
+                for (const key of OWNED_MODEL_KEYS)
+                    delete custom[key];
             return {
                 ...custom,
                 id: model.id,
-                name: model.name ?? model.id,
+                name: model.name ?? (known ? undefined : custom.name) ?? model.id,
                 vendor: provider.name,
                 url,
                 apiKey: provider.apiKey,

package/dist/ui.js

@@ -51,10 +51,12 @@ export function warn(message) {
     process.stderr.write(pc.yellow(`warning: ${message}`) + "\n");
 }
 function emitJsonError(message) {
-    process.stdout.write(JSON.stringify({ ok: false, command, version, error: { message } }) + "\n");
+    emitJson(undefined, message);
 }
-export function emitJson(data) {
-    process.stdout.write(JSON.stringify({ ok: true, command, version, data }) + "\n");
+export function emitJson(data, errorMessage) {
+    process.stdout.write(JSON.stringify({ ok: errorMessage === undefined, command, version, data,
+        ...(errorMessage === undefined ? {} : { error: { message: errorMessage } }),
+    }) + "\n");
 }
 /** Fatal error. In machine mode the failure becomes the single stdout document, so pipes stay parseable. */
 export function error(message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentsw",
-  "version": "0.10.2",
+  "version": "0.11.1",
   "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": {