@wrongstack/cli 0.4.0 → 0.4.1

package/dist/index.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
-import { color, allServers, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, SlashCommandRegistry, loadPlugins, createDelegateTool, FLEET_ROSTER, DefaultLogger, DefaultModelsRegistry, DefaultSessionStore, DefaultSkillLoader, ProviderRegistry, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, Agent, makeDirectorSessionFactory, Director, DefaultMultiAgentCoordinator, makeAgentSubagentRunner, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, atomicWrite, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, removePlanItem, formatPlan, setPlanItemStatus, addPlanItem, InputBuilder, decryptConfigSecrets, encryptConfigSecrets, DefaultPluginAPI } from '@wrongstack/core';
+import { color, allServers, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, SlashCommandRegistry, loadPlugins, createDelegateTool, FLEET_ROSTER, DefaultLogger, DefaultModelsRegistry, DefaultSessionStore, DefaultSkillLoader, ProviderRegistry, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, Agent, makeDirectorSessionFactory, Director, DefaultMultiAgentCoordinator, makeAgentSubagentRunner, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, atomicWrite, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, removePlanItem, formatPlan, setPlanItemStatus, addPlanItem, InputBuilder, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, DefaultPluginAPI } from '@wrongstack/core';
 import * as crypto from 'crypto';
 import { randomUUID } from 'crypto';
 import * as fs14 from 'fs/promises';
+import * as path15 from 'path';
+import { DefaultSecretVault as DefaultSecretVault$1, encryptConfigSecrets } from '@wrongstack/core/security';
 import { WebSocketServer, WebSocket } from 'ws';
 import { writeFileSync } from 'fs';
 import { createRequire } from 'module';
-import * as path14 from 'path';
 import { MCPRegistry } from '@wrongstack/mcp';
 import { buildProviderFactoriesFromRegistry, makeProviderFromConfig, capabilitiesFor } from '@wrongstack/providers';
 import { createDefaultContainer, routeImagesForModel, readClipboardImage } from '@wrongstack/runtime';
