alchemylab-opencode 1.0.18 → 1.0.19

package/dist/{chunk-3AF5MXLF.js → chunk-FXA7YNMN.js}

@@ -10,7 +10,7 @@ if (typeof globalThis.__name === 'undefined') { globalThis.__name = (t, n) => {
 if (typeof globalThis.__export === 'undefined') { globalThis.__export = (t, a) => { for (const k in a) Object.defineProperty(t, k, { get: a[k], enumerable: true }); }; }
 
 
-// node_modules/@standard-community/standard-openapi/dist/index-DZEfthgZ.js
+// ../../../../../../../../Users/robin/Documents/alchemy_dev_new/opencode-server/node_modules/@standard-community/standard-openapi/dist/index-DZEfthgZ.js
 var errorMessageWrapper = (message) => `standard-openapi: ${message}`;
 var openapiVendorMap = /* @__PURE__ */ new Map();
 var getToOpenAPISchemaFn = async (vendor) => {
@@ -21,13 +21,13 @@ var getToOpenAPISchemaFn = async (vendor) => {
   let vendorFn;
   switch (vendor) {
     case "valibot":
-      vendorFn = (await import("./valibot-D_HTw1Gn-UR62BIDY.js")).default();
+      vendorFn = (await import("./valibot-D_HTw1Gn-SZJR3J76.js")).default();
       break;
     case "zod":
-      vendorFn = (await import("./zod-DSgpEGAE-VTXQW6SB.js")).default();
+      vendorFn = (await import("./zod-DSgpEGAE-X2KPFU7C.js")).default();
       break;
     default:
-      vendorFn = (await import("./default-u_dwuiYb-WOFHQQ3K.js")).default();
+      vendorFn = (await import("./default-u_dwuiYb-644FBWJS.js")).default();
   }
   openapiVendorMap.set(vendor, vendorFn);
   return vendorFn;
@@ -46,4 +46,4 @@ export {
   errorMessageWrapper,
   toOpenAPISchema
 };
-//# sourceMappingURL=chunk-3AF5MXLF.js.map
+//# sourceMappingURL=chunk-FXA7YNMN.js.map

package/dist/{chunk-3AF5MXLF.js.map → chunk-FXA7YNMN.js.map}

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../node_modules/@standard-community/standard-openapi/dist/index-DZEfthgZ.js"],
+  "sources": ["../../../../../../../../../Users/robin/Documents/alchemy_dev_new/opencode-server/node_modules/@standard-community/standard-openapi/dist/index-DZEfthgZ.js"],
   "sourcesContent": ["const errorMessageWrapper = (message) => `standard-openapi: ${message}`;\nconst openapiVendorMap = /* @__PURE__ */ new Map();\n\nconst getToOpenAPISchemaFn = async (vendor) => {\n  const cached = openapiVendorMap.get(vendor);\n  if (cached) {\n    return cached;\n  }\n  let vendorFn;\n  switch (vendor) {\n    case \"valibot\":\n      vendorFn = (await import('./valibot-D_HTw1Gn.js')).default();\n      break;\n    case \"zod\":\n      vendorFn = (await import('./zod-DSgpEGAE.js')).default();\n      break;\n    default:\n      vendorFn = (await import('./default-u_dwuiYb.js')).default();\n  }\n  openapiVendorMap.set(vendor, vendorFn);\n  return vendorFn;\n};\n\nconst toOpenAPISchema = async (schema, context = {}) => {\n  const fn = await getToOpenAPISchemaFn(schema[\"~standard\"].vendor);\n  const { components = {}, options } = context;\n  const _schema = await fn(schema, { components, options });\n  return {\n    schema: _schema,\n    components: Object.keys(components).length > 0 ? components : void 0\n  };\n};\nfunction loadVendor(vendor, fn) {\n  openapiVendorMap.set(vendor, fn);\n}\n\nexport { errorMessageWrapper as e, loadVendor as l, toOpenAPISchema as t };\n"],
   "mappings": ";;;;;;;;;;;;;AAAA,IAAM,sBAAsB,CAAC,YAAY,qBAAqB,OAAO;AACrE,IAAM,mBAAmC,oBAAI,IAAI;AAEjD,IAAM,uBAAuB,OAAO,WAAW;AAC7C,QAAM,SAAS,iBAAiB,IAAI,MAAM;AAC1C,MAAI,QAAQ;AACV,WAAO;AAAA,EACT;AACA,MAAI;AACJ,UAAQ,QAAQ;AAAA,IACd,KAAK;AACH,kBAAY,MAAM,OAAO,gCAAuB,GAAG,QAAQ;AAC3D;AAAA,IACF,KAAK;AACH,kBAAY,MAAM,OAAO,4BAAmB,GAAG,QAAQ;AACvD;AAAA,IACF;AACE,kBAAY,MAAM,OAAO,gCAAuB,GAAG,QAAQ;AAAA,EAC/D;AACA,mBAAiB,IAAI,QAAQ,QAAQ;AACrC,SAAO;AACT;AAEA,IAAM,kBAAkB,OAAO,QAAQ,UAAU,CAAC,MAAM;AACtD,QAAM,KAAK,MAAM,qBAAqB,OAAO,WAAW,EAAE,MAAM;AAChE,QAAM,EAAE,aAAa,CAAC,GAAG,QAAQ,IAAI;AACrC,QAAM,UAAU,MAAM,GAAG,QAAQ,EAAE,YAAY,QAAQ,CAAC;AACxD,SAAO;AAAA,IACL,QAAQ;AAAA,IACR,YAAY,OAAO,KAAK,UAAU,EAAE,SAAS,IAAI,aAAa;AAAA,EAChE;AACF;",
   "names": []

package/dist/{chunk-FMP3YLWX.js → chunk-H5AN6PD4.js}

@@ -11,12 +11,12 @@ if (typeof globalThis.__export === 'undefined') { globalThis.__export = (t, a) =
 
 import {
   convertToOpenAPISchema
-} from "./chunk-O5VWOPCL.js";
+} from "./chunk-4UCKACGO.js";
 import {
   toJsonSchema
-} from "./chunk-VL3RSEZ2.js";
+} from "./chunk-AHJSL352.js";
 
-// node_modules/@standard-community/standard-openapi/dist/default-u_dwuiYb.js
+// ../../../../../../../../Users/robin/Documents/alchemy_dev_new/opencode-server/node_modules/@standard-community/standard-openapi/dist/default-u_dwuiYb.js
 function getToOpenAPISchemaFn() {
   return async (schema, context) => convertToOpenAPISchema(
     await toJsonSchema(schema, context.options),
@@ -27,4 +27,4 @@ function getToOpenAPISchemaFn() {
 export {
   getToOpenAPISchemaFn
 };
-//# sourceMappingURL=chunk-FMP3YLWX.js.map
+//# sourceMappingURL=chunk-H5AN6PD4.js.map

package/dist/{chunk-FMP3YLWX.js.map → chunk-H5AN6PD4.js.map}

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../node_modules/@standard-community/standard-openapi/dist/default-u_dwuiYb.js"],
+  "sources": ["../../../../../../../../../Users/robin/Documents/alchemy_dev_new/opencode-server/node_modules/@standard-community/standard-openapi/dist/default-u_dwuiYb.js"],
   "sourcesContent": ["import { toJsonSchema } from '@standard-community/standard-json';\nimport { convertToOpenAPISchema } from './vendors/convert.js';\n\nfunction getToOpenAPISchemaFn() {\n  return async (schema, context) => convertToOpenAPISchema(\n    await toJsonSchema(schema, context.options),\n    context\n  );\n}\n\nexport { getToOpenAPISchemaFn as default };\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;AAGA,SAAS,uBAAuB;AAC9B,SAAO,OAAO,QAAQ,YAAY;AAAA,IAChC,MAAM,aAAa,QAAQ,QAAQ,OAAO;AAAA,IAC1C;AAAA,EACF;AACF;",
   "names": []

package/dist/{chunk-6UDEKTJV.js → chunk-PV6JYN6T.js}

@@ -36,18 +36,14 @@ import {
   spawn,
   withTimeout,
   withTransientReadRetry
-} from "./chunk-YX3AWX2A.js";
+} from "./chunk-E2D2QSW7.js";
 import {
   AppFileSystem,
   BusEvent,
   Database,
-  Filesystem,
   Flag,
-  Glob,
-  Global,
   Instance,
   InstanceState,
-  Log,
   MessageTable,
   NamedError,
   NotFoundError,
@@ -64,7 +60,7 @@ import {
   makeRuntime,
   runPromiseExit,
   which
-} from "./chunk-J4KUHHYM.js";
+} from "./chunk-SZM3G6UF.js";
 import {
   Identifier,
   MessageID,
@@ -75,6 +71,13 @@ import {
   Newtype,
   withStatics
 } from "./chunk-BI5OUHTQ.js";
+import {
+  Filesystem,
+  Glob,
+  Global,
+  Log,
+  ProtectedRoot
+} from "./chunk-2FM4SJ4F.js";
 import {
   __callDispose,
   __export,
@@ -2327,7 +2330,18 @@ var Snapshot;
               })
             );
           });
+          const assertRestorable = () => {
+            if (!ProtectedRoot.allows(state2.worktree)) {
+              log5.error("refused to restore a snapshot in the user's project folder", { worktree: state2.worktree });
+              return new Error(
+                `snapshot restore refused: ${state2.worktree} is the user's project folder. Nothing was written.`
+              );
+            }
+            return void 0;
+          };
           const restore2 = Effect7.fnUntraced(function* (snapshot) {
+            const refused = assertRestorable();
+            if (refused) return yield* Effect7.die(refused);
             return yield* locked(
               Effect7.gen(function* () {
                 log5.info("restore", { commit: snapshot });
@@ -2353,6 +2367,8 @@ var Snapshot;
             );
           });
           const revert2 = Effect7.fnUntraced(function* (patches) {
+            const refused = assertRestorable();
+            if (refused) return yield* Effect7.die(refused);
             return yield* locked(
               Effect7.gen(function* () {
                 const ops = [];
@@ -3310,6 +3326,9 @@ var MessageV2;
       root: z12.string()
     }),
     summary: z12.boolean().optional(),
+    /** Alchemy fork: answered the user BESIDE a running tool call (an aside).
+     *  The main loop neither exits on it nor answers that user message again. */
+    aside: z12.boolean().optional(),
     cost: z12.number(),
     tokens: z12.object({
       total: z12.number().optional(),
@@ -3576,7 +3595,9 @@ var MessageV2;
                 state: "output-error",
                 toolCallId: part2.callID,
                 input: part2.state.input,
-                errorText: "[Tool execution was interrupted]",
+                // An aside (alchemy fork) answers the user while the tool
+                // still runs: say so, or the model believes the run died.
+                errorText: options?.runningToolNote ?? "[Tool execution was interrupted]",
                 ...differentModel ? {} : { callProviderMetadata: part2.metadata }
               });
           }
@@ -6902,7 +6923,7 @@ var Plugin;
       const state = yield* InstanceState.make(
         Effect11.fn("Plugin.state")(function* (ctx) {
           const hooks = [];
-          const { Server } = yield* Effect11.promise(() => import("./server-P3JM3FFL.js"));
+          const { Server } = yield* Effect11.promise(() => import("./server-HETOVWO6.js"));
           const client2 = createOpencodeClient({
             baseUrl: "http://localhost:4096",
             directory: ctx.directory,
@@ -10291,6 +10312,7 @@ var ProviderTransform;
   }
   function unsupportedParts(msgs, model) {
     return msgs.map((msg) => {
+      if (msg.role === "tool" && Array.isArray(msg.content)) return unsupportedToolMedia(msg, model);
       if (msg.role !== "user" || !Array.isArray(msg.content)) return msg;
       const filtered = msg.content.map((part) => {
         if (part.type !== "file" && part.type !== "image") return part;
@@ -10320,6 +10342,25 @@ var ProviderTransform;
       return { ...msg, content: filtered };
     });
   }
+  function unsupportedToolMedia(msg, model) {
+    let changed = false;
+    const content = msg.content.map((part) => {
+      if (part?.type !== "tool-result" || part.output?.type !== "content" || !Array.isArray(part.output.value)) return part;
+      const value = part.output.value.map((item) => {
+        if (!item || item.type !== "media" && item.type !== "file-data" && item.type !== "image-data") return item;
+        const modality = typeof item.mediaType === "string" ? mimeToModality(item.mediaType) : void 0;
+        if (!modality || model.capabilities.input[modality]) return item;
+        changed = true;
+        const hint = modality === "pdf" ? " Use read_files on the same path for the PDF's text." : "";
+        return {
+          type: "text",
+          text: `NOTE: ${part.toolName ?? "the tool"} returned a ${modality === "pdf" ? "PDF" : modality} that this model cannot take as input, so it was left out.${hint}`
+        };
+      });
+      return { ...part, output: { ...part.output, value } };
+    });
+    return changed ? { ...msg, content } : msg;
+  }
   function message(msgs, model, options2) {
     msgs = unsupportedParts(msgs, model);
     msgs = normalizeMessages(msgs, model, options2);
@@ -10391,13 +10432,39 @@ var ProviderTransform;
   ProviderTransform2.topK = topK;
   const WIDELY_SUPPORTED_EFFORTS = ["low", "medium", "high"];
   const OPENAI_EFFORTS = ["none", "minimal", ...WIDELY_SUPPORTED_EFFORTS, "xhigh"];
+  function claudeVersion(id) {
+    const m = /claude-(opus|sonnet|haiku|fable)-(\d{1,2})(?:[-.](\d{1,2}))?(?!\d)/.exec(id.toLowerCase());
+    if (!m) return void 0;
+    return { family: m[1], major: Number(m[2]), minor: m[3] === void 0 ? 0 : Number(m[3]) };
+  }
+  ProviderTransform2.claudeVersion = claudeVersion;
+  const EFFORT_LADDER = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
+  function nearestVariant(wanted, available) {
+    if (!wanted || available.length === 0) return void 0;
+    if (available.includes(wanted)) return wanted;
+    const at = EFFORT_LADDER.indexOf(wanted);
+    if (at < 0) return void 0;
+    let best;
+    let bestDistance = Infinity;
+    for (const v of available) {
+      const i = EFFORT_LADDER.indexOf(v);
+      if (i < 0) continue;
+      const d = Math.abs(i - at);
+      if (d < bestDistance || d === bestDistance && best !== void 0 && i < EFFORT_LADDER.indexOf(best)) {
+        best = v;
+        bestDistance = d;
+      }
+    }
+    return best;
+  }
+  ProviderTransform2.nearestVariant = nearestVariant;
   function variants(model) {
     if (!model.capabilities.reasoning) return {};
     const id = model.id.toLowerCase();
-    const isAnthropicAdaptive = ["opus-4-6", "opus-4.6", "sonnet-4-6", "sonnet-4.6"].some(
-      (v) => model.api.id.includes(v)
-    );
-    const adaptiveEfforts = ["low", "medium", "high", "max"];
+    const claude = claudeVersion(model.api.id);
+    const isAnthropicAdaptive = !!claude && (claude.major > 4 || claude.major === 4 && claude.minor >= 6);
+    const takesXhigh = model.api.npm === "@ai-sdk/anthropic" && !!claude && claude.major >= 5 && (claude.family === "opus" || claude.family === "sonnet");
+    const adaptiveEfforts = takesXhigh ? ["low", "medium", "high", "xhigh", "max"] : ["low", "medium", "high", "max"];
     if (id.includes("deepseek") || id.includes("minimax") || id.includes("glm") || id.includes("mistral") || id.includes("kimi") || id.includes("k2p5") || id.includes("qwen"))
       return {};
     if (id.includes("grok") && id.includes("grok-3-mini")) {
@@ -12906,7 +12973,7 @@ var Skill;
       Effect15.catch(
         Effect15.fnUntraced(function* (err) {
           const message = ConfigMarkdown.FrontmatterError.isInstance(err) ? err.data.message : `Failed to parse skill ${match}`;
-          const { Session: Session3 } = yield* Effect15.promise(() => import("./session-FV32QIWG.js"));
+          const { Session: Session3 } = yield* Effect15.promise(() => import("./session-37HDF4U2.js"));
           yield* bus.publish(Session3.Event.Error, { error: new NamedError.Unknown({ message }).toObject() });
           log5.error("failed to load skill", { skill: match, err });
           return void 0;
@@ -14474,6 +14541,24 @@ var LLM;
   LLM2.hasToolCalls = hasToolCalls;
 })(LLM || (LLM = {}));
 
+// packages/opencode/src/session/repeated-preamble.ts
+function repeatedPreamble(parts2, finished) {
+  if (phaseOf(finished) !== "final_answer") return void 0;
+  const text5 = finished.text.trim();
+  if (!text5) return void 0;
+  return parts2.find(
+    (p) => p.type === "text" && p.id !== finished.id && phaseOf(p) === "commentary" && p.text.trim() === text5
+  );
+}
+function phaseOf(part) {
+  for (const value of Object.values(part.metadata ?? {})) {
+    if (value && typeof value === "object" && typeof value.phase === "string") {
+      return value.phase;
+    }
+  }
+  return void 0;
+}
+
 // packages/opencode/src/session/overflow.ts
 var COMPACTION_BUFFER = 2e4;
 function isOverflow(input) {
@@ -14918,6 +15003,14 @@ var SessionProcessor;
               ctx.currentText.time = { start: Date.now(), end: Date.now() };
               if (value.providerMetadata) ctx.currentText.metadata = value.providerMetadata;
               yield* session.updatePart(ctx.currentText);
+              const repeated = repeatedPreamble(MessageV2.parts(ctx.assistantMessage.id), ctx.currentText);
+              if (repeated) {
+                yield* session.removePart({
+                  sessionID: repeated.sessionID,
+                  messageID: repeated.messageID,
+                  partID: repeated.id
+                });
+              }
               ctx.currentText = void 0;
               return;
             case "finish":
@@ -15411,6 +15504,21 @@ When constructing the summary, try to stick to this template:
   );
 })(SessionCompaction || (SessionCompaction = {}));
 
+// packages/opencode/src/session/aside-audience.ts
+var PERSON_KINDS = /* @__PURE__ */ new Set(["inbox-chat", "via-herald"]);
+function writtenByAPerson(parts2) {
+  const kinds = parts2.map((p) => p?.metadata?.alchemy?.kind).filter((k) => typeof k === "string" && k.length > 0);
+  if (kinds.length === 0) return true;
+  return kinds.some((k) => PERSON_KINDS.has(k));
+}
+var TYPED_CALL = /\bto=functions\.|^\s*functions\.[A-Za-z_]+\s*[({]/m;
+function asideTextToDrop(parts2) {
+  const texts = parts2.filter((p) => p.type === "text");
+  const clean = texts.filter((p) => (p.text ?? "").trim().length > 0 && !TYPED_CALL.test(p.text ?? ""));
+  const keep = clean.length > 0 ? clean[clean.length - 1] : void 0;
+  return { drop: texts.filter((p) => p !== keep).map((p) => p.id), answered: keep !== void 0 };
+}
+
 // packages/opencode/src/session/instruction.ts
 import os5 from "os";
 import path11 from "path";
@@ -16525,7 +16633,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
             item.execute = (args, opts) => Effect26.runPromise(
               Effect26.gen(function* () {
                 const ctx = context(args, opts);
-                const mcpModule = yield* Effect26.promise(() => import("./mcp-4SNUY4OD.js"));
+                const mcpModule = yield* Effect26.promise(() => import("./mcp-W2Z3DXFD.js"));
                 mcpModule.MCP.currentToolContext = { sessionId: ctx.sessionID, messageId: ctx.messageID };
                 yield* plugin.trigger(
                   "tool.execute.before",
@@ -16974,9 +17082,8 @@ NOTE: At any point in time through this workflow you should feel free to ask the
           throw error;
         }
         const model = input.model ?? ag.model ?? (yield* lastModel(input.sessionID));
-        const same = ag.model && model.providerID === ag.model.providerID && model.modelID === ag.model.modelID;
-        const full = !input.variant && ag.variant && same ? yield* provider2.getModel(model.providerID, model.modelID).pipe(Effect26.catch(() => Effect26.succeed(void 0))) : void 0;
-        const variant = input.variant ?? (ag.variant && full?.variants?.[ag.variant] ? ag.variant : void 0);
+        const full = !input.variant && ag.variant ? yield* provider2.getModel(model.providerID, model.modelID).pipe(Effect26.catch(() => Effect26.succeed(void 0))) : void 0;
+        const variant = input.variant ?? ProviderTransform.nearestVariant(ag.variant, Object.keys(full?.variants ?? {}));
         const info = {
           id: input.messageID ?? MessageID.ascending(),
           role: "user",
@@ -17294,6 +17401,80 @@ NOTE: At any point in time through this workflow you should feel free to ask the
         for (const part of parts2) yield* sessions.updatePart(part);
         return { info, parts: parts2 };
       }, Effect26.scoped);
+      const inFlightTool = Effect26.fn("SessionPrompt.inFlightTool")(function* (sessionID) {
+        const msgs = yield* MessageV2.filterCompactedEffect(sessionID);
+        for (let i = msgs.length - 1; i >= 0; i--) {
+          const m = msgs[i];
+          if (m.info.role !== "assistant") continue;
+          if (m.info.aside) continue;
+          const part = m.parts.find((p) => p.type === "tool" && (p.state.status === "running" || p.state.status === "pending"));
+          return part && part.type === "tool" ? part.tool : null;
+        }
+        return null;
+      });
+      const ASIDE_PROMPT = [
+        "A tool you called is still running and its result has not arrived. The user just wrote to you.",
+        "Answer them now, in a sentence or two, from what you already know. You cannot use tools until the run returns, so do not promise to look anything up.",
+        "Do not restate at length what you are doing; if their message changes the work, say what you will do once the run returns."
+      ].join(" ");
+      const aside = Effect26.fn("SessionPrompt.aside")(function* (input) {
+        const ctx = yield* InstanceState.context;
+        const msgs = yield* MessageV2.filterCompactedEffect(input.sessionID);
+        const model = yield* getModel(input.user.model.providerID, input.user.model.modelID, input.sessionID);
+        const agent = yield* agents.get(input.user.agent);
+        if (!agent) return null;
+        const msg = {
+          id: MessageID.ascending(),
+          parentID: input.user.id,
+          role: "assistant",
+          mode: agent.name,
+          agent: agent.name,
+          variant: input.user.variant,
+          path: { cwd: ctx.directory, root: ctx.worktree },
+          cost: 0,
+          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+          modelID: model.id,
+          providerID: model.providerID,
+          time: { created: Date.now() },
+          sessionID: input.sessionID,
+          aside: true
+        };
+        yield* sessions.updateMessage(msg);
+        const handle = yield* processor.create({ assistantMessage: msg, sessionID: input.sessionID, model });
+        const [env, instructions, modelMsgs] = yield* Effect26.all([
+          Effect26.promise(() => SystemPrompt.environment(model)),
+          instruction.system().pipe(Effect26.orDie),
+          Effect26.promise(
+            () => MessageV2.toModelMessages(msgs, model, {
+              runningToolNote: `[${input.running} is still running. You are answering the user beside it; its result arrives when it finishes.]`
+            })
+          )
+        ]);
+        log5.info("aside", { sessionID: input.sessionID, running: input.running, messageID: msg.id });
+        yield* handle.process({
+          user: input.user,
+          agent,
+          permission: input.session.permission,
+          sessionID: input.sessionID,
+          parentSessionID: input.session.parentID,
+          system: [...env, ...instructions, ASIDE_PROMPT],
+          messages: modelMsgs,
+          tools: {},
+          model
+        });
+        const done = yield* lastAssistant(input.sessionID);
+        if (done.info.id !== msg.id) return done;
+        const { drop, answered } = asideTextToDrop(done.parts);
+        if (!answered) {
+          log5.warn("aside wrote no usable answer; the message waits for the run", { sessionID: input.sessionID, messageID: msg.id });
+          yield* sessions.removeMessage({ sessionID: input.sessionID, messageID: msg.id });
+          return null;
+        }
+        for (const partID of drop) {
+          yield* sessions.removePart({ sessionID: input.sessionID, messageID: msg.id, partID });
+        }
+        return drop.length > 0 ? yield* lastAssistant(input.sessionID) : done;
+      });
       const prompt2 = Effect26.fn("SessionPrompt.prompt")(
         function* (input) {
           const session = yield* sessions.get(input.sessionID);
@@ -17309,6 +17490,23 @@ NOTE: At any point in time through this workflow you should feel free to ask the
             yield* sessions.setPermission({ sessionID: session.id, permission: permissions });
           }
           if (input.noReply === true) return message;
+          {
+            const st0 = yield* InstanceState.get(state);
+            if (st0.runners.get(input.sessionID)?.busy === true && writtenByAPerson(message.parts)) {
+              const running = yield* inFlightTool(input.sessionID);
+              if (running) {
+                const answered = yield* aside({ sessionID: input.sessionID, session, user: message.info, running }).pipe(
+                  // Effect 4: catchCause (catchAllCause is Effect 3, and the
+                  // miss took every mid-run message down with it, found live).
+                  Effect26.catchCause((cause) => {
+                    log5.warn("aside failed; the message waits for the run", { sessionID: input.sessionID, cause: String(cause) });
+                    return Effect26.succeed(null);
+                  })
+                );
+                if (answered) return answered;
+              }
+            }
+          }
           const st8 = yield* InstanceState.get(state);
           const wasBusy = st8.runners.get(input.sessionID)?.busy === true;
           let result = yield* loop2({ sessionID: input.sessionID });
@@ -17343,6 +17541,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
             let tasks = [];
             for (let i = msgs.length - 1; i >= 0; i--) {
               const msg2 = msgs[i];
+              if (msg2.info.role === "assistant" && msg2.info.aside) continue;
               if (!lastUser && msg2.info.role === "user") lastUser = msg2.info;
               if (!lastAssistant2 && msg2.info.role === "assistant") lastAssistant2 = msg2.info;
               if (!lastFinished && msg2.info.role === "assistant" && msg2.info.finish) lastFinished = msg2.info;
@@ -17443,8 +17642,12 @@ NOTE: At any point in time through this workflow you should feel free to ask the
                 }
                 if (step === 1) SessionSummary.summarize({ sessionID, messageID: lastUser.id });
                 if (step > 1 && lastFinished) {
+                  const answeredByAside = new Set(
+                    msgs.filter((m) => m.info.role === "assistant" && m.info.aside).map((m) => m.info.parentID)
+                  );
                   for (const m of msgs) {
                     if (m.info.role !== "user" || Identifier.compareAscending(m.info.id, lastFinished.id) <= 0) continue;
+                    if (answeredByAside.has(m.info.id)) continue;
                     for (const p of m.parts) {
                       if (p.type !== "text" || p.ignored || p.synthetic) continue;
                       if (!p.text.trim()) continue;
@@ -18101,7 +18304,7 @@ var Session;
         const cfg = yield* config.get();
         if (cfg.share === "disabled") throw new Error("Sharing is disabled in configuration");
         const result = yield* Effect27.promise(async () => {
-          const { ShareNext } = await import("./share-next-MK3GU4BJ.js");
+          const { ShareNext } = await import("./share-next-MP7REE74.js");
           return ShareNext.create(id);
         });
         yield* Effect27.sync(() => SyncEvent.run(Session3.Event.Updated, { sessionID: id, info: { share: { url: result.url } } }));
@@ -18109,7 +18312,7 @@ var Session;
       });
       const unshare2 = Effect27.fn("Session.unshare")(function* (id) {
         yield* Effect27.promise(async () => {
-          const { ShareNext } = await import("./share-next-MK3GU4BJ.js");
+          const { ShareNext } = await import("./share-next-MP7REE74.js");
           await ShareNext.remove(id);
         });
         yield* Effect27.sync(() => SyncEvent.run(Session3.Event.Updated, { sessionID: id, info: { share: { url: null } } }));
@@ -21405,11 +21608,11 @@ Expected payload format:
   [{"tool": "tool_name", "parameters": {...}}, {...}]`;
     },
     async execute(params, ctx) {
-      const { Session: Session3 } = await import("./session-FV32QIWG.js");
+      const { Session: Session3 } = await import("./session-37HDF4U2.js");
       const { PartID: PartID2 } = await import("./schema-EWYI6LGA.js");
       const toolCalls = params.tool_calls.slice(0, 25);
       const discardedCalls = params.tool_calls.slice(25);
-      const { ToolRegistry: ToolRegistry2 } = await import("./registry-EQ7TBD6Z.js");
+      const { ToolRegistry: ToolRegistry2 } = await import("./registry-FWM7Q3YW.js");
       const availableTools = await ToolRegistry2.tools({ modelID: ModelID.make(""), providerID: ProviderID.make("") });
       const toolMap = new Map(availableTools.map((t) => [t.id, t]));
       const executeCall = async (call) => {
@@ -22362,6 +22565,62 @@ function abortAfterAny(ms, ...signals) {
   };
 }
 
+// packages/opencode/src/tool/webfetch-guard.ts
+import { lookup } from "node:dns/promises";
+import { isIP } from "node:net";
+function v4Blocked(ip) {
+  const [a, b] = ip.split(".").map((n) => Number(n));
+  if (a === 0 || a === 10 || a === 127) return true;
+  if (a === 100 && b >= 64 && b <= 127) return true;
+  if (a === 169 && b === 254) return true;
+  if (a === 172 && b >= 16 && b <= 31) return true;
+  if (a === 192 && b === 168) return true;
+  if (a === 198 && (b === 18 || b === 19)) return true;
+  if (a >= 224) return true;
+  return false;
+}
+function v6Blocked(ip) {
+  const low = ip.toLowerCase();
+  if (low === "::" || low === "::1") return true;
+  const mapped = low.match(/^::ffff:(\d+\.\d+\.\d+\.\d+)$/);
+  if (mapped) return v4Blocked(mapped[1]);
+  if (/^f[cd]/.test(low)) return true;
+  if (/^fe[89ab]/.test(low)) return true;
+  if (/^ff/.test(low)) return true;
+  return false;
+}
+function isNonPublicAddress(ip) {
+  const kind = isIP(ip);
+  if (kind === 4) return v4Blocked(ip);
+  if (kind === 6) return v6Blocked(ip);
+  return true;
+}
+async function assertPublicUrl(raw) {
+  const url = new URL(raw);
+  const host = url.hostname.replace(/^\[|\]$/g, "");
+  if (host === "localhost" || host.endsWith(".localhost") || host.endsWith(".local") || host.endsWith(".internal")) {
+    throw new Error(`webfetch reaches the public web only; ${url.host} is on this machine or its network`);
+  }
+  const addresses = isIP(host) ? [host] : (await lookup(host, { all: true })).map((a) => a.address);
+  if (addresses.length === 0 || addresses.some(isNonPublicAddress)) {
+    throw new Error(`webfetch reaches the public web only; ${url.host} resolves to an address on this machine or its network`);
+  }
+}
+async function fetchPublic(raw, init, maxRedirects = 5) {
+  let current = raw;
+  for (let hop = 0; hop <= maxRedirects; hop++) {
+    await assertPublicUrl(current);
+    const response = await fetch(current, { ...init, redirect: "manual" });
+    const location = response.headers.get("location");
+    if (response.status >= 300 && response.status < 400 && location) {
+      current = new URL(location, current).toString();
+      continue;
+    }
+    return response;
+  }
+  throw new Error(`webfetch stopped after ${maxRedirects} redirects`);
+}
+
 // packages/opencode/src/tool/webfetch.ts
 var MAX_RESPONSE_SIZE = 5 * 1024 * 1024;
 var DEFAULT_TIMEOUT2 = 30 * 1e3;
@@ -22408,8 +22667,8 @@ var WebFetchTool = Tool.define("webfetch", {
       Accept: acceptHeader,
       "Accept-Language": "en-US,en;q=0.9"
     };
-    const initial = await fetch(params.url, { signal, headers });
-    const response = initial.status === 403 && initial.headers.get("cf-mitigated") === "challenge" ? await fetch(params.url, { signal, headers: { ...headers, "User-Agent": "opencode" } }) : initial;
+    const initial = await fetchPublic(params.url, { signal, headers });
+    const response = initial.status === 403 && initial.headers.get("cf-mitigated") === "challenge" ? await fetchPublic(params.url, { signal, headers: { ...headers, "User-Agent": "opencode" } }) : initial;
     clearTimeout2();
     if (!response.ok) {
       throw new Error(`Request failed with status code: ${response.status}`);
@@ -23633,6 +23892,10 @@ var ApplyPatchTool = Tool.define("apply_patch", {
         files
       }
     });
+    for (const change of fileChanges) {
+      ProtectedRoot.assert(change.filePath, "apply_patch");
+      if (change.movePath) ProtectedRoot.assert(change.movePath, "apply_patch");
+    }
     const updates = [];
     for (const change of fileChanges) {
       const edited = change.type === "delete" ? void 0 : change.movePath ?? change.filePath;
@@ -23939,4 +24202,4 @@ export {
   Session,
   Plugin
 };
-//# sourceMappingURL=chunk-6UDEKTJV.js.map
+//# sourceMappingURL=chunk-PV6JYN6T.js.map