@atomic-chat/core 0.20.7 → 0.21.1

package/dist/integrations/configure/copilot.d.ts

@@ -1,10 +1,33 @@
 /**
- * GitHub Copilot CLI has no provider config file — it reads its BYOK settings from the environment
- * at launch — so configuring it means persisting `COPILOT_*` to the shell rc (Windows: `setx`).
- * `COPILOT_OFFLINE` is on so no GitHub sign-in is required and traffic stays on the local provider.
+ * GitHub Copilot CLI — an `atomic-chat` provider and its model in Copilot's `providers.json`.
+ * Twin of `copilot_config.rs` in the app.
  *
- * Copilot is the one agent that OMITS the key variable entirely when there is none, rather than
- * writing an `atomic` placeholder: an empty `COPILOT_PROVIDER_API_KEY` would be sent as a credential.
+ * Earlier releases persisted `COPILOT_PROVIDER_*`, `COPILOT_MODEL` and `COPILOT_OFFLINE=true`
+ * user-wide (a marked block in the shell rc, `setx` on Windows), which put every `copilot` the user
+ * ran on the local server — and a `providers.json` with any provider in it overrides those
+ * variables anyway. The file is Copilot's documented home for named providers, holds the window
+ * limits the variables could not, and lists the model beside the user's own; `launch` selects it for
+ * the run through `COPILOT_MODEL=atomic-chat/<model>` (catalog `childEnv`), which Copilot reads like
+ * `--model`. Our entries are replaced in place; every other provider and model is kept.
+ *
+ * Copilot reads `apiKey` literally (no variable references), so a keyed server's key is written into
+ * the owner-only file, and a keyless one gets no key at all, as Copilot allows for a local server.
+ *
+ * Connect also removes exactly the rc blocks an earlier release wrote: a block must open and close
+ * with our marker and hold only `export COPILOT_…` and blank lines, or the file stays as it is. The
+ * Windows variables are removed by the desktop app.
  */
 import type { ConfigureWriter } from './registry.js';
+/** Our provider's `name`; Copilot addresses the model as `atomic-chat/<model id>`. */
+export declare const COPILOT_PROVIDER_NAME = "atomic-chat";
+/**
+ * `providers.json` where Copilot reads it: `$COPILOT_PROVIDERS_CONFIG`, else
+ * `$COPILOT_HOME/providers.json`, else `~/.copilot/providers.json`.
+ */
+export declare function copilotProvidersPath(env: NodeJS.ProcessEnv, home: string): string;
+/**
+ * `text` without the blocks an earlier release wrote, or `undefined` when there is nothing it can
+ * vouch for.
+ */
+export declare function stripLegacyCopilotBlock(text: string): string | undefined;
 export declare const configureCopilot: ConfigureWriter;

package/dist/integrations/configure/copilot.js

@@ -1,14 +1,130 @@
 /**
- * GitHub Copilot CLI has no provider config file — it reads its BYOK settings from the environment
- * at launch — so configuring it means persisting `COPILOT_*` to the shell rc (Windows: `setx`).
- * `COPILOT_OFFLINE` is on so no GitHub sign-in is required and traffic stays on the local provider.
+ * GitHub Copilot CLI — an `atomic-chat` provider and its model in Copilot's `providers.json`.
+ * Twin of `copilot_config.rs` in the app.
  *
- * Copilot is the one agent that OMITS the key variable entirely when there is none, rather than
- * writing an `atomic` placeholder: an empty `COPILOT_PROVIDER_API_KEY` would be sent as a credential.
+ * Earlier releases persisted `COPILOT_PROVIDER_*`, `COPILOT_MODEL` and `COPILOT_OFFLINE=true`
+ * user-wide (a marked block in the shell rc, `setx` on Windows), which put every `copilot` the user
+ * ran on the local server — and a `providers.json` with any provider in it overrides those
+ * variables anyway. The file is Copilot's documented home for named providers, holds the window
+ * limits the variables could not, and lists the model beside the user's own; `launch` selects it for
+ * the run through `COPILOT_MODEL=atomic-chat/<model>` (catalog `childEnv`), which Copilot reads like
+ * `--model`. Our entries are replaced in place; every other provider and model is kept.
+ *
+ * Copilot reads `apiKey` literally (no variable references), so a keyed server's key is written into
+ * the owner-only file, and a keyless one gets no key at all, as Copilot allows for a local server.
+ *
+ * Connect also removes exactly the rc blocks an earlier release wrote: a block must open and close
+ * with our marker and hold only `export COPILOT_…` and blank lines, or the file stays as it is. The
+ * Windows variables are removed by the desktop app.
  */