@@ -76,9 +77,8 @@ async function runWebUI(opts) {
   const clients = /* @__PURE__ */ new Map();
   let abortController = null;
   const authToken = crypto.randomBytes(16).toString("hex");
-  const wss = new WebSocketServer({ port, host: "127.0.0.1" });
+  const wss = new WebSocketServer({ port, host: "127.0.0.1", maxPayload: 1 * 1024 * 1024 });
   console.log(`[WebUI] WebSocket server starting on ws://localhost:${port}`);
-  console.log(`[WebUI] Auth token: ${authToken}`);
   const eventUnsubscribers = [];
   function setupEvents() {
     for (const unsub of eventUnsubscribers) unsub();
@@ -198,6 +198,8 @@ async function runWebUI(opts) {
           }
         } else {
           if (!tokenOk) {
+            ws.close(4003, "Forbidden: auth token required for non-browser clients");
+            return;
           }
         }
       } catch {
@@ -574,7 +576,10 @@ async function runWebUI(opts) {
       parsed = {};
     }
     parsed.providers = providers;
-    await atomicWrite(opts.globalConfigPath, JSON.stringify(parsed, null, 2), { mode: 384 });
+    const keyFile = path15.join(path15.dirname(opts.globalConfigPath), ".key");
+    const vault = new DefaultSecretVault$1({ keyFile });
+    const encrypted = encryptConfigSecrets(parsed, vault);
+    await atomicWrite(opts.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
   }
   function sendResult(ws, success, message) {
     send(ws, { type: "key.operation_result", payload: { success, message } });
@@ -723,7 +728,7 @@ function parseSpawnFlags(input) {
   return { description: rest.trim(), opts };
 }
 async function bootConfig(flags) {
-  const cwd = typeof flags["cwd"] === "string" ? path14.resolve(flags["cwd"]) : process.cwd();
+  const cwd = typeof flags["cwd"] === "string" ? path15.resolve(flags["cwd"]) : process.cwd();
   const pathResolver = new DefaultPathResolver(cwd);
   const projectRoot = pathResolver.projectRoot;
   const userHome = os3.homedir();
@@ -790,7 +795,7 @@ var ReadlineInputReader = class {
   history = [];
   pending = false;
   constructor(opts = {}) {
-    this.historyFile = opts.historyFile ?? path14.join(os3.homedir(), ".wrongstack", "history");
+    this.historyFile = opts.historyFile ?? path15.join(os3.homedir(), ".wrongstack", "history");
   }
   async loadHistory() {
     try {
@@ -802,7 +807,7 @@ var ReadlineInputReader = class {
   }
   async saveHistory() {
     try {
-      await fs14.mkdir(path14.dirname(this.historyFile), { recursive: true });
+      await fs14.mkdir(path15.dirname(this.historyFile), { recursive: true });
       await fs14.writeFile(this.historyFile, this.history.slice(-1e3).join("\n"));
     } catch {
     }
@@ -1284,10 +1289,10 @@ async function detectPackageManager(root, declared) {
     const name = declared.split("@")[0];
     if (name) return name;
   }
-  if (await pathExists(path14.join(root, "pnpm-lock.yaml"))) return "pnpm";
-  if (await pathExists(path14.join(root, "bun.lockb"))) return "bun";
-  if (await pathExists(path14.join(root, "bun.lock"))) return "bun";
-  if (await pathExists(path14.join(root, "yarn.lock"))) return "yarn";
+  if (await pathExists(path15.join(root, "pnpm-lock.yaml"))) return "pnpm";
+  if (await pathExists(path15.join(root, "bun.lockb"))) return "bun";
+  if (await pathExists(path15.join(root, "bun.lock"))) return "bun";
+  if (await pathExists(path15.join(root, "yarn.lock"))) return "yarn";
   return "npm";
 }
 function hasUsableScript(scripts, name) {
@@ -1308,7 +1313,7 @@ function parseMakeTargets(makefile) {
 async function detectProjectFacts(root) {
   const facts = { hints: [] };
   try {
-    const pkg = JSON.parse(await fs14.readFile(path14.join(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(await fs14.readFile(path15.join(root, "package.json"), "utf8"));
     const scripts = pkg.scripts ?? {};
     const pm = await detectPackageManager(root, pkg.packageManager);
     if (hasUsableScript(scripts, "build")) facts.build = `${pm} run build`;
@@ -1322,14 +1327,14 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path14.join(root, "pyproject.toml"))) throw new Error("not python");
+    if (!await pathExists(path15.join(root, "pyproject.toml"))) throw new Error("not python");
     facts.test ??= "pytest";
     facts.lint ??= "ruff check .";
     facts.hints.push("pyproject.toml");
   } catch {
   }
   try {
-    if (!await pathExists(path14.join(root, "go.mod"))) throw new Error("not go");
+    if (!await pathExists(path15.join(root, "go.mod"))) throw new Error("not go");
     facts.build ??= "go build ./...";
     facts.test ??= "go test ./...";
     facts.run ??= "go run .";
@@ -1337,7 +1342,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path14.join(root, "Cargo.toml"))) throw new Error("not rust");
+    if (!await pathExists(path15.join(root, "Cargo.toml"))) throw new Error("not rust");
     facts.build ??= "cargo build";
     facts.test ??= "cargo test";
     facts.lint ??= "cargo clippy";
@@ -1346,7 +1351,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    const makefile = await fs14.readFile(path14.join(root, "Makefile"), "utf8");
+    const makefile = await fs14.readFile(path15.join(root, "Makefile"), "utf8");
     const targets = parseMakeTargets(makefile);
     facts.build ??= targets.has("build") ? "make build" : "make";
     if (targets.has("test")) facts.test ??= "make test";
@@ -1809,8 +1814,8 @@ function buildInitCommand(opts) {
     description: "Create .wrongstack/AGENTS.md project context for the system prompt.",
     async run(args, ctx) {
       const force = args.trim() === "--force";
-      const dir = path14.join(ctx.projectRoot, ".wrongstack");
-      const file = path14.join(dir, "AGENTS.md");
+      const dir = path15.join(ctx.projectRoot, ".wrongstack");
+      const file = path15.join(dir, "AGENTS.md");
       try {
         await fs14.access(file);
         if (!force) {
@@ -2242,13 +2247,13 @@ var MANIFESTS = [
 ];
 async function detectProjectKind(projectRoot) {
   try {
-    await fs14.access(path14.join(projectRoot, ".wrongstack", "AGENTS.md"));
+    await fs14.access(path15.join(projectRoot, ".wrongstack", "AGENTS.md"));
     return "initialized";
   } catch {
   }
   for (const m of MANIFESTS) {
     try {
-      await fs14.access(path14.join(projectRoot, m));
+      await fs14.access(path15.join(projectRoot, m));
       return "project";
     } catch {
     }
@@ -2256,8 +2261,8 @@ async function detectProjectKind(projectRoot) {
   return "empty";
 }
 async function scaffoldAgentsMd(projectRoot) {
-  const dir = path14.join(projectRoot, ".wrongstack");
-  const file = path14.join(dir, "AGENTS.md");
+  const dir = path15.join(projectRoot, ".wrongstack");
+  const file = path15.join(dir, "AGENTS.md");
   const facts = await detectProjectFacts(projectRoot);
   const body = renderAgentsTemplate(facts);
   await fs14.mkdir(dir, { recursive: true });
@@ -2270,7 +2275,7 @@ async function runProjectCheck(opts) {
   if (kind === "initialized") {
     renderer.write(
       `
-  ${color.green("\u2713")} Project initialized ${color.dim(`(${path14.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
+  ${color.green("\u2713")} Project initialized ${color.dim(`(${path15.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
 `
     );
     return true;
@@ -2566,14 +2571,14 @@ function summarize(value, name) {
   if (typeof v === "object" && v !== null) {
     const o = v;
     if (name === "edit") {
-      const path15 = typeof o["path"] === "string" ? o["path"] : "";
+      const path16 = typeof o["path"] === "string" ? o["path"] : "";
       const reps = typeof o["replacements"] === "number" ? o["replacements"] : 0;
-      return `${path15}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
+      return `${path16}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
     }
     if (name === "write") {
-      const path15 = typeof o["path"] === "string" ? o["path"] : "";
+      const path16 = typeof o["path"] === "string" ? o["path"] : "";
       const bytes = typeof o["bytes"] === "number" ? o["bytes"] : void 0;
-      return bytes !== void 0 ? `${path15}  ${bytes}B` : path15;
+      return bytes !== void 0 ? `${path16}  ${bytes}B` : path16;
     }
     if (typeof o["count"] === "number") {
       return `${o["count"]} match${o["count"] === 1 ? "" : "es"}`;
@@ -3199,7 +3204,7 @@ async function mutateProviders(deps, mutator) {
   const providers = decrypted.providers ?? {};
   mutator(providers);
   decrypted.providers = providers;
-  const encrypted = encryptConfigSecrets(decrypted, deps.vault);
+  const encrypted = encryptConfigSecrets$1(decrypted, deps.vault);
   await atomicWrite(deps.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
 }
 
@@ -3336,7 +3341,7 @@ var doctorCmd = async (_args, deps) => {
   }
   try {
     await fs14.mkdir(deps.paths.projectSessions, { recursive: true });
-    const probe = path14.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
+    const probe = path15.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
     await fs14.writeFile(probe, "");
     await fs14.unlink(probe);
     checks.push({ name: "sessions writable", status: "ok", detail: deps.paths.projectSessions });
@@ -3439,8 +3444,8 @@ var exportCmd = async (args, deps) => {
     return 1;
   }
   if (output) {
-    await fs14.mkdir(path14.dirname(path14.resolve(deps.cwd, output)), { recursive: true });
-    await fs14.writeFile(path14.resolve(deps.cwd, output), rendered, "utf8");
+    await fs14.mkdir(path15.dirname(path15.resolve(deps.cwd, output)), { recursive: true });
+    await fs14.writeFile(path15.resolve(deps.cwd, output), rendered, "utf8");
     deps.renderer.write(`Wrote ${rendered.length} bytes to ${output}
 `);
   } else {
@@ -3500,9 +3505,12 @@ var initCmd = async (_args, deps) => {
   await fs14.mkdir(deps.paths.globalRoot, { recursive: true });
   const config = { version: 1, provider: providerId, model: modelId };
   if (apiKey) config.apiKey = apiKey;
-  await atomicWrite(deps.paths.globalConfig, JSON.stringify(config, null, 2));
-  await fs14.mkdir(path14.join(deps.projectRoot, ".wrongstack"), { recursive: true });
-  const agentsFile = path14.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
+  const keyFile = path15.join(path15.dirname(deps.paths.globalConfig), ".key");
+  const vault = new DefaultSecretVault$1({ keyFile });
+  const encrypted = encryptConfigSecrets(config, vault);
+  await atomicWrite(deps.paths.globalConfig, JSON.stringify(encrypted, null, 2));
+  await fs14.mkdir(path15.join(deps.projectRoot, ".wrongstack"), { recursive: true });
+  const agentsFile = path15.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
   try {
     await fs14.access(agentsFile);
   } catch {
@@ -3812,7 +3820,7 @@ var usageCmd = async (_args, deps) => {
   return 0;
 };
 var projectsCmd = async (_args, deps) => {
-  const projectsRoot = path14.join(deps.paths.globalRoot, "projects");
+  const projectsRoot = path15.join(deps.paths.globalRoot, "projects");
   try {
     const entries = await fs14.readdir(projectsRoot);
     if (entries.length === 0) {
@@ -3822,7 +3830,7 @@ var projectsCmd = async (_args, deps) => {
     for (const hash of entries) {
       try {
         const meta = JSON.parse(
-          await fs14.readFile(path14.join(projectsRoot, hash, "meta.json"), "utf8")
+          await fs14.readFile(path15.join(projectsRoot, hash, "meta.json"), "utf8")
         );
         deps.renderer.write(
           `  ${color.dim(hash)}  ${color.dim(meta.lastSeen ?? "")}  ${meta.root ?? "?"}
@@ -4121,7 +4129,7 @@ function resolveBundledSkillsDir() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path14.join(path14.dirname(corePkg), "skills");
+    return path15.join(path15.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -4628,7 +4636,7 @@ async function execute(deps) {
           supportsVision,
           attachments,
           effectiveMaxContext,
-          projectName: path14.basename(projectRoot) || void 0
+          projectName: path15.basename(projectRoot) || void 0
         });
       } finally {
         await webuiPromise.catch(() => void 0);
@@ -4644,7 +4652,7 @@ async function execute(deps) {
         supportsVision,
         attachments,
         effectiveMaxContext,
-        projectName: path14.basename(projectRoot) || void 0
+        projectName: path15.basename(projectRoot) || void 0
       });
     }
   } finally {
@@ -4905,7 +4913,7 @@ var MultiAgentHost = class {
       model: opts?.model,
       tools: opts?.tools
     };
-    const transcriptPath = this.sessionFactory ? path14.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
+    const transcriptPath = this.sessionFactory ? path15.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
     if (this.director) {
       const subagentId = await this.director.spawn(subagentConfig);
       const taskId2 = randomUUID();
@@ -5057,16 +5065,16 @@ var MultiAgentHost = class {
     }
     this.opts.directorMode = true;
     if (this.opts.fleetRoot && !this.opts.manifestPath) {
-      this.opts.manifestPath = path14.join(this.opts.fleetRoot, "fleet.json");
+      this.opts.manifestPath = path15.join(this.opts.fleetRoot, "fleet.json");
     }
     if (this.opts.fleetRoot && !this.opts.sharedScratchpadPath) {
-      this.opts.sharedScratchpadPath = path14.join(this.opts.fleetRoot, "shared");
+      this.opts.sharedScratchpadPath = path15.join(this.opts.fleetRoot, "shared");
     }
     if (this.opts.fleetRoot && !this.opts.sessionsRoot) {
-      this.opts.sessionsRoot = path14.join(this.opts.fleetRoot, "subagents");
+      this.opts.sessionsRoot = path15.join(this.opts.fleetRoot, "subagents");
     }
     if (this.opts.fleetRoot && !this.opts.stateCheckpointPath) {
-      this.opts.stateCheckpointPath = path14.join(this.opts.fleetRoot, "director-state.json");
+      this.opts.stateCheckpointPath = path15.join(this.opts.fleetRoot, "director-state.json");
     }
     await this.ensureDirector();
     return this.director ?? null;
@@ -5187,11 +5195,11 @@ var SessionStats = class {
       if (e.name === "bash") this.bashCommands++;
       else if (e.name === "fetch") this.fetches++;
       if (!e.ok) return;
-      const path15 = typeof input?.path === "string" ? input.path : void 0;
-      if (e.name === "read" && path15) this.readPaths.add(path15);
-      else if (e.name === "edit" && path15) this.editedPaths.add(path15);
-      else if (e.name === "write" && path15) {
-        this.writtenPaths.add(path15);
+      const path16 = typeof input?.path === "string" ? input.path : void 0;
+      if (e.name === "read" && path16) this.readPaths.add(path16);
+      else if (e.name === "edit" && path16) this.editedPaths.add(path16);
+      else if (e.name === "write" && path16) {
+        this.writtenPaths.add(path16);
         const content = typeof input?.content === "string" ? input.content : "";
         this.bytesWritten += Buffer.byteLength(content, "utf8");
       }
@@ -5397,6 +5405,15 @@ async function setupCompaction(params) {
   const { compactor, events, modelsRegistry, context, config, provider, pipelines } = params;
   const resolvedCaps = await capabilitiesFor(modelsRegistry, provider.id, context.model).catch(() => void 0);
   const effectiveMaxContext = config.context.effectiveMaxContext ?? resolvedCaps?.maxContext ?? provider.capabilities.maxContext;
+  console.error("[DEBUG] setupCompaction:", {
+    providerId: provider.id,
+    model: context.model,
+    resolvedCapsMaxContext: resolvedCaps?.maxContext,
+    providerCapMaxContext: provider.capabilities.maxContext,
+    configEffectiveMaxContext: config.context.effectiveMaxContext,
+    effectiveMaxContext,
+    resolvedCapsKeys: resolvedCaps ? Object.keys(resolvedCaps) : null
+  });
   if (config.context.autoCompact !== false) {
     const autoCompactor = new AutoCompactionMiddleware(
       compactor,
@@ -5535,12 +5552,12 @@ async function setupSession(params) {
   }
   const sessionRef = { current: session };
   await recoveryLock.write(session.id).catch(() => void 0);
-  const attachments = new DefaultAttachmentStore({ spoolDir: path14.join(wpaths.projectSessions, session.id, "attachments") });
-  const queueStore = new QueueStore({ dir: path14.join(wpaths.projectSessions, session.id) });
+  const attachments = new DefaultAttachmentStore({ spoolDir: path15.join(wpaths.projectSessions, session.id, "attachments") });
+  const queueStore = new QueueStore({ dir: path15.join(wpaths.projectSessions, session.id) });
   const ctxSignal = new AbortController().signal;
   const context = new Context({ systemPrompt, provider, session, signal: ctxSignal, tokenCounter, cwd, projectRoot, model: config.model });
   if (restoredMessages.length > 0) context.state.replaceMessages(restoredMessages);
-  const todosCheckpointPath = path14.join(wpaths.projectSessions, `${session.id}.todos.json`);
+  const todosCheckpointPath = path15.join(wpaths.projectSessions, `${session.id}.todos.json`);
   if (resumeId) {
     try {
       const restoredTodos = await loadTodosCheckpoint(todosCheckpointPath);
@@ -5552,12 +5569,12 @@ async function setupSession(params) {
     }
   }
   const detachTodosCheckpoint = attachTodosCheckpoint(context.state, todosCheckpointPath, session.id);
-  const planPath = path14.join(wpaths.projectSessions, `${session.id}.plan.json`);
+  const planPath = path15.join(wpaths.projectSessions, `${session.id}.plan.json`);
   context.state.setMeta("plan.path", planPath);
   if (resumeId) {
     try {
-      const fleetRoot = path14.join(wpaths.projectSessions, session.id);
-      const dirState = await loadDirectorState(path14.join(fleetRoot, "director-state.json"));
+      const fleetRoot = path15.join(wpaths.projectSessions, session.id);
+      const dirState = await loadDirectorState(path15.join(fleetRoot, "director-state.json"));
       if (dirState) {
         const tCounts = {};
         for (const t of dirState.tasks) tCounts[t.status] = (tCounts[t.status] ?? 0) + 1;
@@ -5584,7 +5601,7 @@ function resolveBundledSkillsDir2() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path14.join(path14.dirname(corePkg), "skills");
+    return path15.join(path15.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -5671,7 +5688,7 @@ async function main(argv) {
       modeId,
       modePrompt,
       modelCapabilities,
-      planPath: () => sessionRef.current ? path14.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
+      planPath: () => sessionRef.current ? path15.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
     })
   );
   const toolRegistry = new ToolRegistry();
@@ -5716,7 +5733,7 @@ async function main(argv) {
     const dumpMetrics = () => {
       if (!metricsSink) return;
       try {
-        const out = path14.join(wpaths.projectSessions, "metrics.json");
+        const out = path15.join(wpaths.projectSessions, "metrics.json");
         const snap = metricsSink.snapshot();
         writeFileSync(out, JSON.stringify(snap, null, 2));
       } catch {
@@ -5907,13 +5924,19 @@ async function main(argv) {
   }
   const switchProviderAndModel = (providerId, modelId) => {
     try {
-      const newCfg = config.providers?.[providerId] ?? {
+      console.error("[DEBUG] switchProviderAndModel called with:", { providerId, modelId });
+      const savedCfg = config.providers?.[providerId];
+      const resolvedProviderId = savedCfg?.type ?? providerId;
+      console.error("[DEBUG] switchProviderAndModel: resolvedProviderId:", resolvedProviderId, "savedCfg.type:", savedCfg?.type);
+      const newCfg = savedCfg ?? {
         type: providerId,
         apiKey: config.apiKey,
         baseUrl: config.baseUrl
       };
-      const cfgWithType = { ...newCfg, type: providerId };
-      const newProvider = config.features.modelsRegistry && providerRegistry.has(providerId) ? providerRegistry.create(cfgWithType) : makeProviderFromConfig(providerId, cfgWithType);
+      const cfgWithType = { ...newCfg, type: resolvedProviderId };
+      console.error("[DEBUG] switchProviderAndModel: cfgWithType:", cfgWithType);
+      const newProvider = config.features.modelsRegistry && providerRegistry.has(resolvedProviderId) ? providerRegistry.create(cfgWithType) : makeProviderFromConfig(resolvedProviderId, cfgWithType);
+      console.error("[DEBUG] switchProviderAndModel: new provider id:", newProvider.id, "maxContext:", newProvider.capabilities.maxContext);
       context.provider = newProvider;
       context.model = modelId;
       config = patchConfig(config, { provider: providerId, model: modelId });
@@ -5925,12 +5948,12 @@ async function main(argv) {
   };
   const directorMode = flags["director"] === true;
   let director = null;
-  const fleetRoot = directorMode ? path14.join(wpaths.projectSessions, session.id) : void 0;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path14.join(fleetRoot, "fleet.json") : void 0;
-  const sharedScratchpadPath = directorMode ? path14.join(fleetRoot, "shared") : void 0;
-  const subagentSessionsRoot = directorMode ? path14.join(fleetRoot, "subagents") : void 0;
-  const stateCheckpointPath = directorMode ? path14.join(fleetRoot, "director-state.json") : void 0;
-  const fleetRootForPromotion = path14.join(wpaths.projectSessions, session.id);
+  const fleetRoot = directorMode ? path15.join(wpaths.projectSessions, session.id) : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path15.join(fleetRoot, "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path15.join(fleetRoot, "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path15.join(fleetRoot, "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path15.join(fleetRoot, "director-state.json") : void 0;
+  const fleetRootForPromotion = path15.join(wpaths.projectSessions, session.id);
   const multiAgentHost = new MultiAgentHost(
     {
       container,
@@ -6082,7 +6105,7 @@ async function main(argv) {
       return `Unknown fleet action: ${action}`;
     },
     onFleetLog: async (subagentId, mode) => {
-      const subagentsRoot = path14.join(fleetRootForPromotion, "subagents");
+      const subagentsRoot = path15.join(fleetRootForPromotion, "subagents");
       let runDirs;
       try {
         runDirs = await fs14.readdir(subagentsRoot);
@@ -6091,7 +6114,7 @@ async function main(argv) {
       }
       const found = [];
       for (const runId of runDirs) {
-        const runDir = path14.join(subagentsRoot, runId);
+        const runDir = path15.join(subagentsRoot, runId);
         let files;
         try {
           files = await fs14.readdir(runDir);
@@ -6100,7 +6123,7 @@ async function main(argv) {
         }
         for (const f of files) {
           if (!f.endsWith(".jsonl")) continue;
-          const full = path14.join(runDir, f);
+          const full = path15.join(runDir, f);
           try {
             const stat2 = await fs14.stat(full);
             found.push({
@@ -6197,7 +6220,7 @@ async function main(argv) {
       }
       const dir = await multiAgentHost.ensureDirector();
       if (!dir) return "Director is not available.";
-      const dirStatePath = path14.join(fleetRootForPromotion, "director-state.json");
+      const dirStatePath = path15.join(fleetRootForPromotion, "director-state.json");
       const prior = await loadDirectorState(dirStatePath);
       if (!prior) {
         return "No prior director-state.json found \u2014 nothing to retry.";
@@ -6268,9 +6291,9 @@ async function main(argv) {
       for (const tool of director2.tools(FLEET_ROSTER)) {
         toolRegistry.register(tool);
       }
-      const mp = path14.join(fleetRootForPromotion, "fleet.json");
-      const sp = path14.join(fleetRootForPromotion, "shared");
-      const ss = path14.join(fleetRootForPromotion, "subagents");
+      const mp = path15.join(fleetRootForPromotion, "fleet.json");
+      const sp = path15.join(fleetRootForPromotion, "shared");
+      const ss = path15.join(fleetRootForPromotion, "subagents");
       const lines = [
         `${color.green("\u2713")} Promoted to director mode.`,
         `  Roster: ${Object.keys(FLEET_ROSTER).join(", ")}`,