saros-proxy 0.7.3 → 0.9.0

package/dist/cli/dsh-config.d.ts

@@ -0,0 +1,32 @@
+/**
+ * dsh-config.ts — DeepSeek Harness (dsh) sync target.
+ *
+ * Updates the saros-proxy provider's model list inside the dsh profile's
+ * patch layer (~/.dsh/profiles/web/cordis.patch.yml), row id `llm-pi-ai`.
+ * dsh model entries use the pi/omp field names plus a `reasoningEfforts`
+ * map ({ 'off': null, high: 'high', … }) instead of pi/omp's `thinking`
+ * object — the transformer here converts the canonical entries.
+ *
+ * Only `providers["saros-proxy"].models` is replaced; every other provider
+ * row (commandcode, commandcode-anthropic, agent-default-model, MCP inserts)
+ * and all user fields are preserved. Leading comment lines are re-emitted
+ * verbatim (the patch file documents its `!!js` allowance in a comment).
+ * cordis.yml is NEVER touched (dsh rewrites it empty at every boot).
+ */
+import { type PiOmpModel } from './harness-models.js';
+import type { OpencodeConfigResult } from './opencode-config.js';
+/** Default dsh patch layer path for the web profile. */
+export declare function getDefaultDshConfigPath(): string;
+/** Convert a pi/omp model entry into the dsh patch entry shape. */
+export declare function toDshModel(model: PiOmpModel): Record<string, unknown>;
+/**
+ * Sync the saros-proxy provider model list into the dsh patch layer.
+ *
+ * @param modelsMap — Canonical model map (id → opencode-shaped entry)
+ * @param port — Proxy port (unused today; kept for harness-sync parity)
+ * @param options.configPath — Explicit config path (for testing)
+ * @returns Result with success status and path
+ */
+export declare function syncModelsToDshConfig(modelsMap: Record<string, unknown>, port: number, options?: {
+    configPath?: string;
+}): OpencodeConfigResult;

package/dist/cli/dsh-config.js

