@chibitek/chibi 0.1.172 → 0.1.174

package/dist-server/openmausbot.js

@@ -19685,6 +19685,68 @@ var init_provider_accounts = __esm({
         config: {},
         keyUrl: "https://opencode.ai/go",
         signupUrl: "https://opencode.ai/go"
+      },
+      // Permanent free tiers (docs/specs/free-models-in-auto): the last resort
+      // when every subscription and pay-per-use key is out (Erick's rule, a
+      // model or billing error never stops the user). Off by default
+      // (engineTiers.includeFree); never used for client-facing bots.
+      {
+        id: "openrouterFree",
+        kind: "apiKey",
+        label: "OpenRouter (free models)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "OPENROUTER_FREE_API_KEY",
+        icon: "openrouter",
+        config: { url: "https://openrouter.ai/api/v1", apiKeyEnv: "OPENROUTER_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://openrouter.ai/api/v1" },
+        keyUrl: "https://openrouter.ai/keys",
+        signupUrl: "https://openrouter.ai/models?max_price=0"
+      },
+      {
+        id: "googleAiStudioFree",
+        kind: "apiKey",
+        label: "Google AI Studio (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "GOOGLE_AI_STUDIO_FREE_API_KEY",
+        icon: "google",
+        config: { url: "https://generativelanguage.googleapis.com/v1beta/openai", apiKeyEnv: "GOOGLE_AI_STUDIO_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://generativelanguage.googleapis.com/v1beta/openai" },
+        keyUrl: "https://aistudio.google.com/apikey"
+      },
+      {
+        id: "groqFree",
+        kind: "apiKey",
+        label: "Groq (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "GROQ_FREE_API_KEY",
+        config: { url: "https://api.groq.com/openai/v1", apiKeyEnv: "GROQ_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://api.groq.com/openai/v1" },
+        keyUrl: "https://console.groq.com/keys"
+      },
+      {
+        id: "cerebrasFree",
+        kind: "apiKey",
+        label: "Cerebras (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "CEREBRAS_FREE_API_KEY",
+        config: { url: "https://api.cerebras.ai/v1", apiKeyEnv: "CEREBRAS_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://api.cerebras.ai/v1" },
+        keyUrl: "https://cloud.cerebras.ai/platform/apikeys"
+      },
+      {
+        id: "nvidiaFree",
+        kind: "apiKey",
+        label: "NVIDIA NIM (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "NVIDIA_FREE_API_KEY",
+        config: { url: "https://integrate.api.nvidia.com/v1", apiKeyEnv: "NVIDIA_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://integrate.api.nvidia.com/v1" },
+        keyUrl: "https://build.nvidia.com/settings/api-keys"
       }
     ];
   }
