@sourcegraph/amp 0.0.1748330494-g3f0084 → 0.0.1748332886-g724284

package/dist/amp.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import "./color-CXy0Mt1O.js";
-import "./main-NdzEy1DN.js";
+import "./color-BESHF9Kn.js";
+import "./main-B-Pg2140.js";
 import "node:crypto";
 import "node:fs/promises";
 import "node:path";
 import "node:process";
-import "./client-DcfjDd4A.js";
+import "./client-Brt5PSmQ.js";
 //# sourceMappingURL=amp.js.map

package/dist/{client-DcfjDd4A.js → client-Brt5PSmQ.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { f as i, b7 as n, r as a, s as p, p as c } from "./color-CXy0Mt1O.js";
+import { f as i, b7 as n, r as a, s as p, p as c } from "./color-BESHF9Kn.js";
 const u = a.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-DcfjDd4A.js.map
+//# sourceMappingURL=client-Brt5PSmQ.js.map

package/dist/{client-DcfjDd4A.js.map → client-Brt5PSmQ.js.map}

@@ -1 +1 @@
-{"version":3,"file":"client-DcfjDd4A.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-Brt5PSmQ.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-CXy0Mt1O.js → color-BESHF9Kn.js}

@@ -6986,7 +6986,7 @@ Prefer this tool over \`edit_file\` when you want to ovewrite the entire content
     },
     source: "builtin"
   },
-  fn: import("./create_file.node-Cnd4Nn8b.js").then(
+  fn: import("./create_file.node-DzdShAEK.js").then(
     ({ nodeCreateFileTool: t }) => t
   )
 }, Xt = "Grep", xC = 15, LC = 250, PC = `Search for exact text patterns in files using ripgrep, a fast keyword search tool.
@@ -7119,7 +7119,7 @@ COMPLEMENTARY USE WITH CODEBASE_SEARCH:
     },
     source: "builtin"
   },
-  fn: import("./node-aMyd1IN4.js").then(({ nodeGrepTool: t }) => t)
+  fn: import("./node-DKVVBako.js").then(({ nodeGrepTool: t }) => t)
 }, hr = "read_file", FC = 1e3, yn = {
   spec: {
     name: hr,
@@ -7151,7 +7151,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-BjBOaIme.js").then(({ nodeReadFileTool: t }) => t);
+        return import("./read_file.node-IpcUo_BE.js").then(({ nodeReadFileTool: t }) => t);
     }
   })()
 }, BC = lC({
@@ -7180,7 +7180,7 @@ If you need to replace the entire contents of a file, use \`${ni}\` instead, sin
     inputSchema: RD(BC),
     source: "builtin"
   },
-  fn: import("./edit_file.node-Be3medtb.js").then(({ nodeEditFileTool: t }) => t)
+  fn: import("./edit_file.node-CGjz-CjQ.js").then(({ nodeEditFileTool: t }) => t)
 };
 async function eJ(t, e, r, n) {
   e = Zn(e);
@@ -8149,7 +8149,7 @@ Note: Results are sorted by modification time with the most recently modified fi
     },
     source: "builtin"
   },
-  fn: import("./glob.node-CA1MWD1b.js").then(({ nodeGlobTool: t }) => t)
+  fn: import("./glob.node-w_rvEIQN.js").then(({ nodeGlobTool: t }) => t)
 }, si = "list_directory", u_ = {
   spec: {
     name: si,
@@ -8170,7 +8170,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-C_O--JLs.js").then(
+        return import("./list_directory.node-CWGn90hA.js").then(
           ({ nodeListDirectoryTool: t }) => t
         );
     }
@@ -8920,22 +8920,25 @@ const ar = "Bash", x0 = 5e4, gJ = "run_terminal_command", L0 = `Executes the giv
    - If the command will create new directories or files, first use the list_directory tool to verify the parent directory exists and is the correct location
    - For example, before running a mkdir command, first use list_directory to check the parent directory exists
 
-2. Working directory
-   - Your working directory is at the root of the user's project unless you override it for a command by setting the \`cwd\` parameter.
-   - Use the \`cwd\` parameter to specify a relative path to a directory in the workspace where the command should be executed (e.g., \`cwd: "core/src"\`).
-   - You can use \`cd\` within a single command with \`&&\` (e.g., \`cd subdir && command\`), but it won't persist between separate tool calls.
+2. Working directory:
+   - Your working directory is at the root of the user's workspace unless you override it for a command by setting the \`cwd\` parameter.
+   - Use the \`cwd\` parameter to specify an absolute or relative path to a directory where the command should be executed (e.g., \`cwd: "core/src"\`).
+   - You may use \`cd PATH && COMMAND\` if the user explicitly requests it, otherwise prefer using the \`cwd\` parameter.
 
-3. Multiple independent commands
+3. Multiple independent commands:
    - Do NOT chain multiple independent commands with \`;\`
    - Instead, make multiple separate tool calls for each command you want to run
 
-4. Shell escapes
+4. Shell escapes:
    - Escape any special characters in the command if those are not to be interpreted by the shell
 
-5. Truncated output
+5. Truncated output:
    - Only the last ${x0} characters of the output will be returned to you along with how many lines got truncated, if any
    - If necessary, when the output is truncated, consider running the command again with a grep or head filter to search through the truncated lines
 
+6. Stateless environment:
+   - Setting an environment variable or using \`cd\` only impacts a single command, it does not persist between commands
+
 ## Examples
 
 - To run 'go test ./...': use { cmd: 'go test ./...' }
@@ -8991,7 +8994,7 @@ It's VERY IMPORTANT to use specific tools when searching for files, instead of i
     },
     source: "builtin"
   },
-  fn: import("./node-Dc7OwtlA.js").then(({ nodeBashTool: t }) => t)
+  fn: import("./node-BgA31Dpt.js").then(({ nodeBashTool: t }) => t)
 }, P0 = [
   "ls",
   "dir",
@@ -9322,7 +9325,7 @@ This tool converts web content to markdown format for better readability.`,
       requiresNetwork: !0
     }
   },
-  fn: import("./node-CS0yja_J.js").then(({ nodeReadWebPageTool: t }) => t)
+  fn: import("./node-Dr8IF45b.js").then(({ nodeReadWebPageTool: t }) => t)
 }, oh = "think", Y0 = (t, e) => An(async () => ({ status: "done", result: "Thoughts have been logged." })), q0 = {
   spec: {
     name: oh,
@@ -9387,7 +9390,7 @@ the \`${Bu}\` with the url.
       requiresNetwork: !0
     }
   },
-  fn: import("./node-BRttyTrh.js").then(({ nodeWebSearchTool: t }) => t)
+  fn: import("./node-BM8mGi3n.js").then(({ nodeWebSearchTool: t }) => t)
 }, Sn = "Task", Uu = [
   u_,
   sa,
@@ -10102,7 +10105,7 @@ Returns a git-style diff showing the changes that were undone as formatted markd
     },
     source: "builtin"
   },
-  fn: import("./undo_edit.node-DB9rujSj.js").then(({ nodeUndoEditTool: t }) => t)
+  fn: import("./undo_edit.node-CKgcVuoz.js").then(({ nodeUndoEditTool: t }) => t)
 };
 function CJ(t, e, r) {
   const n = [], a = [];
@@ -54342,4 +54345,4 @@ export {
   MZ as y,
   $Z as z
 };
-//# sourceMappingURL=color-CXy0Mt1O.js.map
+//# sourceMappingURL=color-BESHF9Kn.js.map