@@ -0,0 +1,122 @@
+/**
+ * dsh-config.ts — DeepSeek Harness (dsh) sync target.
+ *
+ * Updates the saros-proxy provider's model list inside the dsh profile's
+ * patch layer (~/.dsh/profiles/web/cordis.patch.yml), row id `llm-pi-ai`.
+ * dsh model entries use the pi/omp field names plus a `reasoningEfforts`
+ * map ({ 'off': null, high: 'high', … }) instead of pi/omp's `thinking`
+ * object — the transformer here converts the canonical entries.
+ *
+ * Only `providers["saros-proxy"].models` is replaced; every other provider
+ * row (commandcode, commandcode-anthropic, agent-default-model, MCP inserts)
+ * and all user fields are preserved. Leading comment lines are re-emitted
+ * verbatim (the patch file documents its `!!js` allowance in a comment).
+ * cordis.yml is NEVER touched (dsh rewrites it empty at every boot).
+ */
+import { existsSync, readFileSync, writeFileSync, copyFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
+import { toPiOmpModelArray } from './harness-models.js';
+/** Default dsh patch layer path for the web profile. */
+export function getDefaultDshConfigPath() {
+    return join(homedir(), '.dsh', 'profiles', 'web', 'cordis.patch.yml');
+}
+const DSH_ROW_ID = 'llm-pi-ai';
+const SAROS_PROVIDER_KEY = 'saros-proxy';
+/** Convert a pi/omp model entry into the dsh patch entry shape. */
+export function toDshModel(model) {
+    const entry = {
+        id: model.id,
+        name: model.name,
+        input: model.input,
+        contextWindow: model.contextWindow,
+        maxTokens: model.maxTokens,
+    };
+    if (model.thinking && model.thinking.efforts.length > 0) {
+        const efforts = { off: null };
+        for (const effort of model.thinking.efforts) {
+            efforts[effort] = effort;
+        }
+        entry.reasoningEfforts = efforts;
+    }
+    if (model.cost) {
+        entry.cost = model.cost;
+    }
+    return entry;
+}
+/**
+ * Split leading comment lines from the raw YAML text so they can be
+ * re-emitted after stringify (the yaml package drops comments).
+ */
+function splitLeadingComments(raw) {
+    const lines = raw.split('\n');
+    const comments = [];
+    let i = 0;
+    while (i < lines.length && (lines[i].trimStart().startsWith('#') || lines[i].trim() === '')) {
+        comments.push(lines[i]);
+        i++;
+    }
+    return { comments: comments.join('\n'), body: lines.slice(i).join('\n') };
+}
+/**
+ * Sync the saros-proxy provider model list into the dsh patch layer.
+ *
+ * @param modelsMap — Canonical model map (id → opencode-shaped entry)
+ * @param port — Proxy port (unused today; kept for harness-sync parity)
+ * @param options.configPath — Explicit config path (for testing)
+ * @returns Result with success status and path
+ */
+export function syncModelsToDshConfig(modelsMap, port, options = {}) {
+    void port;
+    const configPath = options.configPath ?? getDefaultDshConfigPath();
+    if (!existsSync(configPath)) {
+        return { success: false, error: 'config not found at ' + configPath };
+    }
+    try {
+        const raw = readFileSync(configPath, 'utf-8');
+        const { comments, body } = splitLeadingComments(raw);
+        let doc;
+        try {
+            doc = parseYaml(body);
+        }
+        catch {
+            return { success: false, path: configPath, error: 'dsh patch contains invalid YAML' };
+        }
+        if (!Array.isArray(doc)) {
+            return { success: false, path: configPath, error: 'dsh patch is not a top-level array' };
+        }
+        // Locate the llm-pi-ai row and its saros-proxy provider entry.
+        const row = doc.find((r) => r && typeof r === 'object' && !Array.isArray(r) &&
+            r.id === DSH_ROW_ID);
+        if (!row) {
+            return { success: false, path: configPath, error: `dsh patch has no ${DSH_ROW_ID} row` };
+        }
+        const config = row.config;
+        const providers = config?.providers;
+        const provider = providers?.[SAROS_PROVIDER_KEY];
+        if (!provider) {
+            return {
+                success: false,
+                path: configPath,
+                error: `dsh patch ${DSH_ROW_ID} row has no ${SAROS_PROVIDER_KEY} provider`,
+            };
+        }
+        // Replace ONLY the models key.
+        provider.models = toPiOmpModelArray(modelsMap).map(toDshModel);
+        const backupPath = configPath + '.backup';
+        if (existsSync(configPath)) {
+            copyFileSync(configPath, backupPath);
+        }
+        writeFileSync(configPath, comments ? comments + '\n' + stringifyYaml(doc) : stringifyYaml(doc), 'utf-8');
+        return { success: true, path: configPath, created: false };
+    }
+    catch (err) {
+        return {
+            success: false,
+            path: configPath,
+            error: err instanceof Error ? err.message : String(err),
+        };
+    }
+}
+//# sourceMappingURL=dsh-config.js.map

package/dist/cli/dsh-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dsh-config.js","sourceRoot":"","sources":["../../src/cli/dsh-config.ts"],"names":[],"mappings":"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"}

package/dist/cli/harness-models.d.ts

@@ -8,6 +8,12 @@
  * upstream + models.dev metadata (falling back to bundled models.json).
  */
 import type { ProxyConfig } from '../config.js';
+/**
+ * Suffix for provider-specific model ids in synced harness configs.
+ * Commandcode-only models (claude-*, vendor/model) are exposed to harnesses
+ * as `<id>@commandcode`; the proxy strips the suffix on the way upstream.
+ */
+export declare const PROVIDER_MODEL_SUFFIX = "@";
 export interface PiOmpModel {
     id: string;
     name: string;
@@ -21,6 +27,11 @@ export interface PiOmpModel {
         cacheRead: number;
         cacheWrite: number;
     };
+    /** Explicit thinking surface (pi/omp schema). Absent → harness infers one. */
+    thinking?: {
+        mode: 'effort';
+        efforts: string[];
+    };
 }
 /**
  * Transform one canonical (opencode-shaped) model entry into the
@@ -30,12 +41,25 @@ export interface PiOmpModel {
 export declare function toPiOmpModel(entry: Record<string, unknown>): PiOmpModel;
 /** Transform the canonical model map into a pi/omp `models` array. */
 export declare function toPiOmpModelArray(models: Record<string, unknown>): PiOmpModel[];
+/**
+ * Normalize a provider model id to its bare name for cross-provider
+ * matching: 'deepseek/deepseek-v4-flash' → 'deepseek-v4-flash';
+ * 'glm-5' → 'glm-5'. Case- and separator-insensitive.
+ */
+export declare function bareModelName(modelId: string): string;
+/**
+ * Annotate a display name with how many keys can serve the model,
+ * e.g. "DeepSeek V4 Flash (3)". Communicates rotation width: '(3)' rotates
+ * across 3 accounts (possibly cross-provider), '(1)' is a single key.
+ */
+export declare function annotateName(name: string, keyCount: number): string;
 /**
  * Build the canonical model map (id → opencode-shaped entry).
  *
  * Live path (config provided, not offline): fetch upstream model IDs and
- * enrich each with models.dev metadata via buildMinimalStub. Falls back to
- * the bundled models.json when the upstream fetch yields nothing.
+ * enrich each with models.dev metadata via buildMinimalStub, then append
+ * provider-specific catalog models (@commandcode etc.). Falls back to the
+ * bundled models.json when the upstream fetch yields nothing.
  * Offline path (or no config): bundled models.json only.
  */
 export declare function buildCanonicalModels(config?: ProxyConfig, opts?: {

package/dist/cli/harness-models.js

@@ -9,6 +9,40 @@
  */
 import { loadModelsFromJson } from './opencode-config.js';
 import { buildMinimalStub, fetchModelsDevMetadata, fetchUpstreamModelIds } from '../models-sync.js';
+import { allProviders, getProvider, inferProvider } from '../providers/index.js';
+/**
+ * Suffix for provider-specific model ids in synced harness configs.
+ * Commandcode-only models (claude-*, vendor/model) are exposed to harnesses
+ * as `<id>@commandcode`; the proxy strips the suffix on the way upstream.
+ */
+export const PROVIDER_MODEL_SUFFIX = '@';
+/** Canonical effort vocabulary, least → most intensive (pi/omp schema). */
+const EFFORT_ORDER = ['minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
+/**
+ * Extract the effort ladder from models.dev `reasoning_options`
+ * (`[{ type: 'effort', values: [...] }]`). Keeps only values in the pi/omp
+ * thinking schema vocabulary; deduplicates and orders least → most intensive.
+ */
+function parseEfforts(entry) {
+    const options = entry.reasoning_options;
+    if (!Array.isArray(options))
+        return [];
+    const found = new Set();
+    for (const option of options) {
+        if (!option || typeof option !== 'object' || Array.isArray(option))
+            continue;
+        if (option.type !== 'effort')
+            continue;
+        const values = option.values;
+        if (!Array.isArray(values))
+            continue;
+        for (const value of values) {
+            if (typeof value === 'string')
+                found.add(value);
+        }
+    }
+    return EFFORT_ORDER.filter((effort) => found.has(effort));
+}
 /**
  * Transform one canonical (opencode-shaped) model entry into the
  * pi/omp model shape. Unknown metadata falls back to safe defaults
@@ -28,6 +62,15 @@ export function toPiOmpModel(entry) {
         contextWindow: typeof limit.context === 'number' ? limit.context : 262144,
         maxTokens: typeof limit.output === 'number' ? limit.output : 65536,
     };
+    // Explicit thinking metadata: models.dev effort options → pi/omp
+    // `thinking.efforts`. Without it the harness infers a generic ladder that
+    // can disagree with the model's real contract (e.g. ox-alpha only accepts
+    // low/high/max).
+    if (model.reasoning) {
+        const efforts = parseEfforts(entry);
+        if (efforts.length > 0)
+            model.thinking = { mode: 'effort', efforts };
+    }
     // Cost is optional; accept both camelCase (pi/omp) and snake_case (models.dev).
     const rawCost = entry.cost;
     if (rawCost && typeof rawCost === 'object' && !Array.isArray(rawCost)) {
@@ -49,12 +92,144 @@ export function toPiOmpModel(entry) {
 export function toPiOmpModelArray(models) {
     return Object.values(models).map((entry) => toPiOmpModel(entry));
 }
+/**
+ * Normalize a provider model id to its bare name for cross-provider
+ * matching: 'deepseek/deepseek-v4-flash' → 'deepseek-v4-flash';
+ * 'glm-5' → 'glm-5'. Case- and separator-insensitive.
+ */
+export function bareModelName(modelId) {
+    const last = modelId.split('/').pop() ?? modelId;
+    return last.toLowerCase().replaceAll('_', '-');
+}
+/**
+ * Annotate a display name with how many keys can serve the model,
+ * e.g. "DeepSeek V4 Flash (3)". Communicates rotation width: '(3)' rotates
+ * across 3 accounts (possibly cross-provider), '(1)' is a single key.
+ */
+export function annotateName(name, keyCount) {
+    if (keyCount <= 0)
+        return name;
+    return `${name} (${keyCount})`;
+}
+/**
+ * Count how many of the user's keys can serve a bare model name.
+ *
+ * The owning provider (whose catalog the entry came from) always serves it.
+ * Every OTHER provider must claim the model definitively ('yes' via
+ * bare-name/affinity check) — a structural 'maybe' does not count, or
+ * blanket-maybe providers (opencode-go) would overcount models they don't
+ * actually have (e.g. claude-*).
+ */
+function countServingKeys(config, bareName, owner) {
+    return (config.keys ?? []).filter((k) => {
+        const provider = getProvider(inferProvider(k));
+        if (!provider)
+            return false;
+        if (provider.id === owner)
+            return true;
+        const byName = provider.modelAffinityByName?.(bareName);
+        if (byName)
+            return byName === 'yes';
+        return provider.modelAffinity(bareName) === 'yes';
+    }).length;
+}
+/**
+ * Map one provider-catalog entry into the canonical opencode-shaped entry.
+ * Uses the catalog's own fields when present (commandcode serves name +
+ * context_length); models.dev metadata is not available for these providers.
+ */
+/**
+ * Map one provider-catalog entry into the canonical opencode-shaped entry.
+ * Uses the catalog's own fields when present (commandcode serves name +
+ * context_length); models.dev metadata is not available for these providers.
+ */
+function providerCatalogToCanonical(modelId, entry, keyCount) {
+    const context = typeof entry.context_length === 'number' ? entry.context_length : undefined;
+    const name = typeof entry.name === 'string' ? entry.name : modelId;
+    return {
+        id: modelId,
+        name: annotateName(name, keyCount),
+        tool_call: true,
+        reasoning: true,
+        limit: {
+            context: context ?? 262144,
+            output: 65536,
+        },
+        modalities: { input: ['text'], output: ['text'] },
+        // Conservative effort ladder for provider-catalog models (no models.dev
+        // metadata): the commandcode gateway accepts low|medium|high|xhigh and
+        // rejects minimal — better declared here than invented by the harness.
+        reasoning_options: [{ type: 'effort', values: ['low', 'medium', 'high'] }],
+        // Hint consumed by display tooling; harmless to harnesses that ignore it.
+        ...(typeof entry.owned_by === 'string' ? { owned_by: entry.owned_by } : {}),
+    };
+}
+/**
+ * Fetch model entries from the given providers and merge them into the map.
+ *
+ * Cross-provider aliasing: when a provider catalog serves the SAME model
+ * under a different id (bare name matches an existing entry — e.g.
+ * 'deepseek/deepseek-v4-flash' on commandcode vs 'deepseek-v4-flash' on
+ * opencode-go), the existing entry gains the new provider as an alias:
+ * requests naming either id rotate across all serving keys.
+ *
+ * Provider-only models (claude-*, unique vendor ids) are added as
+ * `<id>@<providerId>` suffixed entries.
+ *
+ * Only providers the user actually has keys for are merged: exposing
+ * provider-only models without a usable key would create broken entries in
+ * harness configs.
+ */
+async function appendProviderCatalogModels(map, existingIds, config) {
+    const configured = new Set((config.keys ?? []).map((k) => inferProvider(k)));
+    const providers = allProviders().filter((p) => configured.has(p.id) && typeof p.fetchCatalog === 'function');
+    // Bare-name index of what's already in the map (from the primary upstream)
+    const byBareName = new Map();
+    for (const id of existingIds) {
+        const bare = bareModelName(id);
+        if (!byBareName.has(bare))
+            byBareName.set(bare, id);
+    }
+    await Promise.all(providers.map(async (provider) => {
+        const catalog = await provider.fetchCatalog();
+        if (!catalog)
+            return;
+        for (const entry of catalog) {
+            const rawId = typeof entry.id === 'string' ? entry.id : '';
+            if (!rawId)
+                continue;
+            const bare = bareModelName(rawId);
+            const existingId = byBareName.get(bare);
+            if (existingId) {
+                // Same model served by both providers → alias it onto the existing
+                // entry so either id routes to the full serving key pool.
+                const entryRec = map[existingId];
+                const aliases = Array.isArray(entryRec?.aliases)
+                    ? entryRec.aliases
+                    : [];
+                if (!aliases.includes(rawId))
+                    aliases.push(rawId);
+                entryRec.aliases = aliases;
+                continue;
+            }
+            if (provider.modelAffinity(rawId) !== 'yes')
+                continue; // not uniquely claimable
+            const suffixedId = `${rawId}${PROVIDER_MODEL_SUFFIX}${provider.id}`;
+            if (existingIds.has(suffixedId))
+                continue;
+            existingIds.add(suffixedId);
+            byBareName.set(bare, suffixedId);
+            map[suffixedId] = providerCatalogToCanonical(suffixedId, entry, countServingKeys(config, bare, provider.id));
+        }
+    }));
+}
 /**
  * Build the canonical model map (id → opencode-shaped entry).
  *
  * Live path (config provided, not offline): fetch upstream model IDs and
- * enrich each with models.dev metadata via buildMinimalStub. Falls back to
- * the bundled models.json when the upstream fetch yields nothing.
+ * enrich each with models.dev metadata via buildMinimalStub, then append
+ * provider-specific catalog models (@commandcode etc.). Falls back to the
+ * bundled models.json when the upstream fetch yields nothing.
  * Offline path (or no config): bundled models.json only.
  */
 export async function buildCanonicalModels(config, opts) {
@@ -71,8 +246,23 @@ export async function buildCanonicalModels(config, opts) {
     const meta = await fetchModelsDevMetadata();
     if (ids && ids.length > 0) {
         const map = {};
+        const seen = new Set();
         for (const id of ids) {
             map[id] = buildMinimalStub(id, meta ?? undefined);
+            seen.add(id);
+        }
+        await appendProviderCatalogModels(map, seen, config);
+        // Rotation-width annotation on the primary (opencode-go) entries:
+        // "DeepSeek V4 Flash (3)" = 3 keys can serve this model.
+        for (const [id, entry] of Object.entries(map)) {
+            if (id.includes(PROVIDER_MODEL_SUFFIX))
+                continue;
+            if (entry && typeof entry === 'object' && !Array.isArray(entry)) {
+                const rec = entry;
+                if (typeof rec.name === 'string') {
+                    rec.name = annotateName(rec.name, countServingKeys(config, bareModelName(id), 'opencode-go'));
+                }
+            }
         }
         return map;
     }

package/dist/cli/harness-models.js.map

@@ -1 +1 @@
-{"version":3,"file":"harness-models.js","sourceRoot":"","sources":["../../src/cli/harness-models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"harness-models.js","sourceRoot":"","sources":["../../src/cli/harness-models.ts"],"names":[],"mappings":"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"}

package/dist/cli/harness-sync.d.ts

@@ -9,7 +9,7 @@
  */
 import type { ProxyConfig } from '../config.js';
 import { type OpencodeConfigResult } from './opencode-config.js';
-export type HarnessId = 'opencode' | 'pi' | 'omp';
+export type HarnessId = 'opencode' | 'pi' | 'omp' | 'dsh';
 export interface HarnessSyncResult {
     harness: HarnessId;
     result: OpencodeConfigResult;
@@ -28,19 +28,36 @@ export declare function getHarnessSettingsPath(): string;
 export declare function readHarnessSettings(): HarnessId[];
 /** Write the enabled harness ids (replaces any previous selection). */
 export declare function writeHarnessSettings(ids: HarnessId[]): void;
-/** Map CLI harness-name args to canonical ids; unknown names land in errors. */
-export declare function parseHarnessArgs(args: string[]): {
-    ids: HarnessId[];
+export interface HarnessCommandArgs {
+    add: HarnessId[];
+    remove: HarnessId[];
+    clear: boolean;
     errors: string[];
-};
+}
+/**
+ * Parse `configharness` CLI args into an add/remove/clear operation.
+ *
+ * Harness names before `--remove` are added to the selection, names after it
+ * are removed; `--clear` alone empties the selection. Unknown names land in
+ * `errors` (the caller reports them and exits non-zero).
+ */
+export declare function parseHarnessCommandArgs(args: string[]): HarnessCommandArgs;
+/**
+ * Apply an add/remove/clear operation to the harness selection.
+ *
+ * Additive by design: names are merged into the current selection, so
+ * `configharness omp` followed by `configharness pi` enables both. A missing
+ * settings file starts from an empty selection on the first explicit command
+ * (the implicit opencode default only applies while nothing is configured).
+ *
+ * @returns the resulting selection after the write.
+ */
+export declare function updateHarnessSettings(op: Omit<HarnessCommandArgs, 'errors'>): HarnessId[];
 /**
  * Sync models to every enabled harness (opt-in via the settings file).
  *
  * @param config — Proxy config; required for the live (upstream) opencode
- *   sync. When undefined, opencode falls back to the bundled fast-path.
- * @param opts.offline — Skip network: use bundled models.json everywhere.
+ *   sync. When undefined, harnesses fall back to the bundled model list.
  * @returns One result per enabled harness, in the order opencode, pi, omp.
  */
-export declare function syncModelsInAllHarnesses(config?: ProxyConfig, opts?: {
-    offline?: boolean;
-}): Promise<HarnessSyncResult[]>;
+export declare function syncModelsInAllHarnesses(config?: ProxyConfig): Promise<HarnessSyncResult[]>;

package/dist/cli/harness-sync.js

@@ -14,8 +14,9 @@ import { syncModelsToOpencodeConfig } from './opencode-config.js';
 import { syncOpencodeModelsWithUpstream } from '../models-sync.js';
 import { syncModelsToPiConfig } from './pi-config.js';
 import { syncModelsToOmpConfig } from './omp-config.js';
+import { syncModelsToDshConfig } from './dsh-config.js';
 import { buildCanonicalModels } from './harness-models.js';
-const VALID_HARNESS_IDS = ['opencode', 'pi', 'omp'];
+const VALID_HARNESS_IDS = ['opencode', 'pi', 'omp', 'dsh'];
 /** Path to the harness-selection setting: ~/.config/saros/harnesses.json */
 export function getHarnessSettingsPath() {
     return join(homedir(), '.config', 'saros', 'harnesses.json');
@@ -55,46 +56,96 @@ const HARNESS_ALIASES = {
     pi: 'pi',
     oc: 'opencode',
     opencode: 'opencode',
+    dsh: 'dsh',
+    deepseek: 'dsh',
 };
-/** Map CLI harness-name args to canonical ids; unknown names land in errors. */
-export function parseHarnessArgs(args) {
-    const ids = [];
+/**
+ * Parse `configharness` CLI args into an add/remove/clear operation.
+ *
+ * Harness names before `--remove` are added to the selection, names after it
+ * are removed; `--clear` alone empties the selection. Unknown names land in
+ * `errors` (the caller reports them and exits non-zero).
+ */
+export function parseHarnessCommandArgs(args) {
+    const add = [];
+    const remove = [];
     const errors = [];
+    let clear = false;
+    let removing = false;
     for (const arg of args) {
-        const mapped = HARNESS_ALIASES[arg.toLowerCase()];
-        if (mapped) {
-            if (!ids.includes(mapped))
-                ids.push(mapped);
+        if (arg === '--clear') {
+            clear = true;
+            continue;
         }
-        else {
+        if (arg === '--remove') {
+            removing = true;
+            continue;
+        }
+        const mapped = HARNESS_ALIASES[arg.toLowerCase()];
+        if (!mapped) {
             errors.push(arg);
+            continue;
         }
+        const target = removing ? remove : add;
+        if (!target.includes(mapped))
+            target.push(mapped);
     }
-    return { ids, errors };
+    return { add, remove, clear, errors };
+}
+/**
+ * Apply an add/remove/clear operation to the harness selection.
+ *
+ * Additive by design: names are merged into the current selection, so
+ * `configharness omp` followed by `configharness pi` enables both. A missing
+ * settings file starts from an empty selection on the first explicit command
+ * (the implicit opencode default only applies while nothing is configured).
+ *
+ * @returns the resulting selection after the write.
+ */
+export function updateHarnessSettings(op) {
+    if (op.clear) {
+        writeHarnessSettings([]);
+        return [];
+    }
+    const fileExists = existsSync(getHarnessSettingsPath());
+    if (!fileExists && op.add.length === 0) {
+        // Nothing configured yet and nothing to add — keep the implicit
+        // opencode default instead of writing an explicit empty list.
+        return readHarnessSettings();
+    }
+    const base = fileExists ? readHarnessSettings() : [];
+    const next = base.filter((id) => !op.remove.includes(id));
+    for (const id of op.add) {
+        if (!next.includes(id))
+            next.push(id);
+    }
+    writeHarnessSettings(next);
+    return next;
 }
 /**
  * Sync models to every enabled harness (opt-in via the settings file).
  *
  * @param config — Proxy config; required for the live (upstream) opencode
- *   sync. When undefined, opencode falls back to the bundled fast-path.
- * @param opts.offline — Skip network: use bundled models.json everywhere.
+ *   sync. When undefined, harnesses fall back to the bundled model list.
  * @returns One result per enabled harness, in the order opencode, pi, omp.
  */
-export async function syncModelsInAllHarnesses(config, opts = {}) {
+export async function syncModelsInAllHarnesses(config) {
     const enabled = readHarnessSettings();
     if (enabled.length === 0)
         return [];
     const results = [];
     if (enabled.includes('opencode')) {
-        if (opts.offline || !config) {
+        if (!config) {
             results.push({ harness: 'opencode', result: syncModelsToOpencodeConfig() });
         }
         else {
             results.push({ harness: 'opencode', result: await syncOpencodeModelsWithUpstream(config) });
         }
     }
-    if (enabled.includes('pi') || enabled.includes('omp')) {
-        const modelsMap = await buildCanonicalModels(config, opts);
+    if (enabled.includes('pi') ||
+        enabled.includes('omp') ||
+        enabled.includes('dsh')) {
+        const modelsMap = await buildCanonicalModels(config);
         const port = config?.port ?? 3000;
         if (enabled.includes('pi')) {
             results.push({ harness: 'pi', result: syncModelsToPiConfig(modelsMap, port) });
@@ -102,6 +153,9 @@ export async function syncModelsInAllHarnesses(config, opts = {}) {
         if (enabled.includes('omp')) {
             results.push({ harness: 'omp', result: syncModelsToOmpConfig(modelsMap, port) });
         }
+        if (enabled.includes('dsh')) {
+            results.push({ harness: 'dsh', result: syncModelsToDshConfig(modelsMap, port) });
+        }
     }
     return results;
 }