+import { AtomicCoreError } from '../../contracts/index.js';
+import { canonicalJson, expandTilde, parseJsonStrict } from '../config-io.js';
+import { knownWindow, outputCap } from './backup.js';
+import { asJsonObject } from './json-tree.js';
 import { registerWriter } from './registry.js';
-import { configureEnvAgent } from './env-agent.js';
-const MARKER = '# Atomic Chat - Copilot CLI Config';
-export const configureCopilot = (input) => configureEnvAgent(input, { agentId: 'copilot', marker: MARKER, prefix: 'COPILOT_' });
+/** Our provider's `name`; Copilot addresses the model as `atomic-chat/<model id>`. */
+export const COPILOT_PROVIDER_NAME = 'atomic-chat';
+const LEGACY_MARKER = '# Atomic Chat - Copilot CLI Config';
+/** Every rc file an earlier release could have written to. */
+const LEGACY_RC_FILES = ['.zshenv', '.bash_profile', '.bashrc'];
+/**
+ * `providers.json` where Copilot reads it: `$COPILOT_PROVIDERS_CONFIG`, else
+ * `$COPILOT_HOME/providers.json`, else `~/.copilot/providers.json`.
+ */
+export function copilotProvidersPath(env, home) {
+    const value = (name) => {
+        const raw = env[name]?.trim();
+        return raw ? expandTilde(raw, home) : undefined;
+    };
+    return value('COPILOT_PROVIDERS_CONFIG') ?? `${value('COPILOT_HOME') ?? '.copilot'}/providers.json`;
+}
+const named = (entry, field) => asJsonObject(entry)?.[field] === COPILOT_PROVIDER_NAME;
+/** `root[key]` as a list, created when absent or null (Copilot reads both as empty). */
+function list(root, key, path) {
+    const value = root[key];
+    if (value === undefined || value === null)
+        root[key] = [];
+    const out = root[key];
+    if (!Array.isArray(out)) {
+        throw new AtomicCoreError('IO_ERROR', `\`${key}\` in ${path} is not a list. Fix or remove it and try again.`);
+    }
+    return out;
+}
+/**
+ * `text` without the blocks an earlier release wrote, or `undefined` when there is nothing it can
+ * vouch for.
+ */
+export function stripLegacyCopilotBlock(text) {
+    const isMarker = (line) => line.replace(/[\r\n]+$/, '') === LEGACY_MARKER;
+    const lines = text.split(/(?<=\n)/);
+    if (!lines.some(isMarker))
+        return undefined;
+    const kept = [];
+    let open = false;
+    for (const line of lines) {
+        if (isMarker(line)) {
+            open = !open;
+            continue;
+        }
+        if (open) {
+            const bare = line.replace(/[\r\n]+$/, '');
+            if (bare.trim() !== '' && !bare.startsWith('export COPILOT_'))
+                return undefined;
+            continue;
+        }
+        kept.push(line);
+    }
+    return open ? undefined : kept.join('');
+}
+export const configureCopilot = async ({ apiUrl, model, apiKey, fs, env, platform, contextLength, }) => {
+    const path = copilotProvidersPath(env, fs.home);
+    const text = await fs.read(path);
+    const root = asJsonObject(text === undefined ? {} : parseJsonStrict(text, fs.absolute(path)));
+    if (!root)
+        throw new AtomicCoreError('IO_ERROR', `${fs.absolute(path)} is not a JSON object`);
+    const providers = list(root, 'providers', fs.absolute(path));
+    const provider = {
+        name: COPILOT_PROVIDER_NAME,
+        type: 'openai',
+        baseUrl: apiUrl,
+        ...(apiKey ? { apiKey } : {}),
+    };
+    const at = providers.findIndex((p) => named(p, 'name'));
+    if (at >= 0) {
+        providers[at] = provider;
+        root['providers'] = providers.filter((p, i) => i <= at || !named(p, 'name'));
+    }
+    else {
+        providers.push(provider);
+    }
+    const models = list(root, 'models', fs.absolute(path));
+    const first = models.findIndex((m) => named(m, 'provider'));
+    const others = models.filter((m) => !named(m, 'provider'));
+    // A known window becomes Copilot's limits: the reply capped at a quarter of it (8192 at most) and
+    // the prompt given the rest. Unknown, Copilot assumes 128K for a model it does not know.
+    const window = knownWindow(contextLength);
+    const ours = {
+        id: model,
+        provider: COPILOT_PROVIDER_NAME,
+        ...(window !== undefined
+            ? {
+                maxContextWindowTokens: window,
+                maxPromptTokens: window - outputCap(window),
+                maxOutputTokens: outputCap(window),
+            }
+            : {}),
+    };
+    others.splice(first >= 0 ? Math.min(first, others.length) : others.length, 0, ours);
+    root['models'] = others;
+    // Plain text keys, the user's own among them.
+    await fs.write(path, canonicalJson(root), platform === 'win32' ? {} : { mode: 0o600 });
+    for (const rc of LEGACY_RC_FILES) {
+        const existing = await fs.read(rc);
+        const stripped = existing === undefined ? undefined : stripLegacyCopilotBlock(existing);
+        // Written through a symbolic link (dotfile managers link rc files), never over it.
+        if (stripped !== undefined)
+            await fs.write(await fs.linkTarget(rc), stripped);
+    }
+};
 registerWriter('copilot', configureCopilot);
 //# sourceMappingURL=copilot.js.map

