@sourcegraph/amp 0.0.1748361686-ga6cbdd → 0.0.1748376091-g59fbbf

package/dist/amp.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import "./color-Bf2jGwiV.js";
-import "./main-CmK9yaC9.js";
+import "./color-BV9wbewg.js";
+import "./main-90Zv8RqJ.js";
 import "node:crypto";
 import "node:fs/promises";
 import "node:path";
 import "node:process";
-import "./client-DfrJv231.js";
+import "./client-D37xwk4h.js";
 //# sourceMappingURL=amp.js.map

package/dist/{client-DfrJv231.js → client-D37xwk4h.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { f as i, r as o, ba as n, s as p, p as c } from "./color-Bf2jGwiV.js";
+import { f as i, r as o, ba as n, s as p, p as c } from "./color-BV9wbewg.js";
 const u = o.pipe(
   p(({ settings: e, secrets: t }) => c(async () => await t.getToken("apiKey", e.url) !== void 0))
 );
@@ -32,4 +32,4 @@ export {
   w as f,
   u as i
 };
-//# sourceMappingURL=client-DfrJv231.js.map
+//# sourceMappingURL=client-D37xwk4h.js.map

package/dist/{client-DfrJv231.js.map → client-D37xwk4h.js.map}

@@ -1 +1 @@
-{"version":3,"file":"client-DfrJv231.js","sources":["../../core/src/server-api/client.ts"],"sourcesContent":["import type { ThreadOperatorShare } from '@sourcegraph/amp-api-types'\nimport type { Observable } from '@sourcegraph/observable'\nimport {\n\tdistinctUntilChanged,\n\tfirstValueFrom,\n\tmap,\n\ttype pendingOperation,\n\tpromiseFactoryToObservable,\n\tswitchMap,\n\tswitchMapReplayOperation,\n} from '@sourcegraph/observable'\nimport { isEqualJSON } from '../common/isEqualJSON'\nimport { type PickResolvedConfiguration, resolvedConfig } from '../configuration/resolver'\nimport { clientIdentificationHeaders } from '../misc/known-clients'\nimport type { ThreadID } from '../threads/thread'\nimport type { ThreadService } from '../threads/thread-service'\n\nexport const isAmpServerConfigured = resolvedConfig.pipe(\n\tswitchMap(({ settings, secrets }) => {\n\t\treturn promiseFactoryToObservable(async () => {\n\t\t\tconst apiKey = await secrets.getToken('apiKey', settings.url)\n\t\t\treturn apiKey !== undefined\n\t\t})\n\t}),\n)\n\n/**\n * Returns the URL to a thread on the Amp server.\n */\nexport function threadURL(ampURL: URL, threadID: ThreadID): URL {\n\treturn new URL(`/threads/${threadID}`, ampURL)\n}\n\n/**\n * Makes a request to the Amp API with the proper configuration\n */\nexport async function fetchFromAmpServer(\n\tpathAndQuery: string,\n\tinit?: RequestInit,\n): Promise<Response> {\n\tconst config = await firstValueFrom(resolvedConfig, init?.signal ?? undefined)\n\treturn fetchFromAmpServerWithConfig(config, pathAndQuery, init)\n}\n\nexport function watchOnAmpServer<T>(\n\tpathAndQuery: string,\n\tinit?: Omit<RequestInit, 'signal'>,\n): Observable<T | typeof pendingOperation | Error> {\n\treturn resolvedConfig.pipe(\n\t\tmap(\n\t\t\t({ settings, secrets }) =>\n\t\t\t\t({\n\t\t\t\t\tsettings: {\n\t\t\t\t\t\turl: settings.url,\n\t\t\t\t\t},\n\t\t\t\t\tsecrets,\n\t\t\t\t}) satisfies PickResolvedConfiguration<{\n\t\t\t\t\tsettings: 'url'\n\t\t\t\t\tsecrets: true\n\t\t\t\t}>,\n\t\t),\n\t\tdistinctUntilChanged(\n\t\t\t(a, b) => isEqualJSON(a.settings, b.settings) && a.secrets === b.secrets,\n\t\t),\n\t\tswitchMapReplayOperation((config) =>\n\t\t\tpromiseFactoryToObservable(async (signal) => {\n\t\t\t\tconst resp = await fetchFromAmpServerWithConfig(config, pathAndQuery, {\n\t\t\t\t\t...init,\n\t\t\t\t\tsignal,\n\t\t\t\t})\n\t\t\t\tif (!resp.ok) {\n\t\t\t\t\tconst text = await resp.text()\n\t\t\t\t\tif (text) {\n\t\t\t\t\t\tthrow new Error(`HTTP ${resp.status}: ${text}`)\n\t\t\t\t\t} else {\n\t\t\t\t\t\tthrow new Error(`HTTP ${resp.status}`)\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn (await resp.json()) as T\n\t\t\t}),\n\t\t),\n\t)\n}\n\n/**\n * Share a thread with the operator (i.e., the Amp team).\n */\nexport async function shareThreadWithOperator(\n\tthreadService: ThreadService,\n\tthreadID: ThreadID,\n): Promise<void> {\n\tconst thread = await firstValueFrom(threadService.observe(threadID))\n\tif (!thread) {\n\t\tthrow new Error(`Thread not found: ${threadID}`)\n\t}\n\n\tconst response = await fetchFromAmpServer('/api/internal/share-thread-with-operator', {\n\t\tmethod: 'POST',\n\t\theaders: {\n\t\t\t'Content-Type': 'application/json',\n\t\t},\n\t\tbody: JSON.stringify({ threadData: thread } as Pick<ThreadOperatorShare, 'threadData'>),\n\t})\n\tif (!response.ok) {\n\t\tconst text = await response.text()\n\t\tthrow new Error(`Failed to share thread: ${response.status} ${text}`)\n\t}\n}\n\nasync function fetchFromAmpServerWithConfig(\n\tconfig: PickResolvedConfiguration<{\n\t\tsettings: 'url'\n\t\tsecrets: true\n\t}>,\n\tpathAndQuery: string,\n\tinit?: RequestInit,\n): Promise<Response> {\n\tif (pathAndQuery.startsWith('http:') || pathAndQuery.startsWith('https:')) {\n\t\tthrow new Error('input must be a path, not an absolute URL')\n\t}\n\tif (!pathAndQuery.startsWith('/')) {\n\t\tthrow new Error('pathAndQuery must start with /')\n\t}\n\n\tconst baseURL = config.settings.url\n\tif (!baseURL) {\n\t\tthrow new Error('amp.url is not set')\n\t}\n\n\tconst apiKey = await config.secrets.getToken('apiKey', baseURL)\n\tif (!apiKey) {\n\t\tthrow new Error('Amp API key is not set')\n\t}\n\n\treturn fetch(new URL(pathAndQuery, baseURL), {\n\t\t...init,\n\t\theaders: {\n\t\t\t...init?.headers,\n\t\t\t...clientIdentificationHeaders(),\n\t\t\t'Content-Type': 'application/json',\n\t\t\tAuthorization: `Bearer ${apiKey}`,\n\t\t},\n\t})\n}\n"],"names":["isAmpServerConfigured","resolvedConfig","switchMap","settings","secrets","promiseFactoryToObservable","fetchFromAmpServer","pathAndQuery","init","config","firstValueFrom","fetchFromAmpServerWithConfig","baseURL","apiKey","clientIdentificationHeaders"],"mappings":";;AAiBO,MAAMA,IAAwBC,EAAe;AAAA,EACnDC,EAAU,CAAC,EAAE,UAAAC,GAAU,SAAAC,QACfC,EAA2B,YAClB,MAAMD,EAAQ,SAAS,UAAUD,EAAS,GAAG,MAC1C,MAClB,CACD;AACF;AAYsB,eAAAG,EACrBC,GACAC,GACoB;AACpB,QAAMC,IAAS,MAAMC,EAAeT,GAAgBO,GAAM,UAAU,MAAS;AACtE,SAAAG,EAA6BF,GAAQF,GAAcC,CAAI;AAC/D;AAmEA,eAAeG,EACdF,GAIAF,GACAC,GACoB;AACpB,MAAID,EAAa,WAAW,OAAO,KAAKA,EAAa,WAAW,QAAQ;AACjE,UAAA,IAAI,MAAM,2CAA2C;AAE5D,MAAI,CAACA,EAAa,WAAW,GAAG;AACzB,UAAA,IAAI,MAAM,gCAAgC;AAG3C,QAAAK,IAAUH,EAAO,SAAS;AAChC,MAAI,CAACG;AACE,UAAA,IAAI,MAAM,oBAAoB;AAGrC,QAAMC,IAAS,MAAMJ,EAAO,QAAQ,SAAS,UAAUG,CAAO;AAC9D,MAAI,CAACC;AACE,UAAA,IAAI,MAAM,wBAAwB;AAGzC,SAAO,MAAM,IAAI,IAAIN,GAAcK,CAAO,GAAG;AAAA,IAC5C,GAAGJ;AAAA,IACH,SAAS;AAAA,MACR,GAAGA,GAAM;AAAA,MACT,GAAGM,EAA4B;AAAA,MAC/B,gBAAgB;AAAA,MAChB,eAAe,UAAUD,CAAM;AAAA,IAAA;AAAA,EAChC,CACA;AACF;"}
+{"version":3,"file":"client-D37xwk4h.js","sources":["../../core/src/server-api/client.ts"],"sourcesContent":["import type { ThreadOperatorShare } from '@sourcegraph/amp-api-types'\nimport type { Observable } from '@sourcegraph/observable'\nimport {\n\tdistinctUntilChanged,\n\tfirstValueFrom,\n\tmap,\n\ttype pendingOperation,\n\tpromiseFactoryToObservable,\n\tswitchMap,\n\tswitchMapReplayOperation,\n} from '@sourcegraph/observable'\nimport { isEqualJSON } from '../common/isEqualJSON'\nimport { type PickResolvedConfiguration, resolvedConfig } from '../configuration/resolver'\nimport { clientIdentificationHeaders } from '../misc/known-clients'\nimport type { ThreadID } from '../threads/thread'\nimport type { ThreadService } from '../threads/thread-service'\n\nexport const isAmpServerConfigured = resolvedConfig.pipe(\n\tswitchMap(({ settings, secrets }) => {\n\t\treturn promiseFactoryToObservable(async () => {\n\t\t\tconst apiKey = await secrets.getToken('apiKey', settings.url)\n\t\t\treturn apiKey !== undefined\n\t\t})\n\t}),\n)\n\n/**\n * Returns the URL to a thread on the Amp server.\n */\nexport function threadURL(ampURL: URL, threadID: ThreadID): URL {\n\treturn new URL(`/threads/${threadID}`, ampURL)\n}\n\n/**\n * Makes a request to the Amp API with the proper configuration\n */\nexport async function fetchFromAmpServer(\n\tpathAndQuery: string,\n\tinit?: RequestInit,\n): Promise<Response> {\n\tconst config = await firstValueFrom(resolvedConfig, init?.signal ?? undefined)\n\treturn fetchFromAmpServerWithConfig(config, pathAndQuery, init)\n}\n\nexport function watchOnAmpServer<T>(\n\tpathAndQuery: string,\n\tinit?: Omit<RequestInit, 'signal'>,\n): Observable<T | typeof pendingOperation | Error> {\n\treturn resolvedConfig.pipe(\n\t\tmap(\n\t\t\t({ settings, secrets }) =>\n\t\t\t\t({\n\t\t\t\t\tsettings: {\n\t\t\t\t\t\turl: settings.url,\n\t\t\t\t\t},\n\t\t\t\t\tsecrets,\n\t\t\t\t}) satisfies PickResolvedConfiguration<{\n\t\t\t\t\tsettings: 'url'\n\t\t\t\t\tsecrets: true\n\t\t\t\t}>,\n\t\t),\n\t\tdistinctUntilChanged(\n\t\t\t(a, b) => isEqualJSON(a.settings, b.settings) && a.secrets === b.secrets,\n\t\t),\n\t\tswitchMapReplayOperation((config) =>\n\t\t\tpromiseFactoryToObservable(async (signal) => {\n\t\t\t\tconst resp = await fetchFromAmpServerWithConfig(config, pathAndQuery, {\n\t\t\t\t\t...init,\n\t\t\t\t\tsignal,\n\t\t\t\t})\n\t\t\t\tif (!resp.ok) {\n\t\t\t\t\tconst text = await resp.text()\n\t\t\t\t\tif (text) {\n\t\t\t\t\t\tthrow new Error(`HTTP ${resp.status}: ${text}`)\n\t\t\t\t\t} else {\n\t\t\t\t\t\tthrow new Error(`HTTP ${resp.status}`)\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn (await resp.json()) as T\n\t\t\t}),\n\t\t),\n\t)\n}\n\n/**\n * Share a thread with the operator (i.e., the Amp team).\n */\nexport async function shareThreadWithOperator(\n\tthreadService: ThreadService,\n\tthreadID: ThreadID,\n): Promise<void> {\n\tconst thread = await firstValueFrom(threadService.observe(threadID))\n\tif (!thread) {\n\t\tthrow new Error(`Thread not found: ${threadID}`)\n\t}\n\n\tconst response = await fetchFromAmpServer('/api/internal/share-thread-with-operator', {\n\t\tmethod: 'POST',\n\t\theaders: {\n\t\t\t'Content-Type': 'application/json',\n\t\t},\n\t\tbody: JSON.stringify({ threadData: thread } as Pick<ThreadOperatorShare, 'threadData'>),\n\t})\n\tif (!response.ok) {\n\t\tconst text = await response.text()\n\t\tthrow new Error(`Failed to share thread: ${response.status} ${text}`)\n\t}\n}\n\nasync function fetchFromAmpServerWithConfig(\n\tconfig: PickResolvedConfiguration<{\n\t\tsettings: 'url'\n\t\tsecrets: true\n\t}>,\n\tpathAndQuery: string,\n\tinit?: RequestInit,\n): Promise<Response> {\n\tif (pathAndQuery.startsWith('http:') || pathAndQuery.startsWith('https:')) {\n\t\tthrow new Error('input must be a path, not an absolute URL')\n\t}\n\tif (!pathAndQuery.startsWith('/')) {\n\t\tthrow new Error('pathAndQuery must start with /')\n\t}\n\n\tconst baseURL = config.settings.url\n\tif (!baseURL) {\n\t\tthrow new Error('amp.url is not set')\n\t}\n\n\tconst apiKey = await config.secrets.getToken('apiKey', baseURL)\n\tif (!apiKey) {\n\t\tthrow new Error('Amp API key is not set')\n\t}\n\n\treturn fetch(new URL(pathAndQuery, baseURL), {\n\t\t...init,\n\t\theaders: {\n\t\t\t...init?.headers,\n\t\t\t...clientIdentificationHeaders(),\n\t\t\t'Content-Type': 'application/json',\n\t\t\tAuthorization: `Bearer ${apiKey}`,\n\t\t},\n\t})\n}\n"],"names":["isAmpServerConfigured","resolvedConfig","switchMap","settings","secrets","promiseFactoryToObservable","fetchFromAmpServer","pathAndQuery","init","config","firstValueFrom","fetchFromAmpServerWithConfig","baseURL","apiKey","clientIdentificationHeaders"],"mappings":";;AAiBO,MAAMA,IAAwBC,EAAe;AAAA,EACnDC,EAAU,CAAC,EAAE,UAAAC,GAAU,SAAAC,QACfC,EAA2B,YAClB,MAAMD,EAAQ,SAAS,UAAUD,EAAS,GAAG,MAC1C,MAClB,CACD;AACF;AAYsB,eAAAG,EACrBC,GACAC,GACoB;AACpB,QAAMC,IAAS,MAAMC,EAAeT,GAAgBO,GAAM,UAAU,MAAS;AACtE,SAAAG,EAA6BF,GAAQF,GAAcC,CAAI;AAC/D;AAmEA,eAAeG,EACdF,GAIAF,GACAC,GACoB;AACpB,MAAID,EAAa,WAAW,OAAO,KAAKA,EAAa,WAAW,QAAQ;AACjE,UAAA,IAAI,MAAM,2CAA2C;AAE5D,MAAI,CAACA,EAAa,WAAW,GAAG;AACzB,UAAA,IAAI,MAAM,gCAAgC;AAG3C,QAAAK,IAAUH,EAAO,SAAS;AAChC,MAAI,CAACG;AACE,UAAA,IAAI,MAAM,oBAAoB;AAGrC,QAAMC,IAAS,MAAMJ,EAAO,QAAQ,SAAS,UAAUG,CAAO;AAC9D,MAAI,CAACC;AACE,UAAA,IAAI,MAAM,wBAAwB;AAGzC,SAAO,MAAM,IAAI,IAAIN,GAAcK,CAAO,GAAG;AAAA,IAC5C,GAAGJ;AAAA,IACH,SAAS;AAAA,MACR,GAAGA,GAAM;AAAA,MACT,GAAGM,EAA4B;AAAA,MAC/B,gBAAgB;AAAA,MAChB,eAAe,UAAUD,CAAM;AAAA,IAAA;AAAA,EAChC,CACA;AACF;"}

package/dist/{color-Bf2jGwiV.js → color-BV9wbewg.js}

@@ -7057,7 +7057,7 @@ Prefer this tool over \`edit_file\` when you want to ovewrite the entire content
     },
     source: "builtin"
   },
-  fn: import("./create_file.node-BnMPGgD2.js").then(
+  fn: import("./create_file.node-D2LDnTZ6.js").then(
     ({ nodeCreateFileTool: t }) => t
   )
 }, Xt = "Grep", GC = 15, YC = 250, qC = `Search for exact text patterns in files using ripgrep, a fast keyword search tool.
@@ -7190,7 +7190,7 @@ COMPLEMENTARY USE WITH CODEBASE_SEARCH:
     },
     source: "builtin"
   },
