@sourcegraph/amp 0.0.1749556889-gbc568f → 0.0.1749585689-g82b91d

package/dist/amp.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import "./console-DMpfGJFj.js";
-import "./main-D7eRgs3E.js";
+import "./console-DK0gDzNQ.js";
+import "./main-CiUaVPC2.js";
 import "node:crypto";
 import "node:fs/promises";
 import "node:path";
 import "node:process";
-import "./client-jPIT0xZX.js";
+import "./client-C1WG2nEf.js";

package/dist/{client-jPIT0xZX.js → client-C1WG2nEf.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { f as n, E as i, aV as c, s as p, p as w } from "./console-DMpfGJFj.js";
+import { f as n, E as i, aV as c, s as p, p as w } from "./console-DK0gDzNQ.js";
 const m = !0;
 function f() {
   return new Proxy(

package/dist/{console-DMpfGJFj.js → console-DK0gDzNQ.js}

@@ -6648,7 +6648,7 @@ Prefer this tool over \`edit_file\` when you want to ovewrite the entire content
     content: n.content + `
 `
   },
-  fn: import("./create_file.node-BZG62Lws.js").then(
+  fn: import("./create_file.node-DtVTaHj5.js").then(
     ({ nodeCreateFileTool: n }) => n
   )
 }, Rn = "Grep", Wk = 15, Kk = 250, Qk = `Search for exact text patterns in files using ripgrep, a fast keyword search tool.
@@ -6790,7 +6790,7 @@ COMPLEMENTARY USE WITH CODEBASE_SEARCH:
     },
     source: "builtin"
   },
-  fn: import("./node-BKphB7l9.js").then(({ nodeGrepTool: n }) => n)
+  fn: import("./node-CiFAW-F3.js").then(({ nodeGrepTool: n }) => n)
 }, tr = "read_file", Zk = 1e3, Ya = {
   spec: {
     name: tr,
@@ -6822,7 +6822,7 @@ Returns the contents of the file with each line prefixed by its line number. For
     switch ("node") {
       case "node":
       case "vscode":
-        return import("./read_file.node-C4WxDQMH.js").then(({ nodeReadFileTool: n }) => n);
+        return import("./read_file.node-CIdAFiJ6.js").then(({ nodeReadFileTool: n }) => n);
     }
   })()
 }, Xk = bk({
@@ -6851,7 +6851,7 @@ If you need to replace the entire contents of a file, use \`${Uo}\` instead, sin
     inputSchema: Bw(Xk),
     source: "builtin"
   },
-  fn: import("./edit_file.node-BDALobjv.js").then(({ nodeEditFileTool: n }) => n)
+  fn: import("./edit_file.node-BH524GkF.js").then(({ nodeEditFileTool: n }) => n)
 };
 function Og(n) {
   return n.replace(/\\\\n/g, "\\n").replace(/\\\\t/g, "\\t").replace(/\\\\/g, "\\").replace(/\\"/g, '"').replace(/\\'/g, "'").replace(/\\n/g, `
@@ -11112,7 +11112,7 @@ Note: Results are sorted by modification time with the most recently modified fi
     },
     source: "builtin"
   },