package/dist/integrations/configure/copilot.js.map

@@ -1 +1 @@
-{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../../src/integrations/configure/copilot.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElD,MAAM,MAAM,GAAG,oCAAoC,CAAA;AAEnD,MAAM,CAAC,MAAM,gBAAgB,GAAoB,CAAC,KAAK,EAAE,EAAE,CACzD,iBAAiB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;AAEtF,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA"}
+{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../../src/integrations/configure/copilot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC7E,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,sFAAsF;AACtF,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAA;AAClD,MAAM,aAAa,GAAG,oCAAoC,CAAA;AAC1D,8DAA8D;AAC9D,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;AAE/D;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAsB,EAAE,IAAY;IACvE,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;QAC7B,OAAO,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACjD,CAAC,CAAA;IACD,OAAO,KAAK,CAAC,0BAA0B,CAAC,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,UAAU,iBAAiB,CAAA;AACrG,CAAC;AAED,MAAM,KAAK,GAAG,CAAC,KAA4B,EAAE,KAAa,EAAW,EAAE,CACrE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,qBAAqB,CAAA;AAExD,wFAAwF;AACxF,SAAS,IAAI,CAAC,IAAgB,EAAE,GAAW,EAAE,IAAY;IACvD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IACvB,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;IACzD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,UAAU,EACV,KAAK,GAAG,SAAS,IAAI,iDAAiD,CACvE,CAAA;IACH,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAY;IAClD,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,KAAK,aAAa,CAAA;IACjF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAA;IAC3C,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,IAAI,IAAI,GAAG,KAAK,CAAA;IAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACnB,IAAI,GAAG,CAAC,IAAI,CAAA;YACZ,SAAQ;QACV,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;YACzC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC;gBAAE,OAAO,SAAS,CAAA;YAC/E,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;IACD,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAoB,KAAK,EAAE,EACtD,MAAM,EACN,KAAK,EACL,MAAM,EACN,EAAE,EACF,GAAG,EACH,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;IAC/C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC7F,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,eAAe,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;IAE7F,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5D,MAAM,QAAQ,GAAe;QAC3B,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,MAAM;QACf,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9B,CAAA;IACD,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACvD,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACZ,SAAS,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IAC9E,CAAC;SAAM,CAAC;QACN,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC1B,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IACtD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;IAC3D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;IAC1D,kGAAkG;IAClG,yFAAyF;IACzF,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,CAAC,CAAA;IACzC,MAAM,IAAI,GAAe;QACvB,EAAE,EAAE,KAAK;QACT,QAAQ,EAAE,qBAAqB;QAC/B,GAAG,CAAC,MAAM,KAAK,SAAS;YACtB,CAAC,CAAC;gBACE,sBAAsB,EAAE,MAAM;gBAC9B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;gBAC3C,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC;aACnC;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAA;IACD,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;IACnF,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAA;IAEvB,8CAA8C;IAC9C,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IAEtF,KAAK,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAClC,MAAM,QAAQ,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAA;QACvF,mFAAmF;QACnF,IAAI,QAAQ,KAAK,SAAS;YAAE,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC/E,CAAC;AACH,CAAC,CAAA;AAED,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA"}

package/dist/integrations/configure/droid.d.ts

@@ -1,12 +1,18 @@
 /**
- * Factory Droid keeps its BYOK providers in `~/.factory/settings.json` as a `customModels` array,
- * and selects one with a top-level `model` string.
+ * Factory Droid keeps its BYOK providers in `~/.factory/settings.json` as a `customModels` array.
+ * Twin of `droid_config.rs` in the app.
  *
- * The selector is the awkward part: Droid addresses a custom model by its POSITION in the array
- * (`custom:<displayName with spaces->dashes>-<index>`), not by name. So the value we write depends
- * on where our entry lands — seeding other models first shifts it. We upsert by `displayName`
- * (our managed marker) precisely so a rerun replaces our entry in place and the selector stays valid
- * instead of appending a duplicate and renumbering the user's models.
+ * Droid addresses a custom model by its `id`, `custom:<displayName with dashes>-<n>`; our entry
+ * carries `id` and `index` explicitly so the selector cannot drift when other entries move, and we
+ * upsert by `displayName` (our managed marker) so a rerun replaces it in place. The default for new
+ * sessions lives in `sessionDefaultSettings.model`: Droid moves a legacy top-level `model` there only
+ * when that key is empty, so the top-level value earlier releases wrote lost to any default the user
+ * had. That one is removed; the default the user had before is kept in the backup sidecar for the
+ * desktop's Disconnect.
+ *
+ * A known served window caps the reply at a quarter of it (8192 at most) and gives Droid the rest
+ * as `maxContextLimit`; an unknown one writes neither, where earlier releases claimed 16384 output
+ * tokens — the whole of a 16K window.
  */
 import type { ConfigureWriter } from './registry.js';
 export declare const configureDroid: ConfigureWriter;

package/dist/integrations/configure/droid.js

@@ -1,47 +1,78 @@
 /**
- * Factory Droid keeps its BYOK providers in `~/.factory/settings.json` as a `customModels` array,
- * and selects one with a top-level `model` string.
+ * Factory Droid keeps its BYOK providers in `~/.factory/settings.json` as a `customModels` array.
+ * Twin of `droid_config.rs` in the app.
  *
- * The selector is the awkward part: Droid addresses a custom model by its POSITION in the array
- * (`custom:<displayName with spaces->dashes>-<index>`), not by name. So the value we write depends
- * on where our entry lands — seeding other models first shifts it. We upsert by `displayName`
- * (our managed marker) precisely so a rerun replaces our entry in place and the selector stays valid
- * instead of appending a duplicate and renumbering the user's models.
+ * Droid addresses a custom model by its `id`, `custom:<displayName with dashes>-<n>`; our entry
+ * carries `id` and `index` explicitly so the selector cannot drift when other entries move, and we
+ * upsert by `displayName` (our managed marker) so a rerun replaces it in place. The default for new
+ * sessions lives in `sessionDefaultSettings.model`: Droid moves a legacy top-level `model` there only
+ * when that key is empty, so the top-level value earlier releases wrote lost to any default the user
+ * had. That one is removed; the default the user had before is kept in the backup sidecar for the
+ * desktop's Disconnect.
+ *
+ * A known served window caps the reply at a quarter of it (8192 at most) and gives Droid the rest
+ * as `maxContextLimit`; an unknown one writes neither, where earlier releases claimed 16384 output
+ * tokens — the whole of a 16K window.
  */
 import { AtomicCoreError } from '../../contracts/index.js';
 import { canonicalJson, keyOr, parseJsonStrict } from '../config-io.js';
+import { knownWindow, outputCap, readSidecar, sameJson, writeSidecar } from './backup.js';
 import { asJsonArray, asJsonObject } from './json-tree.js';
 import { registerWriter } from './registry.js';
 const DISPLAY_NAME = 'Atomic Chat';
+/** `custom:` + the display name with whitespace runs turned into dashes. */
+const SELECTOR_PREFIX = 'custom:Atomic-Chat-';
 const SETTINGS_PATH = '.factory/settings.json';
-/** Droid's own ceiling for a generic chat-completions provider; lower values truncate long edits. */
-const MAX_OUTPUT_TOKENS = 16_384;
-export const configureDroid = async ({ apiUrl, model, apiKey, fs }) => {
+const SESSION_DEFAULTS = 'sessionDefaultSettings';
+const isOurSelector = (value) => typeof value === 'string' && value.startsWith(SELECTOR_PREFIX);
+export const configureDroid = async ({ apiUrl, model, apiKey, fs, platform, contextLength, }) => {
     const text = await fs.read(SETTINGS_PATH);
     const parsed = text === undefined ? {} : parseJsonStrict(text, fs.absolute(SETTINGS_PATH));
     const root = asJsonObject(parsed);
     if (!root)
         throw new AtomicCoreError('IO_ERROR', 'settings.json is not a JSON object');
+    // What the desktop's Disconnect puts back: the default before the first Connect, kept across
+    // reconnects while the file still has ours.
+    const currentDefault = asJsonObject(root[SESSION_DEFAULTS])?.['model'];
+    const backup = await readSidecar(fs, SETTINGS_PATH);
+    const previous = backup !== undefined &&
+        currentDefault !== undefined &&
+        sameJson(asJsonObject(backup['written'])?.['defaultModel'], currentDefault)
+        ? (backup['previous'] ?? null)
+        : {
+            defaultModel: currentDefault ?? null,
+            sessionDefaultSettings: Object.hasOwn(root, SESSION_DEFAULTS),
+        };
     // A `customModels` that is not an array is unusable to Droid anyway, so it is replaced rather than
     // preserved — unlike the individual entries inside it, which are the user's own providers.
     const models = asJsonArray(root['customModels']) ?? [];
+    const found = models.findIndex((m) => asJsonObject(m)?.['displayName'] === DISPLAY_NAME);
+    const index = found >= 0 ? found : models.length;
+    const selector = `${SELECTOR_PREFIX}${index}`;
+    const window = knownWindow(contextLength);
     const entry = {
         model,
+        id: selector,
+        index,
         displayName: DISPLAY_NAME,
         baseUrl: apiUrl,
         // Droid rejects an empty apiKey outright, so a keyless local server still needs a placeholder.
         apiKey: keyOr(apiKey, 'atomic'),
         provider: 'generic-chat-completion-api',
-        maxOutputTokens: MAX_OUTPUT_TOKENS,
+        ...(window !== undefined
+            ? { maxOutputTokens: outputCap(window), maxContextLimit: window - outputCap(window) }
+            : {}),
     };
-    let index = models.findIndex((m) => asJsonObject(m)?.['displayName'] === DISPLAY_NAME);
-    if (index >= 0)
-        models[index] = entry;
-    else
-        index = models.push(entry) - 1;
+    models[index] = entry;
     root['customModels'] = models;
-    root['model'] = `custom:${DISPLAY_NAME.split(' ').join('-')}-${index}`;
+    // Earlier releases selected us through the legacy top-level key.
+    if (isOurSelector(root['model']))
+        delete root['model'];
+    const defaults = asJsonObject(root[SESSION_DEFAULTS]) ?? {};
+    defaults['model'] = selector;
+    root[SESSION_DEFAULTS] = defaults;
     await fs.write(SETTINGS_PATH, canonicalJson(root));
+    await writeSidecar(fs, SETTINGS_PATH, { previous, written: { defaultModel: selector } }, platform);
 };
 registerWriter('droid', configureDroid);
 //# sourceMappingURL=droid.js.map

package/dist/integrations/configure/droid.js.map

@@ -1 +1 @@
-{"version":3,"file":"droid.js","sourceRoot":"","sources":["../../../src/integrations/configure/droid.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEvE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,YAAY,GAAG,aAAa,CAAA;AAClC,MAAM,aAAa,GAAG,wBAAwB,CAAA;AAC9C,qGAAqG;AACrG,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEhC,MAAM,CAAC,MAAM,cAAc,GAAoB,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE;IACrF,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAA;IAC1F,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;IACjC,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,eAAe,CAAC,UAAU,EAAE,oCAAoC,CAAC,CAAA;IAEtF,mGAAmG;IACnG,2FAA2F;IAC3F,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAA;IACtD,MAAM,KAAK,GAAe;QACxB,KAAK;QACL,WAAW,EAAE,YAAY;QACzB,OAAO,EAAE,MAAM;QACf,+FAA+F;QAC/F,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC;QAC/B,QAAQ,EAAE,6BAA6B;QACvC,eAAe,EAAE,iBAAiB;KACnC,CAAA;IAED,IAAI,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,YAAY,CAAC,CAAA;IACtF,IAAI,KAAK,IAAI,CAAC;QAAE,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAA;;QAChC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEnC,IAAI,CAAC,cAAc,CAAC,GAAG,MAAM,CAAA;IAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,UAAU,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,EAAE,CAAA;IAEtE,MAAM,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;AACpD,CAAC,CAAA;AAED,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA"}
+{"version":3,"file":"droid.js","sourceRoot":"","sources":["../../../src/integrations/configure/droid.ts"],"names":[],"mappings":"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"}

package/dist/integrations/configure/dsh.d.ts

@@ -1,33 +1,49 @@
 /**
- * DeepSeek Harness (`dsh`) reads `$DSH_HOME/settings.yaml` (default `~/.dsh`) live, so pointing it at
- * the local server is a single upsert of the `llm-pi-ai.providers.atomic` route — no restart needed.
+ * DeepSeek Harness (`dsh`). Twin of `configure_dsh_at` in the app's `commands.rs` and `dsh_config.rs`.
  *
- * This is the only writer here that refuses its input, and the reason is blast radius: dsh rejects
- * the ENTIRE `llm-pi-ai` section when one route in it is invalid, taking the user's other providers
- * down with it. A route needs `api`, `baseURL` and a non-empty `models` list, so a blank URL or model
- * is refused before the tree is touched at all. The credential is validated for the same reason: an
- * unquoted dotenv value ends at whitespace or `#`, and a newline would inject a second assignment, so
- * a key carrying any of those is rejected — with a message that names the variable and never the
- * value, so a rejected key cannot leak into a log or a toast.
+ * dsh 0.2 dropped the live `$DSH_HOME/settings.yaml` (default `~/.dsh`): settings now live in the
+ * active profile's `cordis.patch.yml`, a YAML list of entry overrides (`- id: llm-pi-ai` /
+ * `config: …`), and a leftover `settings.yaml` is merged into that profile once and renamed
+ * `settings.yaml.imported`. `dsh web`, which `launch` runs, boots the `web` profile, so the `atomic`
+ * route goes under its `llm-pi-ai` row's `providers` and its `agent-default-model` row is set to it,
+ * so new sessions open on the local model instead of DeepSeek's. dsh picks both up without a restart.
  *
- * Two more things are load-bearing. The route is replaced WHOLESALE rather than deep-merged: a merge
- * would let a stale `apiKeyEnv` from an earlier keyed run survive a keyless run and break every
- * request with MISSING_CREDENTIAL. And because the YAML round trip drops comments and expands
- * anchors, the pre-existing file is copied to `settings.yaml.atomic-backup` — once, so a later run
- * cannot overwrite the true pre-Atomic state with our own generated output.
+ * The profile patch is the user's (dsh's Settings page edits it, keeping comments and `!!js`
+ * expressions), so only our two rows are re-serialized; every other row, comment and blank line is
+ * kept byte for byte. A file whose rows cannot be told apart that way is rewritten whole only when
+ * nothing but comments would be lost, and refused when it holds `!!js` expressions. The default the
+ * user had is kept in the backup sidecar for the desktop's Disconnect.
+ *
+ * A `settings.yaml` that is still there is read live by dsh before 0.2 and merged over the profile
+ * by 0.2+, so it gets the route too (and our default, when it names one); one is never created, and
+ * `settings.yaml.imported` is never touched.
+ *
+ * This writer refuses its input when it would do harm: dsh rejects the ENTIRE `llm-pi-ai` section
+ * when one route in it is invalid, taking the user's other providers down with it. A route needs
+ * `api`, `baseURL` and a non-empty `models` list, so a blank URL or model is refused before anything
+ * is touched. The credential is validated for the same reason: an unquoted dotenv value ends at
+ * whitespace or `#`, and a newline would inject a second assignment, so a key carrying any of those
+ * is rejected — with a message that names the variable and never the value. The route is replaced
+ * WHOLESALE rather than deep-merged: a merge would let a stale `apiKeyEnv` from an earlier keyed run
+ * survive a keyless run and break every request with MISSING_CREDENTIAL.
  */
 import type { ConfigureWriter } from './registry.js';
 type YamlMapping = Record<string, unknown>;
 /** Reject a value no dotenv line can carry. The message names the variable, never the value. */
 export declare function dshValidateEnvValue(name: string, value: string): void;
-/** The `llm-pi-ai.providers.atomic` node. Keyless omits `apiKeyEnv` rather than writing an empty one. */
-export declare function dshRouteNode(apiUrl: string, model: string, withKey: boolean): YamlMapping;
 /**
- * Upsert our route into an already-parsed tree. Pure: no I/O, no environment. Everything outside
- * `llm-pi-ai.providers.atomic` is preserved, including relative order — assigning to an existing key
- * keeps its position, in JavaScript as in `serde_yaml`'s insertion-ordered mapping.
+ * The `atomic` route node. Keyless omits `apiKeyEnv` rather than writing an empty one. A model the
+ * pi-ai catalog does not ship falls back to a 262144 window and 32768 output tokens; a known served
+ * window is declared instead, with a reply of a quarter of it (8192 at most).
+ */
+export declare function dshRouteNode(apiUrl: string, model: string, withKey: boolean, contextLength?: number): YamlMapping;
+/**
+ * Upsert our route into an already-parsed legacy `settings.yaml` tree. Pure: no I/O, no environment.
+ * Everything outside `llm-pi-ai.providers.atomic` is preserved, including relative order.
  */
-export declare function applyDshProvider(root: unknown, apiUrl: string, model: string, withKey: boolean): unknown;
+export declare function applyDshProvider(root: unknown, apiUrl: string, model: string, withKey: boolean, contextLength?: number): unknown;
+/** A YAML tag such as `!!js`, which a re-serialization would drop. */
+export declare function hasYamlTag(text: string): boolean;
 /** `$DSH_HOME` when set, else `~/.dsh`. A literal `~` can reach us from a quoted rc-file value. */
 export declare function dshHome(env: NodeJS.ProcessEnv, home: string): string;
 export declare const configureDsh: ConfigureWriter;