-  fn: import("./node-C1YHImbI.js").then(({ nodeGrepTool: t }) => t)
+  fn: import("./node-DgFnFiEl.js").then(({ nodeGrepTool: t }) => t)
 }, hr = "read_file", HC = 1e3, yn = {
   spec: {
     name: hr,
@@ -7222,7 +7222,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-2sVFQX4N.js").then(({ nodeReadFileTool: t }) => t);
+        return import("./read_file.node-FBiGQRUp.js").then(({ nodeReadFileTool: t }) => t);
     }
   })()
 }, $C = gC({
@@ -7251,7 +7251,7 @@ If you need to replace the entire contents of a file, use \`${ri}\` instead, sin
     inputSchema: kD($C),
     source: "builtin"
   },
-  fn: import("./edit_file.node-D2Wa6RXM.js").then(({ nodeEditFileTool: t }) => t)
+  fn: import("./edit_file.node-Ccrf_Tyh.js").then(({ nodeEditFileTool: t }) => t)
 };
 async function lJ(t, e, r, n) {
   e = Zn(e);
@@ -7669,7 +7669,11 @@ function s0(t) {
   const e = [];
   return t.currentlyVisibleFiles && (t.currentlyVisibleFiles.length > 0 ? e.push(
     `Currently visible files user has open: ${t.currentlyVisibleFiles.join(", ")}`
-  ) : e.push("Currently visible files user has open: none")), t.activeEditor && e.push(`Currently active editor: ${t.activeEditor}`), t.activeEditor && !rh(t.activeEditor) && (t.selectionRange ? (e.push(
+  ) : e.push("Currently visible files user has open: none")), t.runningTerminalCommands && t.runningTerminalCommands.length > 0 && e.push(
+    `Currently running terminal commands:
+  ${t.runningTerminalCommands.join(`
+ `)}`
+  ), t.activeEditor && e.push(`Currently active editor: ${t.activeEditor}`), t.activeEditor && !rh(t.activeEditor) && (t.selectionRange ? (e.push(
     `Selection range: ${t.selectionRange.start.line}:${t.selectionRange.start.column}-${t.selectionRange.end.line}:${t.selectionRange.end.column}`
   ), e.push(`Selected text: \`${t.selectionRange.content}\``)) : t.cursorLocation && (e.push(
     `Current cursor location: ${t.cursorLocation.line}:${t.cursorLocation.column}`
@@ -8252,7 +8256,7 @@ Note: Results are sorted by modification time with the most recently modified fi
     },
     source: "builtin"
   },
