kifaru 1.0.179 → 1.0.180

package/kifaru-gateway.js

@@ -6024,7 +6024,7 @@ var require_src = __commonJS((exports) => {
 });
 
 // src/index.ts
-import fs8 from "fs";
+import fs9 from "fs";
 
 // src/config.ts
 import crypto2 from "crypto";
@@ -33163,6 +33163,7 @@ import {
   getAgentDir
 } from "@earendil-works/pi-coding-agent";
 import path6 from "path";
+import fs8 from "fs";
 // ../core/src/model/model-family.ts
 function getModelFamily(model) {
   const ref = typeof model === "string" ? model : `${model.providerID}/${model.modelID}`;
@@ -34452,389 +34453,17 @@ function createKifaruModels(options) {
   }
   return registry2;
 }
-// ../core/src/headless/stage-policy.ts
-function evaluateToolPolicy(stageInput, tool, params) {
-  if (stageInput.prohibitedActions?.includes(tool.actionCategory)) {
-    return {
-      allowed: false,
-      reason: `Action category "${tool.actionCategory}" is explicitly prohibited for stage "${stageInput.stageKey}".`
-    };
-  }
-  if (!stageInput.allowedActions.includes(tool.actionCategory)) {
-    return {
-      allowed: false,
-      reason: `Action category "${tool.actionCategory}" is not allowed for stage "${stageInput.stageKey}".`
-    };
-  }
-  if (tool.actionCategory === "skill_load") {
-    const name = typeof params.name === "string" ? params.name.trim() : "";
-    if (!stageInput.allowedSkills?.includes(name)) {
-      return {
-        allowed: false,
-        reason: `Skill "${name}" is not bound to stage "${stageInput.stageKey}".`
-      };
-    }
-  }
-  const allowedOrigins = stageInput.target.origins.map((o) => o.toLowerCase());
-  const allowedHosts = new Set(allowedOrigins.map((o) => {
-    try {
-      return new URL(o).host.toLowerCase();
-    } catch {
-      return o;
-    }
-  }).filter(Boolean));
-  for (const key of ["url", "target", "host", "endpoint"]) {
-    const raw2 = params[key];
-    if (typeof raw2 !== "string" || raw2.trim() === "")
-      continue;
-    if (allowedOrigins.length === 0) {
-      return {
-        allowed: false,
-        reason: `Target "${raw2}" (param "${key}") rejected: stage "${stageInput.stageKey}" declares no allowed origins.`
-      };
-    }
-    let matched = false;
-    let parsed;
-    try {
-      parsed = new URL(raw2);
-    } catch {
-      parsed = undefined;
-    }
-    if (parsed) {
-      matched = allowedOrigins.some((originStr) => {
-        try {
-          const originUrl = new URL(originStr);
-          return parsed.protocol.toLowerCase() === originUrl.protocol.toLowerCase() && parsed.host.toLowerCase() === originUrl.host.toLowerCase();
-        } catch {
-          return false;
-        }
-      });
-    } else {
-      const host = raw2.toLowerCase().replace(/^\/+/, "").split("/")[0] ?? raw2.toLowerCase();
-      matched = allowedHosts.has(host);
-    }
-    if (!matched) {
-      return {
-        allowed: false,
-        reason: `Target "${raw2}" (param "${key}") violates stage scope bounds: not in allowed origins [${allowedOrigins.join(", ")}].`
-      };
-    }
-  }
-  return { allowed: true };
-}
-// ../core/src/headless/stage-harness.ts
-class StageGovernanceHarness {
-  catalog;
-  invoker;
-  tools = new Map;
-  constructor(catalog, invoker) {
-    this.catalog = catalog;
-    this.invoker = invoker;
-  }
-  registerTool(tool) {
-    this.tools.set(tool.name, tool);
-  }
-  getRegisteredTools() {
-    return Array.from(this.tools.values());
-  }
-  async dispatchTool(stageInput, toolName, params, signal) {
-    if (signal?.aborted) {
-      return {
-        allowed: false,
-        error: "Execution was aborted prior to tool dispatch."
-      };
-    }
-    const tool = this.tools.get(toolName);
-    if (!tool) {
-      return {
-        allowed: false,
-        error: `Tool "${toolName}" is not registered with the governance harness.`
-      };
-    }
-    const decision = evaluateToolPolicy(stageInput, tool, params);
-    if (!decision.allowed) {
-      return { allowed: false, error: decision.reason };
-    }
-    try {
-      const result = await tool.execute(params, signal);
-      return {
-        allowed: true,
-        output: result.output,
-        evidence: result.evidence
-      };
-    } catch (err) {
-      const errorMsg = err instanceof Error ? err.message : String(err);
-      return {
-        allowed: true,
-        error: `Tool execution failed: ${errorMsg}`
-      };
-    }
-  }
-  async runStage(stageInput, signal) {
-    if (stageInput.budget && (stageInput.budget.maxTokens <= 0 || stageInput.budget.maxCostUsd <= 0 || stageInput.budget.timeoutMs <= 0)) {
-      return {
-        agentSessionId: stageInput.agentSessionId,
-        stageKey: stageInput.stageKey,
-        status: "blocked",
-        summary: `Stage budget limits reached (maxTokens: ${stageInput.budget.maxTokens}, maxCostUsd: ${stageInput.budget.maxCostUsd}, timeoutMs: ${stageInput.budget.timeoutMs}).`,
-        findings: [],
-        evidence: [],
-        costUsd: 0,
-        toolAttemptsThisTurn: 0,
-        toolsExecutedThisTurn: 0,
-        toolsErroredThisTurn: 0,
-        tokenUsage: { inputTokens: 0, outputTokens: 0, reasoningTokens: 0 }
-      };
-    }
-    const resolution = this.catalog.resolve(stageInput.modelPattern);
-    if (!resolution) {
-      return {
-        agentSessionId: stageInput.agentSessionId,
-        stageKey: stageInput.stageKey,
-        status: "failed",
-        summary: `Could not resolve model reference "${stageInput.modelPattern}".`,
-        findings: [],
-        evidence: [],
-        costUsd: 0,
-        toolAttemptsThisTurn: 0,
-        toolsExecutedThisTurn: 0,
-        toolsErroredThisTurn: 0,
-        tokenUsage: { inputTokens: 0, outputTokens: 0, reasoningTokens: 0 }
-      };
-    }
-    const { model, thinkingLevel } = resolution;
-    const systemPrompt = [
-      `You are executing stage "${stageInput.stageKey}" for workflow "${stageInput.workflowKey}".`,
-      `Target URL: ${stageInput.target.url}`,
-      `Allowed Origins: ${stageInput.target.origins.join(", ") || "none"}`,
-      `Allowed Actions: ${stageInput.allowedActions.join(", ")}`,
-      `Prohibited Actions: ${stageInput.prohibitedActions?.join(", ") || "none"}`,
-      `Perform only the assigned stage. Do not attempt out-of-scope actions.`
-    ].join(`
-`);
-    const userPrompt = [
-      `Dossier: ${stageInput.dossierKey}`,
-      `Parameters: ${JSON.stringify(stageInput.params ?? {})}`,
-      `Execute stage analysis and provide findings with evidence.`
-    ].join(`
-`);
-    try {
-      const result = await this.invoker.invoke({
-        model,
-        messages: [
-          { role: "system", content: systemPrompt },
-          { role: "user", content: userPrompt }
-        ],
-        thinkingLevel,
-        signal
-      });
-      let status = "inconclusive";
-      if (result.finishReason === "error" || result.finishReason === "length" || result.finishReason === "content-filter") {
-        status = "failed";
-      } else if (result.finishReason === "aborted") {
-        status = "blocked";
-      }
-      const summaryPrefix = status === "inconclusive" ? "[inconclusive: analysis-only, no governed tools executed] " : "";
-      return {
-        agentSessionId: stageInput.agentSessionId,
-        stageKey: stageInput.stageKey,
-        status,
-        summary: `${summaryPrefix}${result.text.slice(0, 500)}`,
-        findings: [],
-        evidence: [],
-        costUsd: result.usage.costUsd,
-        toolAttemptsThisTurn: 0,
-        toolsExecutedThisTurn: 0,
-        toolsErroredThisTurn: 0,
-        tokenUsage: {
-          inputTokens: result.usage.inputTokens,
-          outputTokens: result.usage.outputTokens,
-          reasoningTokens: result.usage.reasoningTokens ?? 0,
-          cacheReadTokens: result.usage.cacheReadTokens,
-          cacheWriteTokens: result.usage.cacheWriteTokens
-        }
-      };
-    } catch (error45) {
-      const isAborted = signal?.aborted || error45 instanceof Error && error45.name === "AbortError";
-      return {
-        agentSessionId: stageInput.agentSessionId,
-        stageKey: stageInput.stageKey,
-        status: isAborted ? "blocked" : "failed",
-        summary: `Stage execution failed: ${error45 instanceof Error ? error45.message : String(error45)}`,
-        findings: [],
-        evidence: [],
-        costUsd: 0,
-        toolAttemptsThisTurn: 0,
-        toolsExecutedThisTurn: 0,
-        toolsErroredThisTurn: 0,
-        tokenUsage: { inputTokens: 0, outputTokens: 0, reasoningTokens: 0 }
-      };
-    }
-  }
-}
-// ../core/src/headless/agent-stage-runner.ts
-import { Agent } from "@earendil-works/pi-agent-core";
-import { Type } from "@earendil-works/pi-ai";
-// ../core/src/headless/stage-session-store.ts
-class StageCheckpointConflictError extends Error {
-  constructor(message2 = "Agent Session conversation changed during Stage execution.") {
-    super(message2);
-    this.name = "StageCheckpointConflictError";
-  }
-}
-
-class InMemoryStageSessionStore {
-  conversations = new Map;
-  executions = new Map;
-  async load(identity2) {
-    const conversation = this.conversations.get(identity2.conversationKey);
-    const execution = [identity2.executionKey, ...identity2.legacyExecutionKeys ?? []].map((key) => this.executions.get(key)).find((candidate) => candidate !== undefined);
-    if (!conversation && !execution)
-      return;
-    return structuredClone({ revision: conversation?.revision ?? 0, messages: conversation?.messages ?? [], execution });
-  }
-  async commit(identity2, expectedRevision, state) {
-    const actualRevision = this.conversations.get(identity2.conversationKey)?.revision ?? 0;
-    if (actualRevision !== expectedRevision)
-      throw new StageCheckpointConflictError;
-    const revision = actualRevision + 1;
-    const { messages, ...execution } = structuredClone(state);
-    this.conversations.set(identity2.conversationKey, { revision, messages });
-    this.executions.set(identity2.executionKey, execution);
-    for (const legacyKey of identity2.legacyExecutionKeys ?? []) {
-      if (legacyKey !== identity2.executionKey)
-        this.executions.delete(legacyKey);
-    }
-    return revision;
-  }
-  async delete(identity2) {
-    for (const key of [identity2.executionKey, ...identity2.legacyExecutionKeys ?? []])
-      this.executions.delete(key);
-  }
-}
-// ../core/src/headless/sandboxed-tools.ts
-import { Type as Type2 } from "@earendil-works/pi-ai";
-
-class SandboxedBashTool {
-  sandbox;
-  name = "sandboxed_bash";
-  actionCategory = "command_execution";
-  description = "Execute a shell command inside the isolated sandbox runtime.";
-  parameters = Type2.Object({
-    command: Type2.String({ minLength: 1, description: "Shell command to execute." }),
-    timeoutMs: Type2.Optional(Type2.Number({ minimum: 1, maximum: 120000, description: "Optional execution timeout in milliseconds." }))
-  }, { additionalProperties: false });
-  constructor(sandbox) {
-    this.sandbox = sandbox;
-  }
-  async execute(params, signal) {
-    const command = typeof params.command === "string" ? params.command : "";
-    if (!command.trim()) {
-      throw new Error("Missing or empty 'command' parameter for sandboxed_bash.");
-    }
-    const timeoutMs = typeof params.timeoutMs === "number" ? params.timeoutMs : 30000;
-    const result = await this.sandbox.exec(command, { signal, timeoutMs });
-    const taskFailed = result.exitCode !== 0;
-    const evidence = {
-      description: `Executed command in microVM: ${command.slice(0, 120)}`,
-      artifactType: "sandbox_command_execution",
-      data: {
-        command,
-        exitCode: result.exitCode,
-        durationMs: result.durationMs,
-        stdoutSnippet: result.stdout.slice(0, 500),
-        stderrSnippet: result.stderr.slice(0, 500)
-      },
-      timestamp: Date.now()
-    };
-    return {
-      output: {
-        exitCode: result.exitCode,
-        stdout: result.stdout,
-        stderr: result.stderr
-      },
-      evidence,
-      taskFailed
-    };
-  }
-}
-
-class SandboxedFileReadTool {
-  sandbox;
-  name = "sandboxed_read_file";
-  actionCategory = "read_files";
-  description = "Read a UTF-8 text file from the isolated sandbox filesystem.";
-  parameters = Type2.Object({ path: Type2.String({ minLength: 1, description: "Absolute sandbox path or path beneath /workspace." }) }, { additionalProperties: false });
-  constructor(sandbox) {
-    this.sandbox = sandbox;
-  }
-  async execute(params, signal) {
-    const path5 = typeof params.path === "string" ? params.path : "";
-    if (!path5.trim()) {
-      throw new Error("Missing or empty 'path' parameter for sandboxed_read_file.");
-    }
-    const content = await this.sandbox.readFile(path5, signal);
-    const evidence = {
-      description: `Read file from microVM sandbox: ${path5}`,
-      artifactType: "sandbox_file_content",
-      data: {
-        path: path5,
-        bytes: content.length
-      },
-      timestamp: Date.now()
-    };
-    return {
-      output: { path: path5, content },
-      evidence
-    };
-  }
-}
-
-class SandboxedFileWriteTool {
-  sandbox;
-  name = "sandboxed_write_file";
-  actionCategory = "write_files";
-  description = "Write UTF-8 text content to a file in the isolated sandbox filesystem.";
-  parameters = Type2.Object({
-    path: Type2.String({ minLength: 1, description: "Absolute sandbox path or path beneath /workspace." }),
-    content: Type2.String({ description: "Complete UTF-8 content to write." })
-  }, { additionalProperties: false });
-  constructor(sandbox) {
-    this.sandbox = sandbox;
-  }
-  async execute(params, signal) {
-    const path5 = typeof params.path === "string" ? params.path : "";
-    const content = typeof params.content === "string" ? params.content : "";
-    if (!path5.trim()) {
-      throw new Error("Missing or empty 'path' parameter for sandboxed_write_file.");
-    }
-    await this.sandbox.writeFile(path5, content, signal);
-    const evidence = {
-      description: `Wrote file inside microVM sandbox: ${path5}`,
-      artifactType: "sandbox_file_write",
-      data: {
-        path: path5,
-        bytesWritten: content.length
-      },
-      timestamp: Date.now()
-    };
-    return {
-      output: { path: path5, written: true, bytes: content.length },
-      evidence
-    };
-  }
-}
 // ../core/src/headless/skill-loader.ts
 var MAX_SKILL_BODY_BYTES = 32 * 1024;
 // ../core/src/headless/governed-skill-tool.ts