-  fn: import("./glob.node-d0Yo6uqo.js").then(({ nodeGlobTool: n }) => n)
+  fn: import("./glob.node-C6HbLuPt.js").then(({ nodeGlobTool: n }) => n)
 }, Vo = "list_directory", sm = {
   spec: {
     name: Vo,
@@ -11133,7 +11133,7 @@ Note: Results are sorted by modification time with the most recently modified fi
     switch ("node") {
       case "node":
       case "vscode":
-        return import("./list_directory.node-BL9oNLTI.js").then(
+        return import("./list_directory.node-ZQscizpi.js").then(
           ({ nodeListDirectoryTool: n }) => n
         );
     }
@@ -12055,7 +12055,7 @@ It's VERY IMPORTANT to use specific tools when searching for files, instead of i
     },
     source: "builtin"
   },
-  fn: import("./node-GNozFK2o.js").then(({ nodeBashTool: n }) => n),
+  fn: import("./node-Cpbjmhrj.js").then(({ nodeBashTool: n }) => n),
   preprocessArgs: (n) => {
     if (!n.cwd)
       try {
@@ -12148,7 +12148,7 @@ This tool converts web content to markdown format for better readability.`,
       requiresNetwork: !0
     }
   },
-  fn: import("./node-CVO5JMq5.js").then(({ nodeReadWebPageTool: n }) => n)
+  fn: import("./node-CgVq0JJ9.js").then(({ nodeReadWebPageTool: n }) => n)
 }, eM = "web_search", tM = `Search the web for information.
 
 Returns search result titles, associated URLs, and a small summary of the
@@ -12196,7 +12196,7 @@ the \`${hf}\` with the url.
       requiresNetwork: !0
     }
   },
-  fn: import("./node-CMTspj_C.js").then(({ nodeWebSearchTool: n }) => n)
+  fn: import("./node-DvmQAW7h.js").then(({ nodeWebSearchTool: n }) => n)
 };
 function rM(n) {
   if (n === 59999) return "59.99s";
@@ -25951,7 +25951,7 @@ async function P8(n, e) {
   }
 }
 async function F8(n, e) {
-  return (await import("./list_directory.node-BL9oNLTI.js")).resolveArgumentDirectoryNode(n, e);
+  return (await import("./list_directory.node-ZQscizpi.js")).resolveArgumentDirectoryNode(n, e);
 }
 function B8(n) {
   if (!n._regex)
@@ -27163,7 +27163,7 @@ async function V8({
       fileMentions: void 0,
       userState: void 0
     };
-  const i = (await import("./files-BAqnFCfa.js").then(
+  const i = (await import("./files-CybxYgbE.js").then(
     ({ getFileMentions: o }) => o(
       tm(t.content),
       a,
@@ -28501,7 +28501,7 @@ Here is an example URL for linking to a file, specifically at line 32:
 Here is an example URL for linking to a file, specifically between lines 32 and 42:
 <example-file-url>file:///home/chandler/script.shy#L32-L42</example-file-url>
 
-Prefer "fluent" linking style. That is, don't show the user the actual URL, but instead use it to add links to relevant pieces of your response. When referring to a file name that exists. Whenever you mention a file by name, you MUST link to it in this way.
+Prefer "fluent" linking style. That is, don't show the user the actual URL, but instead use it to add links to relevant pieces of your response. Whenever you mention a file by name, you MUST link to it in this way.
 
 <example>
 <response>
@@ -28881,7 +28881,7 @@ Returns a git-style diff showing the changes that were undone as formatted markd
     switch ("node") {
       case "node":
       case "vscode":
-        return import("./undo_edit.node-C0uWOUa8.js").then(({ nodeUndoEditTool: n }) => n);
+        return import("./undo_edit.node-VYuTxRwd.js").then(({ nodeUndoEditTool: n }) => n);
     }
   })()
 }, Rm = globalThis.window?.document !== void 0;
@@ -72712,96 +72712,105 @@ class age {
 }
 const ghe = new rge(), hhe = new age();
 function Ehe(n, e, t, r) {
-  const a = [], i = [];
-  for (const [s, o] of n.messages.entries())
-    switch (o.role) {
+  const a = [];
+  for (const [i, s] of n.messages.entries())
+    switch (s.role) {
       case "assistant":
       case "info":
-        if (e?.has(s) || o.role === "assistant" && o.state.type === "streaming")
+        if (e?.has(i) || s.role === "assistant" && s.state.type === "streaming")
           continue;
-        e?.add(s), a.push([s, o]);
+        e?.add(i), a.push({ type: "message", data: [i, s] });
         break;
       case "user":
-        r && !e?.has(s) && (e?.add(s), a.push([s, o]));
-        for (const l of o.content)
-          if (l.type === "tool_result") {
-            if (t?.has(l.toolUseID) || !ps(l.run))
+        r && !e?.has(i) && (e?.add(i), a.push({ type: "message", data: [i, s] }));
+        for (const o of s.content)
+          if (o.type === "tool_result") {
+            if (t?.has(o.toolUseID) || !ps(o.run))
               continue;
-            t?.add(l.toolUseID);
-            const c = Pa(n, l.toolUseID);
-            if (!c)
-              throw new Error(`(bug) tool use ${l.toolUseID} not found`);
-            c.name !== Nn && i.push([c, l]);
+            t?.add(o.toolUseID);
+            const l = Pa(n, o.toolUseID);
+            if (!l)
+              throw new Error(`(bug) tool use ${o.toolUseID} not found`);
+            l.name !== Nn && a.push({ type: "toolResult", data: [l, o] });
           }
         break;
     }
-  return { messages: a, toolResults: i };
-}
-function yhe({ messages: n, toolResults: e }, t = (c) => VA.write(c + `
-`), r, a, i, s, o, l) {
-  for (const [, c] of n)
-    if (c.role === "user") {
-      if (s !== void 0) {
-        for (const u of c.content)
-          if (u.type === "text") {
-            const m = u.text.split(`
+  return { blocks: a };
+}
+function yhe({ blocks: n }, e = (l) => VA.write(l + `
+`), t, r, a, i, s, o) {
+  for (const l of n)
+    if (l.type === "message") {
+      const [, c] = l.data;
+      if (c.role === "user") {
+        if (i !== void 0) {
+          for (const u of c.content)
+            if (u.type === "text") {
+              const m = u.text.split(`
 `);
-            for (const p of m)
-              t(
-                a.print(`${s}${p}`, {
-                  foreground: "green",
-                  style: "italic"
+              for (const p of m)
+                e(
+                  r.print(`${i}${p}`, {
+                    foreground: "green",
+                    style: "italic"
+                  })
+                );
+              e("");
+            }
+        }
+      } else if (c.role === "assistant") {
+        if (c.state.type === "error") {
+          e(r.print(`Error: ${c.state.error.message}`, { foreground: "red" }));
+          continue;
+        }
+        for (const u of c.content)
+          switch (u.type) {
+            case "text":
+              e(
+                `${s ? r.print("Subagent " + s.slice(0, 8) + `:
+`, { foreground: o }) : ""}` + r.printMarkdown(u.text.trim(), {
+                  width: t
                 })
-              );
-            t("");
+              ), e("");
+              break;
           }
-      }
-    } else if (c.role === "assistant") {
-      if (c.state.type === "error") {
-        t(a.print(`Error: ${c.state.error.message}`, { foreground: "red" }));
-        continue;
-      }
-      for (const u of c.content)
-        switch (u.type) {
-          case "text":
-            t(
-              `${o ? a.print("Subagent " + o.slice(0, 8) + `:
-`, { foreground: l }) : ""}` + a.printMarkdown(u.text.trim(), {
-                width: r
-              })
-            ), t("");
-            break;
-        }
-    } else if (c.role === "info")
-      for (const u of c.content)
-        u.type === "summary" && (u.summary.type === "message" ? (t(
-          qa(
-            a,
-            "default",
-            r,
-            "Compaction Summary",
-            u.summary.summary,
-            void 0,
-            void 0
-          )
-        ), t("")) : u.summary.type === "thread" && (t(
-          qa(
-            a,
-            "default",
-            r,
-            "Compaction Summary",
-            `Based on thread: ${u.summary.thread}`,
-            void 0,
-            void 0
-          )
-        ), t("")));
-  for (const [c, u] of e) {
-    const m = ige(c, u, r, a, i, l);
-    m && (t(
-      `${o ? a.print("Subagent " + o.slice(0, 8) + `:
-`, { foreground: l }) : ""}` + m
-    ), t(""));
-  }
+      } else if (c.role === "info")
+        for (const u of c.content)
+          u.type === "summary" && (u.summary.type === "message" ? (e(
+            qa(
+              r,
+              "default",
+              t,
+              "Compaction Summary",
+              u.summary.summary,
+              void 0,
+              void 0
+            )
+          ), e("")) : u.summary.type === "thread" && (e(
+            qa(
+              r,
+              "default",
+              t,
+              "Compaction Summary",
+              `Based on thread: ${u.summary.thread}`,
+              void 0,
+              void 0
+            )
+          ), e("")));
+    } else if (l.type === "toolResult") {
+      const [c, u] = l.data, m = ige(
+        c,
+        u,
+        t,
+        r,
+        a,
+        o
+      );
+      m && (e(
+        `${s ? r.print("Subagent " + s.slice(0, 8) + `:
+`, { foreground: o }) : ""}` + m
+      ), e(""));
+    }
 }
 function ige(n, e, t, r, a, i = "blue") {
   const s = n.name === "edit_file" ? void 0 : a;

package/dist/{create_file.node-BZG62Lws.js → create_file.node-DtVTaHj5.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import u from "node:path";
-import { p as d, aF as f, aG as l } from "./console-DMpfGJFj.js";
+import { p as d, aF as f, aG as l } from "./console-DK0gDzNQ.js";
 const w = ({ args: t }, { dir: a, dirs: n, trackFileChange: c, filesystem: o }) => d(async (e) => {
   if (f(a), typeof t.content != "string")
     throw new Error("create_file: content must be specified");

package/dist/{edit_file.node-BDALobjv.js → edit_file.node-BH524GkF.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { p, aF as m, aG as F, aH as v, aI as _, aJ as b } from "./console-DMpfGJFj.js";
-import { recordEdit as x } from "./undo_edit.node-C0uWOUa8.js";
+import { p, aF as m, aG as F, aH as v, aI as _, aJ as b } from "./console-DK0gDzNQ.js";
+import { recordEdit as x } from "./undo_edit.node-VYuTxRwd.js";
 class y {
   #e = !1;
   #t = [];

package/dist/{executable-DHpRbG2D.js → executable-5cBRGrsC.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { existsSync as o } from "node:fs";
 import { createRequire as t } from "node:module";
-import { C as i } from "./console-DMpfGJFj.js";
+import { C as i } from "./console-DK0gDzNQ.js";
 function u() {
   {
     if (process.env.AMP_RIPGREP_PATH)

package/dist/{files-BAqnFCfa.js → files-CybxYgbE.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import T from "node:path";
-import { b9 as B, ba as I, C as v, bb as z, bc as C } from "./console-DMpfGJFj.js";
+import { b9 as B, ba as I, C as v, bb as z, bc as C } from "./console-DK0gDzNQ.js";
 async function A(r, h, a) {
   const x = await a.listFiles(h), i = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map(), m = [], M = /\b([\w/_-]+(?:\\.|[\w/_-])*(?:\.[\w-]+)+)\b/g, F = /(\/(?:[\w-]+\/|[\w-]+\\[.\s\S])+[\w.-]+(?:\\.|[\w.-])*(?:\.[\w-]+)+)\b/g, y = /\b([A-Za-z]:[\\\\][^\s"'<>|]*(?:\.[\w-]+)+)\b/g;
   await l(M, !1), await l(F, !0), await l(y, !0);

package/dist/{glob.node-d0Yo6uqo.js → glob.node-C6HbLuPt.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { spawn as w } from "node:child_process";
-import { p as I } from "./index-09-lD53X.js";
-import { O as v, g as N, m as E, C as P, aF as R } from "./console-DMpfGJFj.js";
-import { r as D } from "./executable-DHpRbG2D.js";
+import { p as I } from "./index-C2wo7rRZ.js";
+import { O as v, g as N, m as E, C as P, aF as R } from "./console-DK0gDzNQ.js";
+import { r as D } from "./executable-5cBRGrsC.js";
 const y = ({ args: i }, { dirs: r }) => {
   if (r.length === 0)
     return new v((s) => {

package/dist/{index-09-lD53X.js → index-C2wo7rRZ.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { z as xt } from "./console-DMpfGJFj.js";
+import { z as xt } from "./console-DK0gDzNQ.js";
 var pt = {}, ft, Et;
 function ct() {
   if (Et) return ft;

package/dist/{list_directory.node-BL9oNLTI.js → list_directory.node-ZQscizpi.js}

@@ -2,7 +2,7 @@
 import c from "node:fs/promises";
 import u from "node:os";
 import s from "node:path";
-import { O as f, aK as i, aL as l, m, aM as p } from "./console-DMpfGJFj.js";
+import { O as f, aK as i, aL as l, m, aM as p } from "./console-DK0gDzNQ.js";
 const D = ({ args: r }, { dirs: t }) => {
   if (t.length === 0)
     return new f((e) => {

package/dist/{load-profile-RepxD2W6.js → load-profile-BbmyxO_7.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import n from "node:os";
-import { O as r } from "./console-DMpfGJFj.js";
+import { O as r } from "./console-DK0gDzNQ.js";
 const e = process.env;
 function i(t, o = "always") {
   return o === "never" ? r.of(e) : r.of(e);