-  fn: import("./glob.node-Cfv1JwiF.js").then(({ nodeGlobTool: t }) => t)
+  fn: import("./glob.node-C_0Pojo_.js").then(({ nodeGlobTool: t }) => t)
 }, ii = "list_directory", u_ = {
   spec: {
     name: ii,
@@ -8273,7 +8277,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-Dmx2XM_W.js").then(
+        return import("./list_directory.node-CChuHPoL.js").then(
           ({ nodeListDirectoryTool: t }) => t
         );
     }
@@ -9097,7 +9101,7 @@ It's VERY IMPORTANT to use specific tools when searching for files, instead of i
     },
     source: "builtin"
   },
-  fn: import("./node-DSPACSAV.js").then(({ nodeBashTool: t }) => t)
+  fn: import("./node-B8I2GAD6.js").then(({ nodeBashTool: t }) => t)
 }, $0 = [
   "ls",
   "dir",
@@ -9428,7 +9432,7 @@ This tool converts web content to markdown format for better readability.`,
       requiresNetwork: !0
     }
   },
-  fn: import("./node-Bt-aqwyP.js").then(({ nodeReadWebPageTool: t }) => t)
+  fn: import("./node-gL35nPzg.js").then(({ nodeReadWebPageTool: t }) => t)
 }, uh = "think", X0 = (t, e) => An(async () => ({ status: "done", result: "Thoughts have been logged." })), Z0 = {
   spec: {
     name: uh,
@@ -9493,7 +9497,7 @@ the \`${Bu}\` with the url.
       requiresNetwork: !0
     }
   },
-  fn: import("./node-DUQOAXRE.js").then(({ nodeWebSearchTool: t }) => t)
+  fn: import("./node-BcU66Cp7.js").then(({ nodeWebSearchTool: t }) => t)
 }, Sn = "Task", Uu = [
   u_,
   sa,
@@ -10208,7 +10212,7 @@ Returns a git-style diff showing the changes that were undone as formatted markd
     },
     source: "builtin"
   },
-  fn: import("./undo_edit.node-CQG6mtZj.js").then(({ nodeUndoEditTool: t }) => t)
+  fn: import("./undo_edit.node-NCKppvcB.js").then(({ nodeUndoEditTool: t }) => t)
 };
 function xJ(t, e, r) {
   const n = [], a = [];
@@ -54360,10 +54364,10 @@ export {
   i0 as a7,
   mJ as a8,
   fJ as a9,
-  RZ as aA,
-  rE as aB,
-  En as aC,
-  vJ as aD,
+  hZ as aA,
+  MT as aB,
+  RZ as aC,
+  rE as aD,
   FJ as aE,
   BJ as aF,
   JZ as aG,
@@ -54409,10 +54413,10 @@ export {
   nn as at,
   FT as au,
   m0 as av,
-  qZ as aw,
-  Ev as ax,
-  hZ as ay,
-  MT as az,
+  En as aw,
+  vJ as ax,
+  qZ as ay,
+  Ev as az,
   OS as b,
   hJ as b0,
   xu as b1,
@@ -54451,4 +54455,4 @@ export {
   vZ as y,
   YZ as z
 };
-//# sourceMappingURL=color-Bf2jGwiV.js.map
+//# sourceMappingURL=color-BV9wbewg.js.map