-import { Type as Type3 } from "@earendil-works/pi-ai";
+import { Type } from "@earendil-works/pi-ai";
 
 class GovernedSkillTool {
   catalog;
   name = "load_skill";
   actionCategory = "skill_load";
   description = "Load the instructions for a skill explicitly bound to this stage.";
-  parameters = Type3.Object({ name: Type3.String({ minLength: 1, description: "Exact bound skill name." }) }, { additionalProperties: false });
+  parameters = Type.Object({ name: Type.String({ minLength: 1, description: "Exact bound skill name." }) }, { additionalProperties: false });
   constructor(catalog) {
     this.catalog = catalog;
   }
@@ -35435,62 +35064,6 @@ function materializeKifaruSkills(root = kifaruSkillsRoot(), skills = EMBEDDED_KI
   }
   return anyPresent ? root : null;
 }
-// ../core/src/sandbox/mock-sandbox.ts
-class MockSandboxSession {
-  options;
-  id = `mock-sandbox-${crypto.randomUUID().slice(0, 8)}`;
-  files = new Map;
-  isClosed = false;
-  executedCommands = [];
-  constructor(options = {}) {
-    this.options = options;
-  }
-  async exec(command, options) {
-    if (this.isClosed) {
-      throw new Error("Sandbox session is closed");
-    }
-    if (options?.signal?.aborted) {
-      throw new DOMException("Aborted", "AbortError");
-    }
-    this.executedCommands.push({ command, env: options?.env });
-    const started = Date.now();
-    if (command.includes("curl") || command.includes("wget")) {
-      const match = command.match(/https?:\/\/([^/\s"']+)/);
-      const targetHost = match ? match[1] : undefined;
-      if (targetHost && this.options.allowedHosts && !this.options.allowedHosts.some((allowed) => targetHost.includes(allowed))) {
-        return {
-          exitCode: 7,
-          stdout: "",
-          stderr: `curl: (7) Failed to connect to ${targetHost}: Connection refused (blocked by sandbox egress policy)`,
-          durationMs: Date.now() - started
-        };
-      }
-    }
-    return {
-      exitCode: 0,
-      stdout: `[mock-sandbox] Executed: ${command}`,
-      stderr: "",
-      durationMs: Date.now() - started
-    };
-  }
-  async readFile(path6) {
-    if (this.isClosed)
-      throw new Error("Sandbox session is closed");
-    const content = this.files.get(path6);
-    if (content === undefined) {
-      throw new Error(`File not found: ${path6}`);
-    }
-    return content;
-  }
-  async writeFile(path6, content) {
-    if (this.isClosed)
-      throw new Error("Sandbox session is closed");
-    this.files.set(path6, content);
-  }
-  async close() {
-    this.isClosed = true;
-  }
-}
 // ../core/src/model/router-deps.ts
 function makeLogger(base) {
   const format = (message2, extra) => {
@@ -66126,11 +65699,11 @@ function BaseMapping(input2) {
 function WithMapping(input2) {
   return exports_guard.IsEqual(input2.length, 2) ? input2[1] : [];
 }
-function FactorIndexArray(Type4, indexArray) {
+function FactorIndexArray(Type2, indexArray) {
   return indexArray.reduce((result, left) => {
     const _left = left;
     return exports_guard.IsEqual(_left.length, 1) ? IndexDeferred(result, _left[0]) : exports_guard.IsEqual(_left.length, 0) ? _Array_(result) : Unreachable2();
-  }, Type4);
+  }, Type2);
 }
 function FactorExtends(type, extend3) {
   return exports_guard.IsEqual(extend3.length, 3) ? ConditionalDeferred(type, extend3[0], extend3[1], extend3[2]) : type;
@@ -66631,16 +66204,16 @@ function Until_1(end, input2) {
 }
 // ../../node_modules/.bun/typebox@1.3.7/node_modules/typebox/build/type/script/parser.mjs
 var If = (result, left, right = () => []) => result.length === 2 ? left(result) : right();
-var GenericParameterExtendsEquals = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("extends", input3), ([_1, input4]) => If(Type4(input4), ([_2, input5]) => If(Const("=", input5), ([_3, input6]) => If(Type4(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [GenericParameterExtendsEqualsMapping(_0), input3]);
-var GenericParameterExtends = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("extends", input3), ([_1, input4]) => If(Type4(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericParameterExtendsMapping(_0), input3]);
-var GenericParameterEquals = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("=", input3), ([_1, input4]) => If(Type4(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericParameterEqualsMapping(_0), input3]);
+var GenericParameterExtendsEquals = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("extends", input3), ([_1, input4]) => If(Type2(input4), ([_2, input5]) => If(Const("=", input5), ([_3, input6]) => If(Type2(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [GenericParameterExtendsEqualsMapping(_0), input3]);
+var GenericParameterExtends = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("extends", input3), ([_1, input4]) => If(Type2(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericParameterExtendsMapping(_0), input3]);
+var GenericParameterEquals = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("=", input3), ([_1, input4]) => If(Type2(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericParameterEqualsMapping(_0), input3]);
 var GenericParameterIdentifier = (input2) => If(Ident(input2), ([_0, input3]) => [GenericParameterIdentifierMapping(_0), input3]);
 var GenericParameter = (input2) => If(If(GenericParameterExtendsEquals(input2), ([_0, input3]) => [_0, input3], () => If(GenericParameterExtends(input2), ([_0, input3]) => [_0, input3], () => If(GenericParameterEquals(input2), ([_0, input3]) => [_0, input3], () => If(GenericParameterIdentifier(input2), ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [GenericParameterMapping(_0), input3]);
 var GenericParameterList_0 = (input2, result = []) => If(If(GenericParameter(input2), ([_0, input3]) => If(Const(",", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => GenericParameterList_0(input3, [...result, _0]), () => [result, input2]);
 var GenericParameterList = (input2) => If(If(GenericParameterList_0(input2), ([_0, input3]) => If(If(If(GenericParameter(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [GenericParameterListMapping(_0), input3]);
 var GenericParameters = (input2) => If(If(Const("<", input2), ([_0, input3]) => If(GenericParameterList(input3), ([_1, input4]) => If(Const(">", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericParametersMapping(_0), input3]);
-var GenericCallArgumentList_0 = (input2, result = []) => If(If(Type4(input2), ([_0, input3]) => If(Const(",", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => GenericCallArgumentList_0(input3, [...result, _0]), () => [result, input2]);
-var GenericCallArgumentList = (input2) => If(If(GenericCallArgumentList_0(input2), ([_0, input3]) => If(If(If(Type4(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [GenericCallArgumentListMapping(_0), input3]);
+var GenericCallArgumentList_0 = (input2, result = []) => If(If(Type2(input2), ([_0, input3]) => If(Const(",", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => GenericCallArgumentList_0(input3, [...result, _0]), () => [result, input2]);
+var GenericCallArgumentList = (input2) => If(If(GenericCallArgumentList_0(input2), ([_0, input3]) => If(If(If(Type2(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [GenericCallArgumentListMapping(_0), input3]);
 var GenericCallArguments = (input2) => If(If(Const("<", input2), ([_0, input3]) => If(GenericCallArgumentList(input3), ([_1, input4]) => If(Const(">", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericCallArgumentsMapping(_0), input3]);
 var GenericCall = (input2) => If(If(Ident(input2), ([_0, input3]) => If(GenericCallArguments(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [GenericCallMapping(_0), input3]);
 var OptionalSemiColon = (input2) => If(If(If(Const(";", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [OptionalSemiColonMapping(_0), input3]);
@@ -66658,21 +66231,21 @@ var KeywordNever = (input2) => If(Const("never", input2), ([_0, input3]) => [Key
 var KeywordSymbol = (input2) => If(Const("symbol", input2), ([_0, input3]) => [KeywordSymbolMapping(_0), input3]);
 var KeywordVoid = (input2) => If(Const("void", input2), ([_0, input3]) => [KeywordVoidMapping(_0), input3]);
 var KeywordThis = (input2) => If(Const("this", input2), ([_0, input3]) => [KeywordThisMapping(_0), input3]);
-var TemplateInterpolate = (input2) => If(If(Const("${", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => If(Const("}", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [TemplateInterpolateMapping(_0), input3]);
+var TemplateInterpolate = (input2) => If(If(Const("${", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => If(Const("}", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [TemplateInterpolateMapping(_0), input3]);
 var TemplateSpan = (input2) => If(Until(["${", "`"], input2), ([_0, input3]) => [TemplateSpanMapping(_0), input3]);
 var TemplateBody = (input2) => If(If(If(TemplateSpan(input2), ([_0, input3]) => If(TemplateInterpolate(input3), ([_1, input4]) => If(TemplateBody(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => If(If(TemplateSpan(input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If(If(TemplateSpan(input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => []))), ([_0, input3]) => [TemplateBodyMapping(_0), input3]);
 var TemplateLiteralTypes = (input2) => If(If(Const("`", input2), ([_0, input3]) => If(TemplateBody(input3), ([_1, input4]) => If(Const("`", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [TemplateLiteralTypesMapping(_0), input3]);
 var TemplateLiteral = (input2) => If(TemplateLiteralTypes(input2), ([_0, input3]) => [TemplateLiteralMapping(_0), input3]);
-var Dependent2 = (input2) => If(If(If(Const("if", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => If(Const("then", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => If(Const("else", input6), ([_4, input7]) => If(Type4(input7), ([_5, input8]) => [[_0, _1, _2, _3, _4, _5], input8])))))), ([_0, input3]) => [_0, input3], () => If(If(Const("if", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => If(Const("then", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [DependentMapping(_0), input3]);
+var Dependent2 = (input2) => If(If(If(Const("if", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => If(Const("then", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => If(Const("else", input6), ([_4, input7]) => If(Type2(input7), ([_5, input8]) => [[_0, _1, _2, _3, _4, _5], input8])))))), ([_0, input3]) => [_0, input3], () => If(If(Const("if", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => If(Const("then", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [DependentMapping(_0), input3]);
 var LiteralBigInt = (input2) => If(BigInt3(input2), ([_0, input3]) => [LiteralBigIntMapping(_0), input3]);
 var LiteralBoolean = (input2) => If(If(Const("true", input2), ([_0, input3]) => [_0, input3], () => If(Const("false", input2), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [LiteralBooleanMapping(_0), input3]);
 var LiteralNumber = (input2) => If(Number3(input2), ([_0, input3]) => [LiteralNumberMapping(_0), input3]);
 var LiteralString = (input2) => If(String3(["'", '"'], input2), ([_0, input3]) => [LiteralStringMapping(_0), input3]);
 var KeyOf = (input2) => If(If(If(Const("keyof", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [KeyOfMapping(_0), input3]);
-var IndexArray_0 = (input2, result = []) => If(If(If(Const("[", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => If(Const("]", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => If(If(Const("[", input2), ([_0, input3]) => If(Const("]", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => IndexArray_0(input3, [...result, _0]), () => [result, input2]);
+var IndexArray_0 = (input2, result = []) => If(If(If(Const("[", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => If(Const("]", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => If(If(Const("[", input2), ([_0, input3]) => If(Const("]", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => IndexArray_0(input3, [...result, _0]), () => [result, input2]);
 var IndexArray = (input2) => If(IndexArray_0(input2), ([_0, input3]) => [IndexArrayMapping(_0), input3]);
-var Extends2 = (input2) => If(If(If(Const("extends", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => If(Const("?", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => If(Const(":", input6), ([_4, input7]) => If(Type4(input7), ([_5, input8]) => [[_0, _1, _2, _3, _4, _5], input8])))))), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [ExtendsMapping(_0), input3]);
-var Base = (input2) => If(If(If(Const("(", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => If(Const(")", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => If(KeywordString(input2), ([_0, input3]) => [_0, input3], () => If(KeywordNumber(input2), ([_0, input3]) => [_0, input3], () => If(KeywordBoolean(input2), ([_0, input3]) => [_0, input3], () => If(KeywordUndefined(input2), ([_0, input3]) => [_0, input3], () => If(KeywordNull(input2), ([_0, input3]) => [_0, input3], () => If(KeywordInteger(input2), ([_0, input3]) => [_0, input3], () => If(KeywordBigInt(input2), ([_0, input3]) => [_0, input3], () => If(KeywordUnknown(input2), ([_0, input3]) => [_0, input3], () => If(KeywordAny(input2), ([_0, input3]) => [_0, input3], () => If(KeywordObject(input2), ([_0, input3]) => [_0, input3], () => If(KeywordNever(input2), ([_0, input3]) => [_0, input3], () => If(KeywordSymbol(input2), ([_0, input3]) => [_0, input3], () => If(KeywordVoid(input2), ([_0, input3]) => [_0, input3], () => If(KeywordThis(input2), ([_0, input3]) => [_0, input3], () => If(LiteralBigInt(input2), ([_0, input3]) => [_0, input3], () => If(LiteralBoolean(input2), ([_0, input3]) => [_0, input3], () => If(LiteralNumber(input2), ([_0, input3]) => [_0, input3], () => If(LiteralString(input2), ([_0, input3]) => [_0, input3], () => If(TemplateLiteral(input2), ([_0, input3]) => [_0, input3], () => If(Dependent2(input2), ([_0, input3]) => [_0, input3], () => If(_Object_2(input2), ([_0, input3]) => [_0, input3], () => If(_Tuple_(input2), ([_0, input3]) => [_0, input3], () => If(_Constructor_(input2), ([_0, input3]) => [_0, input3], () => If(_Function_2(input2), ([_0, input3]) => [_0, input3], () => If(_Mapped_(input2), ([_0, input3]) => [_0, input3], () => If(GenericCall(input2), ([_0, input3]) => [_0, input3], () => If(Reference(input2), ([_0, input3]) => [_0, input3], () => [])))))))))))))))))))))))))))), ([_0, input3]) => [BaseMapping(_0), input3]);
+var Extends2 = (input2) => If(If(If(Const("extends", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => If(Const("?", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => If(Const(":", input6), ([_4, input7]) => If(Type2(input7), ([_5, input8]) => [[_0, _1, _2, _3, _4, _5], input8])))))), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [ExtendsMapping(_0), input3]);
+var Base = (input2) => If(If(If(Const("(", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => If(Const(")", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => If(KeywordString(input2), ([_0, input3]) => [_0, input3], () => If(KeywordNumber(input2), ([_0, input3]) => [_0, input3], () => If(KeywordBoolean(input2), ([_0, input3]) => [_0, input3], () => If(KeywordUndefined(input2), ([_0, input3]) => [_0, input3], () => If(KeywordNull(input2), ([_0, input3]) => [_0, input3], () => If(KeywordInteger(input2), ([_0, input3]) => [_0, input3], () => If(KeywordBigInt(input2), ([_0, input3]) => [_0, input3], () => If(KeywordUnknown(input2), ([_0, input3]) => [_0, input3], () => If(KeywordAny(input2), ([_0, input3]) => [_0, input3], () => If(KeywordObject(input2), ([_0, input3]) => [_0, input3], () => If(KeywordNever(input2), ([_0, input3]) => [_0, input3], () => If(KeywordSymbol(input2), ([_0, input3]) => [_0, input3], () => If(KeywordVoid(input2), ([_0, input3]) => [_0, input3], () => If(KeywordThis(input2), ([_0, input3]) => [_0, input3], () => If(LiteralBigInt(input2), ([_0, input3]) => [_0, input3], () => If(LiteralBoolean(input2), ([_0, input3]) => [_0, input3], () => If(LiteralNumber(input2), ([_0, input3]) => [_0, input3], () => If(LiteralString(input2), ([_0, input3]) => [_0, input3], () => If(TemplateLiteral(input2), ([_0, input3]) => [_0, input3], () => If(Dependent2(input2), ([_0, input3]) => [_0, input3], () => If(_Object_2(input2), ([_0, input3]) => [_0, input3], () => If(_Tuple_(input2), ([_0, input3]) => [_0, input3], () => If(_Constructor_(input2), ([_0, input3]) => [_0, input3], () => If(_Function_2(input2), ([_0, input3]) => [_0, input3], () => If(_Mapped_(input2), ([_0, input3]) => [_0, input3], () => If(GenericCall(input2), ([_0, input3]) => [_0, input3], () => If(Reference(input2), ([_0, input3]) => [_0, input3], () => [])))))))))))))))))))))))))))), ([_0, input3]) => [BaseMapping(_0), input3]);
 var With = (input2) => If(If(If(Const("with", input2), ([_0, input3]) => If(WithObject(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [WithMapping(_0), input3]);
 var Factor = (input2) => If(If(KeyOf(input2), ([_0, input3]) => If(Base(input3), ([_1, input4]) => If(IndexArray(input4), ([_2, input5]) => If(Extends2(input5), ([_3, input6]) => If(With(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [FactorMapping(_0), input3]);
 var ExprTermTail = (input2) => If(If(If(Const("&", input2), ([_0, input3]) => If(Factor(input3), ([_1, input4]) => If(ExprTermTail(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [ExprTermTailMapping(_0), input3]);
@@ -66681,9 +66254,9 @@ var ExprTail = (input2) => If(If(If(Const("|", input2), ([_0, input3]) => If(Exp
 var Expr = (input2) => If(If(ExprTerm(input2), ([_0, input3]) => If(ExprTail(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ExprMapping(_0), input3]);
 var ExprReadonly = (input2) => If(If(Const("readonly", input2), ([_0, input3]) => If(Expr(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ExprReadonlyMapping(_0), input3]);
 var ExprPipe = (input2) => If(If(Const("|", input2), ([_0, input3]) => If(Expr(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ExprPipeMapping(_0), input3]);
-var GenericType = (input2) => If(If(GenericParameters(input2), ([_0, input3]) => If(Const("=", input3), ([_1, input4]) => If(Type4(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericTypeMapping(_0), input3]);
+var GenericType = (input2) => If(If(GenericParameters(input2), ([_0, input3]) => If(Const("=", input3), ([_1, input4]) => If(Type2(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [GenericTypeMapping(_0), input3]);
 var InferType = (input2) => If(If(If(Const("infer", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => If(Const("extends", input4), ([_2, input5]) => If(Expr(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [_0, input3], () => If(If(Const("infer", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [InferTypeMapping(_0), input3]);
-var Type4 = (input2) => If(If(InferType(input2), ([_0, input3]) => [_0, input3], () => If(ExprPipe(input2), ([_0, input3]) => [_0, input3], () => If(ExprReadonly(input2), ([_0, input3]) => [_0, input3], () => If(Expr(input2), ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [TypeMapping(_0), input3]);
+var Type2 = (input2) => If(If(InferType(input2), ([_0, input3]) => [_0, input3], () => If(ExprPipe(input2), ([_0, input3]) => [_0, input3], () => If(ExprReadonly(input2), ([_0, input3]) => [_0, input3], () => If(Expr(input2), ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [TypeMapping(_0), input3]);
 var PropertyKeyNumber = (input2) => If(Number3(input2), ([_0, input3]) => [PropertyKeyNumberMapping(_0), input3]);
 var PropertyKeyIdent = (input2) => If(Ident(input2), ([_0, input3]) => [PropertyKeyIdentMapping(_0), input3]);
 var PropertyKeyQuoted = (input2) => If(String3(["'", '"'], input2), ([_0, input3]) => [PropertyKeyQuotedMapping(_0), input3]);
@@ -66691,7 +66264,7 @@ var PropertyKeyIndex = (input2) => If(If(Const("[", input2), ([_0, input3]) => I
 var PropertyKey = (input2) => If(If(PropertyKeyNumber(input2), ([_0, input3]) => [_0, input3], () => If(PropertyKeyIdent(input2), ([_0, input3]) => [_0, input3], () => If(PropertyKeyQuoted(input2), ([_0, input3]) => [_0, input3], () => If(PropertyKeyIndex(input2), ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [PropertyKeyMapping(_0), input3]);
 var Readonly2 = (input2) => If(If(If(Const("readonly", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [ReadonlyMapping(_0), input3]);
 var Optional3 = (input2) => If(If(If(Const("?", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [OptionalMapping(_0), input3]);
-var Property = (input2) => If(If(Readonly2(input2), ([_0, input3]) => If(PropertyKey(input3), ([_1, input4]) => If(Optional3(input4), ([_2, input5]) => If(Const(":", input5), ([_3, input6]) => If(Type4(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [PropertyMapping(_0), input3]);
+var Property = (input2) => If(If(Readonly2(input2), ([_0, input3]) => If(PropertyKey(input3), ([_1, input4]) => If(Optional3(input4), ([_2, input5]) => If(Const(":", input5), ([_3, input6]) => If(Type2(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [PropertyMapping(_0), input3]);
 var PropertyDelimiter = (input2) => If(If(If(Const(",", input2), ([_0, input3]) => If(Const(`
 `, input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(Const(";", input2), ([_0, input3]) => If(Const(`
 `, input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(Const(",", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If(If(Const(";", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If(If(Const(`
@@ -66700,29 +66273,29 @@ var PropertyList_0 = (input2, result = []) => If(If(Property(input2), ([_0, inpu
 var PropertyList = (input2) => If(If(PropertyList_0(input2), ([_0, input3]) => If(If(If(Property(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [PropertyListMapping(_0), input3]);
 var Properties = (input2) => If(If(Const("{", input2), ([_0, input3]) => If(PropertyList(input3), ([_1, input4]) => If(Const("}", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [PropertiesMapping(_0), input3]);
 var _Object_2 = (input2) => If(Properties(input2), ([_0, input3]) => [_Object_Mapping(_0), input3]);
-var ElementNamed = (input2) => If(If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Const("readonly", input5), ([_3, input6]) => If(Type4(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [_0, input3], () => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Const("readonly", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [_0, input3], () => If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [_0, input3], () => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Type4(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [ElementNamedMapping(_0), input3]);
-var ElementReadonlyOptional = (input2) => If(If(Const("readonly", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => If(Const("?", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [ElementReadonlyOptionalMapping(_0), input3]);
-var ElementReadonly = (input2) => If(If(Const("readonly", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ElementReadonlyMapping(_0), input3]);
-var ElementOptional = (input2) => If(If(Type4(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ElementOptionalMapping(_0), input3]);
-var ElementBase = (input2) => If(If(ElementNamed(input2), ([_0, input3]) => [_0, input3], () => If(ElementReadonlyOptional(input2), ([_0, input3]) => [_0, input3], () => If(ElementReadonly(input2), ([_0, input3]) => [_0, input3], () => If(ElementOptional(input2), ([_0, input3]) => [_0, input3], () => If(Type4(input2), ([_0, input3]) => [_0, input3], () => []))))), ([_0, input3]) => [ElementBaseMapping(_0), input3]);
+var ElementNamed = (input2) => If(If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Const("readonly", input5), ([_3, input6]) => If(Type2(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [_0, input3], () => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Const("readonly", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [_0, input3], () => If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [_0, input3], () => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Type2(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [ElementNamedMapping(_0), input3]);
+var ElementReadonlyOptional = (input2) => If(If(Const("readonly", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => If(Const("?", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [ElementReadonlyOptionalMapping(_0), input3]);
+var ElementReadonly = (input2) => If(If(Const("readonly", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ElementReadonlyMapping(_0), input3]);
+var ElementOptional = (input2) => If(If(Type2(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ElementOptionalMapping(_0), input3]);
+var ElementBase = (input2) => If(If(ElementNamed(input2), ([_0, input3]) => [_0, input3], () => If(ElementReadonlyOptional(input2), ([_0, input3]) => [_0, input3], () => If(ElementReadonly(input2), ([_0, input3]) => [_0, input3], () => If(ElementOptional(input2), ([_0, input3]) => [_0, input3], () => If(Type2(input2), ([_0, input3]) => [_0, input3], () => []))))), ([_0, input3]) => [ElementBaseMapping(_0), input3]);
 var Element = (input2) => If(If(If(Const("...", input2), ([_0, input3]) => If(ElementBase(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(ElementBase(input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [ElementMapping(_0), input3]);
 var ElementList_0 = (input2, result = []) => If(If(Element(input2), ([_0, input3]) => If(Const(",", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => ElementList_0(input3, [...result, _0]), () => [result, input2]);
 var ElementList = (input2) => If(If(ElementList_0(input2), ([_0, input3]) => If(If(If(Element(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ElementListMapping(_0), input3]);
 var _Tuple_ = (input2) => If(If(Const("[", input2), ([_0, input3]) => If(ElementList(input3), ([_1, input4]) => If(Const("]", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [_Tuple_Mapping(_0), input3]);
-var ParameterReadonlyOptional = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Const("readonly", input5), ([_3, input6]) => If(Type4(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [ParameterReadonlyOptionalMapping(_0), input3]);
-var ParameterReadonly = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Const("readonly", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [ParameterReadonlyMapping(_0), input3]);
-var ParameterOptional = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [ParameterOptionalMapping(_0), input3]);
-var ParameterType = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Type4(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [ParameterTypeMapping(_0), input3]);
+var ParameterReadonlyOptional = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Const("readonly", input5), ([_3, input6]) => If(Type2(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [ParameterReadonlyOptionalMapping(_0), input3]);
+var ParameterReadonly = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Const("readonly", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [ParameterReadonlyMapping(_0), input3]);
+var ParameterOptional = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => If(Const(":", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [ParameterOptionalMapping(_0), input3]);
+var ParameterType = (input2) => If(If(Ident(input2), ([_0, input3]) => If(Const(":", input3), ([_1, input4]) => If(Type2(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [ParameterTypeMapping(_0), input3]);
 var ParameterBase = (input2) => If(If(ParameterReadonlyOptional(input2), ([_0, input3]) => [_0, input3], () => If(ParameterReadonly(input2), ([_0, input3]) => [_0, input3], () => If(ParameterOptional(input2), ([_0, input3]) => [_0, input3], () => If(ParameterType(input2), ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [ParameterBaseMapping(_0), input3]);
 var Parameter2 = (input2) => If(If(If(Const("...", input2), ([_0, input3]) => If(ParameterBase(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(ParameterBase(input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [ParameterMapping(_0), input3]);
 var ParameterList_0 = (input2, result = []) => If(If(Parameter2(input2), ([_0, input3]) => If(Const(",", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => ParameterList_0(input3, [...result, _0]), () => [result, input2]);
 var ParameterList = (input2) => If(If(ParameterList_0(input2), ([_0, input3]) => If(If(If(Parameter2(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ParameterListMapping(_0), input3]);
-var _Function_2 = (input2) => If(If(Const("(", input2), ([_0, input3]) => If(ParameterList(input3), ([_1, input4]) => If(Const(")", input4), ([_2, input5]) => If(Const("=>", input5), ([_3, input6]) => If(Type4(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [_Function_Mapping(_0), input3]);
-var _Constructor_ = (input2) => If(If(Const("new", input2), ([_0, input3]) => If(Const("(", input3), ([_1, input4]) => If(ParameterList(input4), ([_2, input5]) => If(Const(")", input5), ([_3, input6]) => If(Const("=>", input6), ([_4, input7]) => If(Type4(input7), ([_5, input8]) => [[_0, _1, _2, _3, _4, _5], input8])))))), ([_0, input3]) => [_Constructor_Mapping(_0), input3]);
+var _Function_2 = (input2) => If(If(Const("(", input2), ([_0, input3]) => If(ParameterList(input3), ([_1, input4]) => If(Const(")", input4), ([_2, input5]) => If(Const("=>", input5), ([_3, input6]) => If(Type2(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [_Function_Mapping(_0), input3]);
+var _Constructor_ = (input2) => If(If(Const("new", input2), ([_0, input3]) => If(Const("(", input3), ([_1, input4]) => If(ParameterList(input4), ([_2, input5]) => If(Const(")", input5), ([_3, input6]) => If(Const("=>", input6), ([_4, input7]) => If(Type2(input7), ([_5, input8]) => [[_0, _1, _2, _3, _4, _5], input8])))))), ([_0, input3]) => [_Constructor_Mapping(_0), input3]);
 var MappedReadonly = (input2) => If(If(If(Const("+", input2), ([_0, input3]) => If(Const("readonly", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(Const("-", input2), ([_0, input3]) => If(Const("readonly", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(Const("readonly", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [MappedReadonlyMapping(_0), input3]);
 var MappedOptional = (input2) => If(If(If(Const("+", input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(Const("-", input2), ([_0, input3]) => If(Const("?", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(Const("?", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])))), ([_0, input3]) => [MappedOptionalMapping(_0), input3]);
-var MappedAs = (input2) => If(If(If(Const("as", input2), ([_0, input3]) => If(Type4(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [MappedAsMapping(_0), input3]);
-var _Mapped_ = (input2) => If(If(Const("{", input2), ([_0, input3]) => If(MappedReadonly(input3), ([_1, input4]) => If(Const("[", input4), ([_2, input5]) => If(Ident(input5), ([_3, input6]) => If(Const("in", input6), ([_4, input7]) => If(Type4(input7), ([_5, input8]) => If(MappedAs(input8), ([_6, input9]) => If(Const("]", input9), ([_7, input10]) => If(MappedOptional(input10), ([_8, input11]) => If(Const(":", input11), ([_9, input12]) => If(Type4(input12), ([_10, input13]) => If(OptionalSemiColon(input13), ([_11, input14]) => If(Const("}", input14), ([_12, input15]) => [[_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12], input15]))))))))))))), ([_0, input3]) => [_Mapped_Mapping(_0), input3]);
+var MappedAs = (input2) => If(If(If(Const("as", input2), ([_0, input3]) => If(Type2(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [MappedAsMapping(_0), input3]);
+var _Mapped_ = (input2) => If(If(Const("{", input2), ([_0, input3]) => If(MappedReadonly(input3), ([_1, input4]) => If(Const("[", input4), ([_2, input5]) => If(Ident(input5), ([_3, input6]) => If(Const("in", input6), ([_4, input7]) => If(Type2(input7), ([_5, input8]) => If(MappedAs(input8), ([_6, input9]) => If(Const("]", input9), ([_7, input10]) => If(MappedOptional(input10), ([_8, input11]) => If(Const(":", input11), ([_9, input12]) => If(Type2(input12), ([_10, input13]) => If(OptionalSemiColon(input13), ([_11, input14]) => If(Const("}", input14), ([_12, input15]) => [[_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12], input15]))))))))))))), ([_0, input3]) => [_Mapped_Mapping(_0), input3]);
 var Reference = (input2) => If(Ident(input2), ([_0, input3]) => [ReferenceMapping(_0), input3]);
 var WithBigInt = (input2) => If(BigInt3(input2), ([_0, input3]) => [WithBigIntMapping(_0), input3]);
 var WithNumber = (input2) => If(Number3(input2), ([_0, input3]) => [WithNumberMapping(_0), input3]);
@@ -66750,13 +66323,13 @@ var PatternUnion = (input2) => If(If(If(PatternTerm(input2), ([_0, input3]) => I
 var PatternTerm = (input2) => If(If(PatternBase(input2), ([_0, input3]) => If(PatternBody(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [PatternTermMapping(_0), input3]);
 var PatternBody = (input2) => If(If(PatternUnion(input2), ([_0, input3]) => [_0, input3], () => If(PatternTerm(input2), ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [PatternBodyMapping(_0), input3]);
 var Pattern = (input2) => If(If(Const("^", input2), ([_0, input3]) => If(PatternBody(input3), ([_1, input4]) => If(Const("$", input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [PatternMapping(_0), input3]);
-var InterfaceDeclarationHeritageList_0 = (input2, result = []) => If(If(Type4(input2), ([_0, input3]) => If(Const(",", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => InterfaceDeclarationHeritageList_0(input3, [...result, _0]), () => [result, input2]);
-var InterfaceDeclarationHeritageList = (input2) => If(If(InterfaceDeclarationHeritageList_0(input2), ([_0, input3]) => If(If(If(Type4(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [InterfaceDeclarationHeritageListMapping(_0), input3]);
+var InterfaceDeclarationHeritageList_0 = (input2, result = []) => If(If(Type2(input2), ([_0, input3]) => If(Const(",", input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => InterfaceDeclarationHeritageList_0(input3, [...result, _0]), () => [result, input2]);
+var InterfaceDeclarationHeritageList = (input2) => If(If(InterfaceDeclarationHeritageList_0(input2), ([_0, input3]) => If(If(If(Type2(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [InterfaceDeclarationHeritageListMapping(_0), input3]);
 var InterfaceDeclarationHeritage = (input2) => If(If(If(Const("extends", input2), ([_0, input3]) => If(InterfaceDeclarationHeritageList(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [InterfaceDeclarationHeritageMapping(_0), input3]);
 var InterfaceDeclarationGeneric = (input2) => If(If(Const("interface", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => If(GenericParameters(input4), ([_2, input5]) => If(InterfaceDeclarationHeritage(input5), ([_3, input6]) => If(Properties(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [InterfaceDeclarationGenericMapping(_0), input3]);
 var InterfaceDeclaration = (input2) => If(If(Const("interface", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => If(InterfaceDeclarationHeritage(input4), ([_2, input5]) => If(Properties(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [InterfaceDeclarationMapping(_0), input3]);
-var TypeAliasDeclarationGeneric = (input2) => If(If(Const("type", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => If(GenericParameters(input4), ([_2, input5]) => If(Const("=", input5), ([_3, input6]) => If(Type4(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [TypeAliasDeclarationGenericMapping(_0), input3]);
-var TypeAliasDeclaration = (input2) => If(If(Const("type", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => If(Const("=", input4), ([_2, input5]) => If(Type4(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [TypeAliasDeclarationMapping(_0), input3]);
+var TypeAliasDeclarationGeneric = (input2) => If(If(Const("type", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => If(GenericParameters(input4), ([_2, input5]) => If(Const("=", input5), ([_3, input6]) => If(Type2(input6), ([_4, input7]) => [[_0, _1, _2, _3, _4], input7]))))), ([_0, input3]) => [TypeAliasDeclarationGenericMapping(_0), input3]);
+var TypeAliasDeclaration = (input2) => If(If(Const("type", input2), ([_0, input3]) => If(Ident(input3), ([_1, input4]) => If(Const("=", input4), ([_2, input5]) => If(Type2(input5), ([_3, input6]) => [[_0, _1, _2, _3], input6])))), ([_0, input3]) => [TypeAliasDeclarationMapping(_0), input3]);
 var ExportKeyword = (input2) => If(If(If(Const("export", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If([[], input2], ([_0, input3]) => [_0, input3], () => [])), ([_0, input3]) => [ExportKeywordMapping(_0), input3]);
 var ModuleDeclarationDelimiter = (input2) => If(If(If(Const(";", input2), ([_0, input3]) => If(Const(`
 `, input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [_0, input3], () => If(If(Const(";", input2), ([_0, input3]) => [[_0], input3]), ([_0, input3]) => [_0, input3], () => If(If(Const(`
@@ -66765,7 +66338,7 @@ var ModuleDeclarationList_0 = (input2, result = []) => If(If(ModuleDeclaration(i
 var ModuleDeclarationList = (input2) => If(If(ModuleDeclarationList_0(input2), ([_0, input3]) => If(If(If(ModuleDeclaration(input3), ([_02, input4]) => [[_02], input4]), ([_02, input4]) => [_02, input4], () => If([[], input3], ([_02, input4]) => [_02, input4], () => [])), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ModuleDeclarationListMapping(_0), input3]);
 var ModuleDeclaration = (input2) => If(If(ExportKeyword(input2), ([_0, input3]) => If(If(InterfaceDeclarationGeneric(input3), ([_02, input4]) => [_02, input4], () => If(InterfaceDeclaration(input3), ([_02, input4]) => [_02, input4], () => If(TypeAliasDeclarationGeneric(input3), ([_02, input4]) => [_02, input4], () => If(TypeAliasDeclaration(input3), ([_02, input4]) => [_02, input4], () => [])))), ([_1, input4]) => If(OptionalSemiColon(input4), ([_2, input5]) => [[_0, _1, _2], input5]))), ([_0, input3]) => [ModuleDeclarationMapping(_0), input3]);
 var Module = (input2) => If(If(ModuleDeclaration(input2), ([_0, input3]) => If(ModuleDeclarationList(input3), ([_1, input4]) => [[_0, _1], input4])), ([_0, input3]) => [ModuleMapping(_0), input3]);
-var Script = (input2) => If(If(Module(input2), ([_0, input3]) => [_0, input3], () => If(GenericType(input2), ([_0, input3]) => [_0, input3], () => If(Type4(input2), ([_0, input3]) => [_0, input3], () => []))), ([_0, input3]) => [ScriptMapping(_0), input3]);
+var Script = (input2) => If(If(Module(input2), ([_0, input3]) => [_0, input3], () => If(GenericType(input2), ([_0, input3]) => [_0, input3], () => If(Type2(input2), ([_0, input3]) => [_0, input3], () => []))), ([_0, input3]) => [ScriptMapping(_0), input3]);
 
 // ../../node_modules/.bun/typebox@1.3.7/node_modules/typebox/build/type/engine/patterns/template.mjs
 function ParseTemplateIntoTypes(template) {
@@ -68822,14 +68395,35 @@ class WorkbenchAgentService {
   modelRefs = [];
   cwd;
   skillsPath;
+  registryPath;
+  saved;
+  opening = new Map;
+  runEpoch = crypto.randomUUID();
   constructor(config3, catalog, platform, modelRuntime, modelRefs) {
     this.config = config3;
     this.catalog = catalog;
     this.platform = platform;
     this.modelRuntime = modelRuntime;
     this.modelRefs = modelRefs;
-    this.cwd = config3.workbenchCwd;
+    fs8.mkdirSync(config3.workbenchCwd, { recursive: true });
+    this.cwd = fs8.realpathSync(config3.workbenchCwd);
     this.skillsPath = materializeKifaruSkills();
+    this.registryPath = path6.join(getAgentDir(), "workbench-conversations.json");
+    this.saved = fs8.existsSync(this.registryPath) ? JSON.parse(fs8.readFileSync(this.registryPath, "utf8")) : [];
+    for (const saved of this.saved) {
+      for (const status of ["queued", "running"]) {
+        while (true) {
+          const { runs: runs2 } = this.platform.listRuns(saved.actor.workspaceID, { sessionId: saved.id, status });
+          if (!runs2.length)
+            break;
+          for (const run of runs2) {
+            this.platform.transitionRun(saved.actor.workspaceID, run.id, "cancelled", {
+              error: { reason: "workbench_process_interrupted" }
+            });
+          }
+        }
+      }
+    }
   }
   static async create(config3, catalog, platform) {
     const openaiDescriptorIDs = [];
@@ -68897,9 +68491,14 @@ class WorkbenchAgentService {
     const selected = chosen ?? this.modelRefs[0];
     return `${selected.provider}/${selected.model}`;
   }
-  async listSessions() {
+  async listSessions(actor) {
     const infos = await SessionManager.list(this.cwd);
-    return infos.map((info) => ({
+    return infos.filter((info) => {
+      if (!isSharedSessionPath(info.path))
+        return false;
+      const saved = this.saved.find((item) => item.sessionPath === fs8.realpathSync(info.path));
+      return saved ? saved.cwd === this.cwd && saved.actor.workspaceID === actor.workspaceID : actor.workspaceID === this.config.defaultWorkspaceId;
+    }).map((info) => ({
       id: info.id,
       path: info.path,
       title: info.name || info.firstMessage.slice(0, 80) || "Untitled session",
@@ -68922,12 +68521,14 @@ class WorkbenchAgentService {
           appendSystemPrompt: [WORKBENCH_SYSTEM_PROMPT]
         }
       });
-      const hasExistingMessages = sessionManager.buildSessionContext().messages.length > 0;
+      const context2 = sessionManager.buildSessionContext();
+      const recordedModel = context2.model ? this.modelRuntime.getModel(context2.model.provider, context2.model.modelId) : undefined;
       const session = await createAgentSessionFromServices({
         services,
         sessionManager,
         sessionStartEvent,
-        ...hasExistingMessages ? {} : { model: this.resolveModel(modelRef), thinkingLevel: "off" },
+        model: recordedModel ?? this.resolveModel(modelRef),
+        ...context2.messages.length ? {} : { thinkingLevel: "off" },
         scopedModels: this.modelRefs.map((ref3) => this.modelRuntime.getModel(ref3.provider, ref3.model)).filter((model) => Boolean(model)).map((model) => ({ model })),
         tools: FULL_PI_TOOLSET,
         customTools: [this.reportFindingTool(conversationId)]
@@ -68936,26 +68537,93 @@ class WorkbenchAgentService {
     };
   }
   async createConversation(actor, modelRef) {
-    const id = `wb-${crypto.randomUUID().slice(0, 8)}`;
-    const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(id, modelRef ?? ""), {
+    const manager = SessionManager.create(this.cwd);
+    const sessionPath = manager.getSessionFile();
+    fs8.writeFileSync(sessionPath, `${JSON.stringify(manager.getHeader())}
+`, { flag: "wx", mode: 384 });
+    this.remember({
+      id: `wb-${crypto.randomUUID()}`,
+      sessionID: manager.getSessionId(),
+      sessionPath: fs8.realpathSync(sessionPath),
       cwd: this.cwd,
-      agentDir: getAgentDir(),
-      sessionManager: SessionManager.create(this.cwd)
+      actor
     });
-    return this.adoptRuntime(id, runtime, actor, modelRef ?? null);
+    return this.resumeConversation(actor, sessionPath, modelRef);
   }
   async resumeConversation(actor, sessionPath, modelRef) {
     if (!isSharedSessionPath(sessionPath)) {
       throw new Error("Session path is outside the shared session store.");
     }
-    const id = `wb-${crypto.randomUUID().slice(0, 8)}`;
-    const sessionManager = SessionManager.open(sessionPath, undefined, this.cwd);
-    const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(id, modelRef ?? ""), {
-      cwd: this.cwd,
-      agentDir: getAgentDir(),
-      sessionManager
-    });
-    return this.adoptRuntime(id, runtime, actor, modelRef ?? null);
+    const canonical = fs8.realpathSync(sessionPath);
+    let saved = this.saved.find((item) => item.sessionPath === canonical);
+    if (!saved && actor.workspaceID !== this.config.defaultWorkspaceId) {
+      throw new Error("This conversation belongs to another workspace.");
+    }
+    if (saved) {
+      this.checkSavedAccess(saved, actor);
+      const existing = this.conversations.get(saved.id);
+      if (existing)
+        return existing;
+      const pending = this.opening.get(canonical);
+      if (pending)
+        return pending;
+    }
+    const sessionManager = SessionManager.open(canonical);
+    if (fs8.realpathSync(sessionManager.getCwd()) !== this.cwd) {
+      throw new Error("Session belongs to another working directory.");
+    }
+    if (!saved) {
+      saved = {
+        id: `wb-${crypto.randomUUID()}`,
+        sessionID: sessionManager.getSessionId(),
+        sessionPath: canonical,
+        cwd: this.cwd,
+        actor
+      };
+      this.remember(saved);
+    }
+    if (saved.sessionID !== sessionManager.getSessionId())
+      throw new Error("Session identity has changed.");
+    const owner = saved;
+    const operation = (async () => {
+      const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(owner.id, modelRef ?? ""), {
+        cwd: this.cwd,
+        agentDir: getAgentDir(),
+        sessionManager
+      });
+      return this.adoptRuntime(owner.id, runtime, owner.actor, modelRef ?? null);
+    })();
+    this.opening.set(canonical, operation);
+    try {
+      return await operation;
+    } finally {
+      this.opening.delete(canonical);
+    }
+  }
+  remember(saved) {
+    fs8.mkdirSync(path6.dirname(this.registryPath), { recursive: true });
+    const temporary = `${this.registryPath}.tmp`;
+    fs8.writeFileSync(temporary, JSON.stringify([...this.saved, saved]), { mode: 384 });
+    fs8.renameSync(temporary, this.registryPath);
+    this.saved.push(saved);
+  }
+  checkSavedAccess(saved, actor) {
+    if (saved.actor.workspaceID !== actor.workspaceID || saved.cwd !== this.cwd) {
+      throw new Error("This conversation belongs to another workspace.");
+    }
+  }
+  async reconnectConversation(actor, id) {
+    const existing = this.conversations.get(id);
+    if (existing) {
+      if (!this.canAccess(existing, actor))
+        throw new Error("This conversation belongs to another workspace.");
+      return existing;
+    }
+    const saved = this.saved.find((item) => item.id === id);
+    if (!saved)
+      return;
+    this.checkSavedAccess(saved, actor);
+    return this.resumeConversation(actor, saved.sessionPath);
   }
   adoptRuntime(id, runtime, actor, modelRef) {
     const conversation = {
@@ -68964,7 +68632,7 @@ class WorkbenchAgentService {
       session: runtime.session,
       unsubscribe: () => {},
       title: "New conversation",
-      modelRef: this.modelRefOf(modelRef),
+      modelRef: runtime.session.model ? `${runtime.session.model.provider}/${runtime.session.model.id}` : this.modelRefOf(modelRef),
       tools: new Map,
       findingCount: 0,
       revision: 0,
@@ -69056,10 +68724,12 @@ class WorkbenchAgentService {
     const chosen = this.modelRefs.find((candidate) => `${candidate.provider}/${candidate.model}` === modelRef);
     if (!chosen)
       return;
-    conversation.modelRef = modelRef;
+    if (conversation.session.isStreaming)
+      throw new Error("Cannot change models while streaming.");
     const model = this.resolveModel(modelRef);
-    if (model && !conversation.session.isStreaming) {
-      await conversation.session.setModel?.(model);
+    if (model) {
+      await conversation.session.setModel(model);
+      conversation.modelRef = `${conversation.session.model.provider}/${conversation.session.model.id}`;
     }
     conversation.revision += 1;
   }
@@ -69075,7 +68745,7 @@ class WorkbenchAgentService {
         kind: "hunt",
         title: `Live workspace \xB7 ${conversation.title}`.slice(0, 240),
         configuration: { surface: "workbench", cwd: this.cwd },
-        idempotencyKey: `workbench-${conversation.id}-${conversation.runCycle}`
+        idempotencyKey: `workbench-${conversation.id}-${this.runEpoch}-${conversation.runCycle}`
       });
       conversation.runID = run.id;
       this.platform.transitionRun(conversation.actor.workspaceID, run.id, "running");
@@ -69164,9 +68834,13 @@ class WorkbenchAgentService {
   }
 }
 function isSharedSessionPath(sessionPath) {
-  const resolved = path6.resolve(sessionPath);
-  const root = path6.resolve(getAgentDir(), "sessions");
-  return resolved.endsWith(".jsonl") && resolved.startsWith(root + path6.sep);
+  try {
+    const resolved = fs8.realpathSync(sessionPath);
+    const root = fs8.realpathSync(path6.join(getAgentDir(), "sessions"));
+    return resolved.endsWith(".jsonl") && resolved.startsWith(root + path6.sep) && fs8.statSync(resolved).isFile();
+  } catch {
+    return false;
+  }
 }
 function slugify2(value) {
   return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 80);
@@ -69253,7 +68927,7 @@ function workbenchSocketHandlers(service) {
         switch (message2.type) {
           case "attach": {
             const requested = message2.conversationId;
-            const existing = requested ? service.getConversation(requested) : undefined;
+            const existing = requested ? await service.reconnectConversation(data.actor, requested) : undefined;
             if (requested && existing && !service.canAccess(existing, data.actor)) {
               send(socket, { type: "notice", level: "error", text: FOREIGN_WORKSPACE_NOTICE });
               return;
@@ -69261,7 +68935,7 @@ function workbenchSocketHandlers(service) {
             const conversation = existing ?? await service.createConversation(data.actor);
             attach(socket, data, conversation);
             send(socket, { type: "models", models: service.listModels() });
-            send(socket, { type: "sessions", items: await service.listSessions() });
+            send(socket, { type: "sessions", items: await service.listSessions(data.actor) });
             if (requested && !existing) {
               send(socket, {
                 type: "notice",
@@ -69273,7 +68947,7 @@ function workbenchSocketHandlers(service) {
           }
           case "new_conversation": {
             attach(socket, data, await service.createConversation(data.actor));
-            send(socket, { type: "sessions", items: await service.listSessions() });
+            send(socket, { type: "sessions", items: await service.listSessions(data.actor) });
             break;
           }
           case "resume_session": {
@@ -69281,7 +68955,7 @@ function workbenchSocketHandlers(service) {
             break;
           }
           case "list_sessions": {
-            send(socket, { type: "sessions", items: await service.listSessions() });
+            send(socket, { type: "sessions", items: await service.listSessions(data.actor) });
             break;
           }
           case "prompt":
@@ -69318,7 +68992,7 @@ var catalog = loadModelCatalog(config3);
 var storage = createSqliteStorage(config3.sessionDbPath);
 var workbench = config3.workbenchCwd ? await createWorkbench() : undefined;
 async function createWorkbench() {
-  fs8.mkdirSync(config3.workbenchCwd, { recursive: true });
+  fs9.mkdirSync(config3.workbenchCwd, { recursive: true });
   try {
     const service = await WorkbenchAgentService.create(config3, catalog, createPlatformRepository(storage.db));
     console.log(`[session-gateway] live workspace enabled at ${config3.workbenchCwd}`);