@@ -30117,8 +30179,8 @@ var init_claude = __esm({
     DEFAULT_AUTOCOMPACT_TOKENS = 2e5;
     CLAUDE_FLAG_FLOORS = {
       "--strict-mcp-config": [1, 0, 60],
-      "--setting-sources": [1, 0, 122],
-      "--autocompact": [2, 1, 122],
+      "--setting-sources": [1, 0, 125],
+      "--autocompact": [2, 1, 221],
       // 2.1.267 is the first CLI that accepts it; below that the recorded prompt
       // simply is not refreshed, which is the pre-existing behaviour.
       "--system-prompt-snapshot": [2, 1, 267],

package/dist-server/pair-cli.js

@@ -19685,6 +19685,68 @@ var init_provider_accounts = __esm({
         config: {},
         keyUrl: "https://opencode.ai/go",
         signupUrl: "https://opencode.ai/go"
+      },
+      // Permanent free tiers (docs/specs/free-models-in-auto): the last resort
+      // when every subscription and pay-per-use key is out (Erick's rule, a
+      // model or billing error never stops the user). Off by default
+      // (engineTiers.includeFree); never used for client-facing bots.
+      {
+        id: "openrouterFree",
+        kind: "apiKey",
+        label: "OpenRouter (free models)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "OPENROUTER_FREE_API_KEY",
+        icon: "openrouter",
+        config: { url: "https://openrouter.ai/api/v1", apiKeyEnv: "OPENROUTER_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://openrouter.ai/api/v1" },
+        keyUrl: "https://openrouter.ai/keys",
+        signupUrl: "https://openrouter.ai/models?max_price=0"
+      },
+      {
+        id: "googleAiStudioFree",
+        kind: "apiKey",
+        label: "Google AI Studio (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "GOOGLE_AI_STUDIO_FREE_API_KEY",
+        icon: "google",
+        config: { url: "https://generativelanguage.googleapis.com/v1beta/openai", apiKeyEnv: "GOOGLE_AI_STUDIO_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://generativelanguage.googleapis.com/v1beta/openai" },
+        keyUrl: "https://aistudio.google.com/apikey"
+      },
+      {
+        id: "groqFree",
+        kind: "apiKey",
+        label: "Groq (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "GROQ_FREE_API_KEY",
+        config: { url: "https://api.groq.com/openai/v1", apiKeyEnv: "GROQ_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://api.groq.com/openai/v1" },
+        keyUrl: "https://console.groq.com/keys"
+      },
+      {
+        id: "cerebrasFree",
+        kind: "apiKey",
+        label: "Cerebras (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "CEREBRAS_FREE_API_KEY",
+        config: { url: "https://api.cerebras.ai/v1", apiKeyEnv: "CEREBRAS_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://api.cerebras.ai/v1" },
+        keyUrl: "https://cloud.cerebras.ai/platform/apikeys"
+      },
+      {
+        id: "nvidiaFree",
+        kind: "apiKey",
+        label: "NVIDIA NIM (free tier)",
+        billing: "free",
+        driver: "openai-compat",
+        envVar: "NVIDIA_FREE_API_KEY",
+        config: { url: "https://integrate.api.nvidia.com/v1", apiKeyEnv: "NVIDIA_FREE_API_KEY", model: "", provider: "" },
+        keyTest: { provider: "openaiCompat", url: "https://integrate.api.nvidia.com/v1" },
+        keyUrl: "https://build.nvidia.com/settings/api-keys"
       }
     ];
   }
@@ -30117,8 +30179,8 @@ var init_claude = __esm({
     DEFAULT_AUTOCOMPACT_TOKENS = 2e5;
     CLAUDE_FLAG_FLOORS = {
       "--strict-mcp-config": [1, 0, 60],
-      "--setting-sources": [1, 0, 122],
-      "--autocompact": [2, 1, 122],
+      "--setting-sources": [1, 0, 125],
+      "--autocompact": [2, 1, 221],
       // 2.1.267 is the first CLI that accepts it; below that the recorded prompt
       // simply is not refreshed, which is the pre-existing behaviour.
       "--system-prompt-snapshot": [2, 1, 267],

package/dist-server/server/builtin-chibi.js

@@ -10,7 +10,7 @@ export const CHIBI_PROFILE = {
     name: CHIBI_NAME,
     title: "Orchestrator",
     description: "Atomic's built-in orchestrator. Plans the work and delegates it to the team.",
-    soul: "You are Chibi, Chibitek's orchestrator in Atomic. You plan the work, break it into tasks, and delegate: coding goes to the Claude and Codex bots, research to Grok. You use Mochii (the Mochii MCP server) to create, update and track tasks, and Nexus for company context. You do not write code yourself when a teammate can. Keep the person informed in plain language, confirm before anything irreversible, and call work done only after it has been verified.",
+    soul: "You are Chibi, Chibitek's orchestrator in Atomic. You plan the work, break it into tasks, and delegate: coding goes to the Claude and Codex bots, research to Grok. You use Mochii (the Mochii MCP server) to create, update and track tasks, and Nexus for company context. You do not write code yourself when a teammate can. Keep the person informed in plain language, confirm before anything irreversible, and call work done only after it has been verified. Every new feature the person asks for is logged as a Mochii task with the full requirements before or as it is handed to a teammate, and you send the person the task link. When the person approves an addition to an existing feature, add it to that feature's task as a comment.",
     color: CHIEF_OF_STAFF_COLOR,
 };
 export const BUILTIN_CHIBI_REFUSALS = {

package/dist-server/server/dictation.js

@@ -84,6 +84,14 @@ export function checkCleanup(input, output) {
         if (tokens.filter((t) => kept.has(t)).length / tokens.length < 0.6)
             return { ok: false, reason: "overlap" };
     }
+    // a correction swaps a misheard word for the right one; words with nothing
+    // taken out for them were never said
+    const spoken = new Set(contentTokens(input));
+    const written = new Set(contentTokens(cleaned));
+    const added = [...written].filter((t) => !spoken.has(t)).length;
+    const removed = [...spoken].filter((t) => !written.has(t)).length;
+    if (added > removed + 1)
+        return { ok: false, reason: "added" };
     return { ok: true, text: cleaned };
 }
 export async function ask(provider, prompt, timeoutMs) {

package/dist-server/server/drivers/claude.js

@@ -259,12 +259,12 @@ const DEFAULT_AUTOCOMPACT_TOKENS = 200_000;
  *
  * Verified against the published binaries, not the changelog (which never
  * records `--autocompact`): `--strict-mcp-config` is present in 1.0.60 and
- * absent from 1.0.0; `--setting-sources` first appears in 1.0.122 (1.0.120
- * lacks it); `--autocompact` first appears in 2.1.122 (2.1.121 lacks it). */
+ * absent from 1.0.0; `--setting-sources` first appears in 1.0.125 (1.0.124
+ * lacks it); `--autocompact` first appears in 2.1.221 (2.1.220 lacks it). */
 export const CLAUDE_FLAG_FLOORS = {
     "--strict-mcp-config": [1, 0, 60],
-    "--setting-sources": [1, 0, 122],
-    "--autocompact": [2, 1, 122],
+    "--setting-sources": [1, 0, 125],
+    "--autocompact": [2, 1, 221],
     // 2.1.267 is the first CLI that accepts it; below that the recorded prompt
     // simply is not refreshed, which is the pre-existing behaviour.
     "--system-prompt-snapshot": [2, 1, 267],

package/dist-server/server/engine-tiers-view.js

@@ -0,0 +1,49 @@
+// The Settings view of engine tiers (docs/chibitek/engine-tiers.md): every
+// tier's ladder with health and rest, the installed engines, rest history,
+// pay-per-use episodes and the "Include free models in Auto" setting.
+import { BOT_TIERS, DEFAULT_LADDERS, DEFAULT_TIER_CLASSES } from "../shared/engine-tiers.js";
+import { engineHealth, engineTierClasses, engineTierLadders, engineTiersIncludeFree, keyBased, matchesEngine } from "./engine-tiers.js";
+import { perTokenModel } from "./harness-import/engine-policy.js";
+const DRIVER_NAMES = {
+    "atomic-engine": "Atomic Engine", claudeAgent: "Claude", codex: "Codex", cursorAgent: "Cursor", kimiAgent: "Kimi",
+    grokAgent: "Grok", vibeAgent: "Mistral Vibe", antigravityAgent: "Gemini (Antigravity)", qwenAgent: "Qwen (local)", opencodeGo: "OpenCode",
+    hermesAgent: "Hermes", ollamaCloud: "Ollama Cloud", mistral: "Mistral", "openai-compat": "OpenAI-compatible endpoint",
+    appleIntelligence: "Apple Intelligence (on this Mac)",
+};
+/** The Settings view: every tier's ladder with each rung's health and rest,
+ * the installed engines a person may add, and the recent rest history. */
+export function engineTiersView(engineTiers, candidates, rests, defaults = DEFAULT_LADDERS) {
+    const ladders = engineTierLadders(engineTiers, defaults);
+    const classes = engineTierClasses(engineTiers);
+    const restOf = (candidate) => {
+        const rest = rests?.rest(candidate);
+        return rest ? { rest } : {};
+    };
+    const engines = candidates.filter((candidate) => candidate.driverKind !== "boxAgent").map((candidate) => ({
+        instanceId: candidate.instanceId, driverKind: candidate.driverKind, label: candidate.displayName,
+        health: engineHealth(candidate), paid: keyBased(candidate),
+        models: [...new Map([candidate.models.default, ...candidate.models.options.map((option) => option.id)].filter(Boolean).map((id) => {
+                const option = candidate.models.options.find((item) => item.id === id);
+                return [id, { id, label: option?.label || id, paid: perTokenModel(candidate, id) }];
+            })).values()],
+        ...(candidate.models.default ? { defaultModel: candidate.models.default } : {}), ...restOf(candidate),
+    }));
+    const rung = (entry) => {
+        const matching = candidates.filter((candidate) => matchesEngine(entry, candidate));
+        const best = matching.find((candidate) => engineHealth(candidate) === "ready" && !rests?.rest(candidate)) ??
+            matching.find((candidate) => engineHealth(candidate) === "ready") ?? matching[0];
+        const name = best?.displayName ?? DRIVER_NAMES[entry.engine] ?? entry.engine;
+        return { ...entry, label: entry.model ? `${name} (${entry.model})` : name, ...(best ? { instanceId: best.instanceId } : {}),
+            health: best ? engineHealth(best) : "unavailable", paid: best ? keyBased(best) : false, ...(best ? restOf(best) : {}) };
+    };
+    const label = (instanceId) => candidates.find((candidate) => candidate.instanceId === instanceId)?.displayName ?? instanceId;
+    return {
+        tiers: BOT_TIERS.map((tier) => ({ tier, modelClass: classes[tier], classCustom: classes[tier] !== DEFAULT_TIER_CLASSES[tier],
+            ladder: ladders[tier].map(rung), custom: JSON.stringify(ladders[tier]) !== JSON.stringify(defaults[tier]) })),
+        engines,
+        ...(engineTiersIncludeFree(engineTiers) ? { includeFree: true } : {}),
+        ...(rests?.payPerUse ? { payPerUse: rests.payPerUse() } : {}),
+        ...(rests ? { restHistory: rests.history().map((record) => ({ ...record,
+                label: record.scope ? `${label(record.instanceId)} (${record.scope})` : label(record.instanceId) })) } : {}),
+    };
+}

package/dist-server/server/engine-tiers.js

@@ -7,7 +7,7 @@ import { BOT_TIERS, DEFAULT_LADDERS, DEFAULT_TIER_CLASSES, MODEL_CLASSES, classB
 import { modelHost } from "../shared/engine-choices.js";
 export { DEFAULT_LADDERS };
 import { subscriptionProviderForDriver } from "../shared/subscription-bots.js";
-import { ATOMIC_ENGINE_INSTANCE, engineIntent, localModel, modelBilling, modelProvider, paidCandidate, perTokenModel } from "./harness-import/engine-policy.js";
+import { ATOMIC_ENGINE_INSTANCE, engineIntent, freeCandidate, localModel, modelBilling, modelProvider, paidCandidate, perTokenModel } from "./harness-import/engine-policy.js";
 /** Engines a tier tries first, whatever the class catalog order says: Chibi
  * runs on Claude (Erick, 2026-10-13: open-weight models broke its
  * orchestration). Its ladder starts with Claude's best model graded in its
@@ -169,6 +169,13 @@ export function engineTierClasses(engineTiers) {
     const classes = stored && typeof stored === "object" && !Array.isArray(stored) ? stored : {};
     return Object.fromEntries(BOT_TIERS.map((tier) => [tier, toModelClass(classes[tier]) ?? DEFAULT_TIER_CLASSES[tier]]));
 }
+/** A bot counts as handling client data unless switched off (WireBot.clientData),
+ * so a free-tier model is never the default for one. */
+export const handlesClientData = (bot) => bot.clientData !== false;
+/** "Include free models in Auto" (config.json engineTiers.includeFree): off by default. */
+export function engineTiersIncludeFree(engineTiers) {
+    return configObject(engineTiers).includeFree === true;
+}
 function storedClasses(engineTiers) {
     const current = engineTierClasses(engineTiers);
     return Object.fromEntries(BOT_TIERS.filter((tier) => current[tier] !== DEFAULT_TIER_CLASSES[tier]).map((tier) => [tier, current[tier]]));
@@ -224,7 +231,7 @@ export function engineHealth(candidate) {
         return "signed-out";
     return candidate.models.default || candidate.models.options.length ? "ready" : "unavailable";
 }
-const matchesEngine = (entry, candidate) => entry.engine === candidate.instanceId || entry.engine === candidate.driverKind;
+export const matchesEngine = (entry, candidate) => entry.engine === candidate.instanceId || entry.engine === candidate.driverKind;
 /** The model a rung runs on this engine: its exact model id, else the first
  * id containing it, else (no model named) the engine's default. Where several
  * ids contain it (one model offered by many providers on Hermes), one that is
@@ -274,10 +281,11 @@ export function resolveLadder(ladder, stored, context) {
     const skipped = [];
     const subscription = [];
     const key = [];
+    const free = [];
     // The engine the bot is already on goes first among equals.
     const storedFirst = (a, b) => Number(b.instanceId === stored.instanceId) - Number(a.instanceId === stored.instanceId);
     for (const [step, entry] of ladder.entries()) {
-        const matching = context.candidates.filter((candidate) => !keyBased(candidate) && matchesEngine(entry, candidate));
+        const matching = context.candidates.filter((candidate) => !keyBased(candidate) && !freeCandidate(candidate) && matchesEngine(entry, candidate));
         for (const candidate of matching.sort(storedFirst)) {
             const band = perTokenModel(candidate, entryModel(entry, candidate)) ? "key" : "subscription";
             (band === "key" ? key : subscription).push({ step, entry, candidate, band, index: context.candidates.indexOf(candidate) });
@@ -293,6 +301,14 @@ export function resolveLadder(ladder, stored, context) {
         if (candidate.driverKind === "ollamaCloud" && !keyBased(candidate) && !subscription.some((attempt) => attempt.candidate === candidate)) {
             subscription.push({ step: ladder.length, entry: { engine: candidate.instanceId }, candidate, band: "subscription", index });
         }
+        // A free-tier account joins every ladder by itself, in its own
+        // last-resort band (gated by includeFree/clientData below): no rung
+        // ever names one, same as how a key-based engine joins automatically.
+        if (freeCandidate(candidate)) {
+            const step = rungOf(candidate);
+            free.push({ step, entry: ladder[step] ?? { engine: candidate.instanceId }, candidate, band: "free", index });
+            continue;
+        }
         if (!keyBased(candidate) || candidate.driverKind === "boxAgent")
             continue;
         const step = rungOf(candidate);
@@ -300,8 +316,12 @@ export function resolveLadder(ladder, stored, context) {
     }
     subscription.sort((a, b) => atomicFirst(a.candidate) - atomicFirst(b.candidate) || a.step - b.step);
     key.sort((a, b) => a.step - b.step || storedFirst(a.candidate, b.candidate) || a.index - b.index);
-    for (const { step, entry, candidate, band } of [...subscription, ...key]) {
-        const reason = band === "key" && context.keyBandPaused ? "paused" : skipReason(entry, candidate, context, step < ladder.length);
+    free.sort((a, b) => a.step - b.step || storedFirst(a.candidate, b.candidate) || a.index - b.index);
+    for (const { step, entry, candidate, band } of [...subscription, ...key, ...free]) {
+        const reason = band === "key" && context.keyBandPaused ? "paused"
+            : band === "free" && !context.includeFree ? "free-off"
+                : band === "free" && context.clientData ? "client-data"
+                    : skipReason(entry, candidate, context, step < ladder.length);
         if (reason) {
             skipped.push({ step, instanceId: candidate.instanceId, reason, band });
             continue;
@@ -310,7 +330,7 @@ export function resolveLadder(ladder, stored, context) {
         const keep = candidate.instanceId === stored.instanceId &&
             (!entry.model || stored.model.toLowerCase().includes(entry.model.toLowerCase())) &&
             (stored.model === candidate.models.default || candidate.models.options.some((option) => option.id === stored.model)) &&
-            (band === "key" || !perTokenModel(candidate, stored.model));
+            (band !== "subscription" || !perTokenModel(candidate, stored.model));
         return { choice: { selection: keep ? { ...stored } : { instanceId: candidate.instanceId, model }, candidate, step, band }, skipped };
     }
     return { skipped };
@@ -362,7 +382,7 @@ export function resolveFailover(request) {
     // a turn falls to any of them, not only to those its ladders name.
     const extras = new Map();
     for (const candidate of request.context.candidates) {
-        if (keyBased(candidate) || candidate.driverKind === "boxAgent")
+        if (keyBased(candidate) || freeCandidate(candidate) || candidate.driverKind === "boxAgent")
             continue;
         // An engine that runs many providers (Hermes, Atomic Engine) offers each
         // flat plan's models; its key-billed and unlabelled ones are not a plan.
@@ -390,15 +410,19 @@ export function resolveFailover(request) {
     };
     const ladders = new Map(classes.map((modelClass) => [modelClass, ladderOf(modelClass)]));
     const all = [];
-    let keyPassSkipped;
-    for (const keys of [false, true]) {
+    let lastPassSkipped;
+    for (const stage of ["subscription", "key", "free"]) {
         for (const modelClass of classes) {
             const { ladder, vouched } = ladders.get(modelClass);
             const effective = (candidate, model, entry, step) => entry?.modelClass ?? request.classOf(candidate, model) ?? (step < vouched ? modelClass : "Añejo");
             const accept = (candidate, model, entry, named) => {
                 if (request.tried.has(candidate.instanceId))
                     return "tried";
-                if (!keys && (keyBased(candidate) || perTokenModel(candidate, model)))
+                // Free is the last-resort band: deferred past subscriptions and keys
+                // in every class, same as a key engine is deferred past subscriptions.
+                if (stage !== "free" && freeCandidate(candidate))
+                    return "key-later";
+                if (stage === "subscription" && (keyBased(candidate) || perTokenModel(candidate, model)))
                     return "key-later";
                 // a ladder-named local model is a normal rung (Erick, 2026-10-24)
                 if (!named && request.isLocal?.(candidate, model) && !(request.localAllowed && modelClass === "Añejo"))
@@ -408,8 +432,8 @@ export function resolveFailover(request) {
             };
             const resolution = resolveLadder(ladder, request.failed, { ...request.context, accept });
             all.push(...resolution.skipped);
-            if (keys && modelClass === request.modelClass)
-                keyPassSkipped = resolution.skipped;
+            if (stage === "free" && modelClass === request.modelClass)
+                lastPassSkipped = resolution.skipped;
             if (resolution.choice) {
                 const { choice } = resolution;
                 const named = choice.step < ladder.length;
@@ -418,7 +442,7 @@ export function resolveFailover(request) {
             }
         }
     }
-    return { skipped: keyPassSkipped ? mergeSkipped([...keyPassSkipped, ...all]) : mergeSkipped(all) };
+    return { skipped: lastPassSkipped ? mergeSkipped([...lastPassSkipped, ...all]) : mergeSkipped(all) };
 }
 /** One skip per engine, the most telling reason kept: a resting, paused or
  * refused engine says more than "not this class" or "a key, later". */
@@ -441,50 +465,8 @@ export function engineLabel(candidates, selection) {
     const model = candidate?.models.options.find((option) => option.id === selection.model)?.label ?? selection.model;
     return model && model !== name ? `${name} · ${model}` : name;
 }
-const DRIVER_NAMES = {
-    "atomic-engine": "Atomic Engine", claudeAgent: "Claude", codex: "Codex", cursorAgent: "Cursor", kimiAgent: "Kimi",
-    grokAgent: "Grok", vibeAgent: "Mistral Vibe", antigravityAgent: "Gemini (Antigravity)", qwenAgent: "Qwen (local)", opencodeGo: "OpenCode",
-    hermesAgent: "Hermes", ollamaCloud: "Ollama Cloud", mistral: "Mistral", "openai-compat": "OpenAI-compatible endpoint",
-    appleIntelligence: "Apple Intelligence (on this Mac)",
-};
 /** The account an engine is signed in to, as resting keys it. */
 export const engineAccount = (candidate) => candidate.snapshot.account?.email ?? candidate.snapshot.account?.organization;
-/** The Settings view: every tier's ladder with each rung's health and rest,
- * the installed engines a person may add, and the recent rest history. */
-export function engineTiersView(engineTiers, candidates, rests, defaults = DEFAULT_LADDERS) {
-    const ladders = engineTierLadders(engineTiers, defaults);
-    const classes = engineTierClasses(engineTiers);
-    const restOf = (candidate) => {
-        const rest = rests?.rest(candidate);
-        return rest ? { rest } : {};
-    };
-    const engines = candidates.filter((candidate) => candidate.driverKind !== "boxAgent").map((candidate) => ({
-        instanceId: candidate.instanceId, driverKind: candidate.driverKind, label: candidate.displayName,
-        health: engineHealth(candidate), paid: keyBased(candidate),
-        models: [...new Map([candidate.models.default, ...candidate.models.options.map((option) => option.id)].filter(Boolean).map((id) => {
-                const option = candidate.models.options.find((item) => item.id === id);
-                return [id, { id, label: option?.label || id, paid: perTokenModel(candidate, id) }];
-            })).values()],
-        ...(candidate.models.default ? { defaultModel: candidate.models.default } : {}), ...restOf(candidate),
-    }));
-    const rung = (entry) => {
-        const matching = candidates.filter((candidate) => matchesEngine(entry, candidate));
-        const best = matching.find((candidate) => engineHealth(candidate) === "ready" && !rests?.rest(candidate)) ??
-            matching.find((candidate) => engineHealth(candidate) === "ready") ?? matching[0];
-        const name = best?.displayName ?? DRIVER_NAMES[entry.engine] ?? entry.engine;
-        return { ...entry, label: entry.model ? `${name} (${entry.model})` : name, ...(best ? { instanceId: best.instanceId } : {}),
-            health: best ? engineHealth(best) : "unavailable", paid: best ? keyBased(best) : false, ...(best ? restOf(best) : {}) };
-    };
-    const label = (instanceId) => candidates.find((candidate) => candidate.instanceId === instanceId)?.displayName ?? instanceId;
-    return {
-        tiers: BOT_TIERS.map((tier) => ({ tier, modelClass: classes[tier], classCustom: classes[tier] !== DEFAULT_TIER_CLASSES[tier],
-            ladder: ladders[tier].map(rung), custom: JSON.stringify(ladders[tier]) !== JSON.stringify(defaults[tier]) })),
-        engines,
-        ...(rests?.payPerUse ? { payPerUse: rests.payPerUse() } : {}),
-        ...(rests ? { restHistory: rests.history().map((record) => ({ ...record,
-                label: record.scope ? `${label(record.instanceId)} (${record.scope})` : label(record.instanceId) })) } : {}),
-    };
-}
 /** One bot's rebalance preview row. `refuse` carries the same per-bot
  * refusals a turn would apply (policy, approval level). */
 export function rebalanceRow(bot, engineTiers, candidates, refuse, defaults = DEFAULT_LADDERS) {

package/dist-server/server/harness-import/engine-policy.js

@@ -54,7 +54,8 @@ const ready = (candidate) => candidate.snapshot.state === "available" && candida
  * Plan, is a subscription); Ollama Cloud, a flat plan used through a key;
  * else a metered snapshot, a per-token driver or a sign-in with an API key.
  * An engine Atomic cannot tell about (Cursor, Antigravity) is not labelled;
- * it still ranks after the subscription list. */
+ * it still ranks after the subscription list. A free-tier account
+ * (billing: "free") is never pay per token. */
 export const paidCandidate = (candidate) => {
     if (candidate.billing)
         return candidate.billing === "payPerUse";
@@ -63,6 +64,10 @@ export const paidCandidate = (candidate) => {
     return candidate.snapshot.billing === "metered" || PER_TOKEN_KINDS.has(candidate.driverKind) ||
         candidate.snapshot.account?.method === "api-key";
 };
+/** A provider account added as a permanent free tier (shared/
+ * provider-accounts.ts, billing: "free"): the last-resort band in
+ * resolveLadder, never the subscription or key band. */
+export const freeCandidate = (candidate) => candidate.billing === "free";
 // ── billing per model, on engines that run many providers ────────────────
 // Hermes, and Atomic Engine (built on it), run models from every provider
 // they are configured for, as `<provider>:<model>` ("deepinfra:XiaomiMiMo/

package/dist-server/server/index.js

@@ -145,7 +145,7 @@ import { buildRecoveryText, buildTurnContext, engineIsFresh, NATIVELY_REPLAYING_
 import { Handoffs, handedStateUsable, recordHanded, renderUnseen, sessionStart, unseenMessages, withUnseenMessages } from "./delta-context.js";
 import { extractTurnImages } from "./turn-images.js";
 import { TurnWatchdog } from "./turn-watchdog.js";
-import { TurnResources, workspaceResource } from "./turn-resources.js";
+import { TurnResources, folderHeldElsewhere, queuedTurnFolder, workspaceResource } from "./turn-resources.js";
 import { ensureWorkspace, ensureTaskWorkspace, workspaceLocationsPrompt, supportsWorkspaceFiles, updateMemory, appendMemoryLog, isMemoryTopicName, loadMemory, memorySystemPrompt, memorySourceLabel, searchMemoryFiles, SESSION_SEARCH_SYSTEM_PROMPT, TASK_WORKSPACES_DIR, WORKSPACES_DIR, workspaceDir, } from "./workspace.js";
 import { fromOwner, NexusMemory, surfaceForRequest } from "./nexus-memory/index.js";
 import { formatNexusFile, formatNexusRecall } from "./nexus-memory/tool-text.js";
@@ -275,6 +275,7 @@ import { accountStops, injectedModel, restScope } from "./injected-model-rest.js
 import { accountProvider } from "../shared/provider-accounts.js";
 import { createAccountRoutes } from "./routes/accounts.js";
 import { installNativeVault } from "./vault/runtime.js";
+import { installWorkspaceSecrets } from "./workspace-backup-secrets.js";
 import { OAuthAccounts, takeOAuthClients } from "./oauth-accounts.js";
 import { DesktopAccountVault, FileAccountVault, UnavailableAccountVault, takeAccountsFromEnvironment } from "./oauth-account-vault.js";
 import { accountConnectorNames } from "./claude-account-connectors.js";
@@ -289,7 +290,7 @@ import { HISTORY_RECEIPT_KIND, historyAttachmentStore } from "./harness-import/h
 import { chooseEngine, engineIntent, harnessForName, localModel, newBotSelection, paidCandidate, perTokenModel } from "./harness-import/engine-policy.js";
 import { createEngineTierRoutes } from "./routes/engine-tiers.js";
 import { createPrimaryBotRoutes } from "./routes/primary-bot.js";
-import { EngineSnapshotCache, botTier, canDriveComputer, classLadder, engineAccount, engineHealth, engineLabel, engineTierClasses, engineTierLadders, generateLadders, ladderForClass, keyBased, needsDelegation, resolveFailover, resolveLadder } from "./engine-tiers.js";
+import { EngineSnapshotCache, botTier, canDriveComputer, classLadder, engineAccount, engineHealth, engineLabel, engineTierClasses, engineTierLadders, engineTiersIncludeFree, generateLadders, handlesClientData, ladderForClass, keyBased, needsDelegation, resolveFailover, resolveLadder } from "./engine-tiers.js";
 import { PRIMARY_BOT_THREAD_TITLE, PRIMARY_BOT_TRIGGER, PrimaryBotStore, routesAsSweep, PrimaryBotSweeper } from "./primary-bot.js";
 import { PRIMARY_BOT_LOCKED, primaryBotChoiceField } from "../shared/primary-bot.js";
 import { moveIntoChibi } from "./move-into-chibi.js";
@@ -381,13 +382,10 @@ function releaseDataDirLeaseAtExit() {
 process.once("exit", releaseDataDirLeaseAtExit);
 // Restore before constructing any long-lived config, Store, session or provider
 // objects. Replacing files underneath a live Store would overwrite restored data.
-let workspaceRestore = { restored: false };
-if (existsSync(join(DATA_DIR, ".backups"))) {
-    workspaceRestore = applyPendingWorkspaceRestore(DATA_DIR);
-    if (!workspaceRestore.restored && !workspaceRestore.rolledBack) {
-        workspaceRestore = readLastWorkspaceRestore(DATA_DIR) ?? workspaceRestore;
-    }
-}
+const restoredThisBoot = existsSync(join(DATA_DIR, ".backups")) ? applyPendingWorkspaceRestore(DATA_DIR) : { restored: false };
+let workspaceRestore = restoredThisBoot;
+if (existsSync(join(DATA_DIR, ".backups")) && !workspaceRestore.restored && !workspaceRestore.rolledBack)
+    workspaceRestore = readLastWorkspaceRestore(DATA_DIR) ?? workspaceRestore;
 const workspaceMaintenance = new WorkspaceBackupMaintenance();
 // Only after ensureDirs(): it performs the one-time rename of the legacy data
 // dir, which must not find a freshly created ~/.openmausbot already there.
@@ -1176,6 +1174,7 @@ const availableSkills = () => mergeSkills(bundledSkills, loadUserSkills(join(DAT
 // supplies parentPort; plain Node intentionally leaves it absent.
 const utilityParentPort = process.parentPort;
 installNativeVault(DATA_DIR, utilityParentPort, () => desktopMutationToken, req => authorizedInternalCapability(req.headers.authorization) !== null);
+installWorkspaceSecrets(utilityParentPort, DATA_DIR, restoredThisBoot);
 function postDesktopPrivateMessage(message) {
     if (!utilityParentPort)
         return false;
@@ -3103,7 +3102,7 @@ function ladderTurnEngineChoice(profile, projected, threadId, needs, runOn, subs
     const { ladder } = plan;
     const computer = turnComputer(projected, threadId, runOn);
     const context = { candidates, needsDelegation: needsDelegation(tier, profile), computer, refuse: engineTierRefusal(projected), resting: engineResting,
-        keyBandPaused: subscriptionsOnly || payPerUse.pausedUntil() !== undefined };
+        keyBandPaused: subscriptionsOnly || payPerUse.pausedUntil() !== undefined, includeFree: engineTiersIncludeFree(cfg.engineTiers), clientData: handlesClientData(profile) };
     const local = (resolution) => localModeTurn(resolution, { tier, context, needs, prefer: [projected.modelSelection.instanceId] });
     const wider = (tried, modelClass) => resolveFailover({
         ladder, classLadder: (cls) => classLadder(classedModels(), cls), failed: projected.modelSelection, context, tried,
@@ -3876,7 +3875,7 @@ function failoverPick(turn, profile, projected, candidates, failedCandidate, res
         classLadder: (modelClass) => classLadder(classedModels(), modelClass),
         failed: attempt.selection,
         context: { candidates, needsDelegation: needsDelegation(tier, profile), computer, refuse: engineTierRefusal(projected), resting: engineResting,
-            keyBandPaused: Boolean(fallback) || keyBandPausedFor(turn.threadId) },
+            keyBandPaused: Boolean(fallback) || keyBandPausedFor(turn.threadId), includeFree: engineTiersIncludeFree(cfg.engineTiers), clientData: handlesClientData(profile) },
         tried,
         modelClass: neededClass,
         mayDrop: true,
@@ -5347,7 +5346,7 @@ const roomHandoffs = new RoomHandoffs(join(DATA_DIR, "room-handoffs.json"), {
     busy: n => {
         if (n.groupId)
             return Boolean(store.bot(n.botId)?.busy || (store.group(n.groupId) && groupIsWorking(store.group(n.groupId))));
-        const slot = threadBusy(n.botId, n.threadId) || botAtThreadCapacity(n.botId) || Boolean(activeGroupTurnForBot(n.botId));
+        const slot = threadBusy(n.botId, n.threadId) || botAtThreadCapacity(n.botId) || Boolean(activeGroupTurnForBot(n.botId)) || folderHeldElsewhere(turnResources, queuedTurnFolder(store.taskByThread(n.botId, n.threadId)?.cwd, repoThreadStarted(n.threadId), turnRepoPlan(n.threadId), store.bot(n.botId)?.cwd), n.threadId);
         return n.status === "resume" ? slot : slot || recipientAwaitingPerson(n.botId, n.threadId);
     },
     changed: (groupIds, directThreadIds) => {
@@ -21004,7 +21003,7 @@ const handleRequest = async (req, res) => {
                         section = trimmed;
                 }
             }
-            for (const key of ["unread", "cloudBackend", "color", "mascotExpression", "mascotBody", "pinned", "hidden"]) {
+            for (const key of ["unread", "cloudBackend", "color", "mascotExpression", "mascotBody", "pinned", "hidden", "clientData"]) {
                 if (body[key] !== undefined)
                     patch[key] = body[key];
             }