amp-acp 0.6.1 → 0.7.0

package/dist/index.js

@@ -10,6 +10,12 @@ var __export = (target, all) => {
     });
 };
 
+// src/index.ts
+import fs2 from "node:fs";
+import path3 from "node:path";
+import os2 from "node:os";
+import readline from "node:readline";
+
 // node_modules/zod/v3/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -5104,6 +5110,7 @@ import { spawn } from "node:child_process";
 import fs from "node:fs";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
+import os from "node:os";
 import path from "node:path";
 import { createInterface } from "node:readline";
 var __defProp2 = Object.defineProperty;
@@ -9119,18 +9126,42 @@ var PermissionSchema = exports_external2.object({
     });
   }
 });
-var MCPServerSchema = exports_external2.object({
+var MCPOAuthConfigSchema = exports_external2.object({
+  clientId: exports_external2.string().describe("OAuth client ID"),
+  clientSecret: exports_external2.string().describe("OAuth client secret").optional(),
+  authUrl: exports_external2.string().describe("OAuth authorization URL"),
+  tokenUrl: exports_external2.string().describe("OAuth token URL"),
+  scopes: exports_external2.array(exports_external2.string()).describe("OAuth scopes").optional(),
+  redirectUrl: exports_external2.string().describe("OAuth redirect URL").optional()
+}).describe("OAuth configuration for HTTP MCP servers");
+var MCPStdioServerSchema = exports_external2.object({
   command: exports_external2.string().describe("Command to run the MCP server"),
   args: exports_external2.array(exports_external2.string()).describe("Arguments for the MCP server command").optional(),
   env: exports_external2.record(exports_external2.string(), exports_external2.string()).describe("Environment variables for the server").optional(),
   disabled: exports_external2.boolean().describe("Whether the server is disabled").optional()
 });
+var MCPHttpServerSchema = exports_external2.object({
+  url: exports_external2.string().describe("URL of the HTTP MCP server"),
+  headers: exports_external2.record(exports_external2.string(), exports_external2.string()).describe("HTTP headers to send with requests").optional(),
+  transport: exports_external2.string().describe('Transport type (e.g., "sse")').optional(),
+  oauth: MCPOAuthConfigSchema.describe("OAuth configuration for authentication").optional(),
+  disabled: exports_external2.boolean().describe("Whether the server is disabled").optional()
+});
+var MCPServerSchema = exports_external2.union([MCPStdioServerSchema, MCPHttpServerSchema]);
 var MCPConfigSchema = exports_external2.record(exports_external2.string(), MCPServerSchema).describe("MCP server configurations keyed by server name");
+var VisibilitySchema = exports_external2.enum(["private", "public", "workspace", "group"]);
+var ThreadsNewOptionsSchema = exports_external2.object({
+  visibility: VisibilitySchema.optional().describe("Thread visibility")
+});
+var ThreadsMarkdownOptionsSchema = exports_external2.object({
+  threadId: exports_external2.string().describe("The thread ID to get markdown for")
+});
 var AmpOptionsSchema = exports_external2.object({
   cwd: exports_external2.string().describe("Current working directory").optional(),
-  mode: exports_external2.enum(["smart", "rush", "large"]).describe("Agent mode - controls the model, system prompt, and tool selection").default("smart").optional(),
+  mode: exports_external2.enum(["smart", "rush", "large", "deep"]).describe("Agent mode - controls the model, system prompt, and tool selection").default("smart").optional(),
   dangerouslyAllowAll: exports_external2.boolean().describe("Allow all tool usage without asking for permission").optional(),
-  visibility: exports_external2.enum(["private", "public", "workspace", "group"]).describe("Visibility level for new threads").default("workspace").optional(),
+  archive: exports_external2.boolean().describe("Archive the thread after execution completes").optional(),
+  visibility: VisibilitySchema.describe("Visibility level for new threads").default("workspace").optional(),
   settingsFile: exports_external2.string().describe("Settings file path").optional(),
   logLevel: exports_external2.enum(["debug", "info", "warn", "error", "audit"]).describe("Log level").optional(),
   logFile: exports_external2.string().describe("Log file path").optional(),
@@ -9138,7 +9169,11 @@ var AmpOptionsSchema = exports_external2.object({
   env: exports_external2.record(exports_external2.string(), exports_external2.string()).describe("Additional environment variables").optional(),
   continue: exports_external2.union([exports_external2.boolean(), exports_external2.string()]).describe("Continue the most recent thread (true) or a specific thread by ID (string)").optional(),
   toolbox: exports_external2.string().describe("Folder path with toolbox scripts").optional(),
-  permissions: exports_external2.array(PermissionSchema).describe("Permission rules for tool usage").optional()
+  skills: exports_external2.string().describe("Folder path with custom skills").optional(),
+  permissions: exports_external2.array(PermissionSchema).describe("Permission rules for tool usage").optional(),
+  labels: exports_external2.array(exports_external2.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9-]*$/, "Labels must start with alphanumeric and contain only alphanumeric characters and hyphens").min(1, "Label must be at least 1 character").max(32, "Label must be at most 32 characters")).max(20, "Maximum 20 labels allowed").describe("Labels to add to the thread (repeatable CLI --label)").optional(),
+  enabledTools: exports_external2.array(exports_external2.string()).describe('Array of tool name patterns to enable. Supports glob patterns (e.g., "mcp__metabase__*"). If not provided, all tools are enabled. If provided, only matching tools are enabled.').optional(),
+  systemPrompt: exports_external2.string().describe("Custom system prompt text to append to the base system prompt for integration-specific customizations").optional()
 }).strict();
 var isWindows = process.platform === "win32";
 async function* execute(options) {
@@ -9172,22 +9207,9 @@ async function* execute(options) {
     }
     yield* processOutputStream(ampProcess.stdout);
     const { exitCode, stderr, signal: processSignal } = await waitForProcess(ampProcess, signal);
-    if (exitCode === null) {
-      if (signal?.aborted) {
-        throw new Error("Amp CLI process was aborted");
-      } else if (processSignal) {
-        throw new Error(`Amp CLI process was killed by signal ${processSignal}`);
-      } else {
-        throw new Error("Amp CLI process terminated unexpectedly");
-      }
-    } else if (exitCode !== 0) {
-      const errorDetails = stderr ? `: ${stderr}` : "";
-      throw new Error(`Amp CLI process exited with code ${exitCode}${errorDetails}`);
-    }
+    throwIfProcessFailed(exitCode, stderr, processSignal, signal);
   } catch (error) {
-    if (!ampProcess.killed) {
-      ampProcess.kill(isWindows ? "SIGKILL" : "SIGTERM");
-    }
+    killProcess(ampProcess);
     throw error;
   } finally {
     await cleanupTempFile();
@@ -9198,7 +9220,14 @@ function generateSessionId() {
   return `sdk-${Date.now()}-${randomHex}`;
 }
 async function buildSettingsFile(options, sessionId) {
-  if (!options.permissions && !options.mode) {
+  const settingsFields = [
+    options.permissions,
+    options.mode,
+    options.skills,
+    options.enabledTools,
+    options.systemPrompt
+  ];
+  if (!settingsFields.some(Boolean)) {
     return {
       settingsFilePath: null,
       cleanupTempFile: async () => {}
@@ -9218,11 +9247,22 @@ async function buildSettingsFile(options, sessionId) {
       }
     }
   }
-  mergedSettings["amp.permissions"] = options.permissions;
-  if (options.mode === "large") {
-    mergedSettings["amp.internal.visibleModes"] = (mergedSettings["amp.internal.visibleModes"] ?? []).concat("large");
+  if (options.permissions) {
+    mergedSettings["amp.permissions"] = options.permissions;
+  }
+  if (options.enabledTools) {
+    mergedSettings["amp.tools.enable"] = options.enabledTools;
+  }
+  if (options.systemPrompt) {
+    mergedSettings["amp.systemPrompt"] = options.systemPrompt;
+  }
+  if (options.skills) {
+    mergedSettings["amp.skills.path"] = options.skills;
   }
   await mkdir(tempDir, { recursive: true });
+  if (process.env.AMP_DEBUG) {
+    console.log("[SDK] Writing settings file:", tempSettingsPath, mergedSettings);
+  }
   await writeFile(tempSettingsPath, JSON.stringify(mergedSettings, null, 2), "utf-8");
   return {
     settingsFilePath: tempSettingsPath,
@@ -9243,7 +9283,7 @@ function buildEnvironmentVariables(options) {
   if (options.env) {
     Object.assign(env, options.env);
   }
-  env.AMP_SDK_VERSION = "0.1.0-20251214200908-g3251f72";
+  env.AMP_SDK_VERSION = "0.1.0-20260220044036-g88868e6";
   return env;
 }
 function spawnAmpCli(args, options) {
@@ -9259,6 +9299,21 @@ function spawnAmpCli(args, options) {
   return childProcess;
 }
 function findAmpCommand() {
+  const localAmpCommand = resolveLocalAmpPackageCommand();
+  if (localAmpCommand) {
+    return localAmpCommand;
+  }
+  const homeAmpCommand = resolveLocalAmpCommand();
+  if (homeAmpCommand) {
+    return homeAmpCommand;
+  }
+  const pathAmpCommand = resolveAmpFromPath();
+  if (pathAmpCommand) {
+    return pathAmpCommand;
+  }
+  throw new Error("Could not find local @sourcegraph/amp package or amp binary. Make sure it is installed.");
+}
+function resolveLocalAmpPackageCommand() {
   try {
     const require2 = createRequire(import.meta.url);
     const pkgJsonPath = require2.resolve("@sourcegraph/amp/package.json");
@@ -9276,29 +9331,41 @@ function findAmpCommand() {
     if (error instanceof Error && error.message.includes("Local @sourcegraph/amp")) {
       throw error;
     }
-    // Fallback: look for amp CLI in well-known locations and PATH
-    const { execFileSync } = require("node:child_process");
-    const os = require("node:os");
-    const candidates = [];
-    const homeDir = os.homedir();
-    candidates.push(path.join(homeDir, ".amp", "bin", "amp"));
-    if (process.platform === "win32") {
-      candidates.push(path.join(homeDir, ".amp", "bin", "amp.exe"));
+    return null;
+  }
+}
+function resolveLocalAmpCommand() {
+  const candidates = isWindows ? ["amp.exe", "amp.cmd", "amp"] : ["amp"];
+  const ampBinDir = path.join(os.homedir(), ".amp", "bin");
+  for (const candidate of candidates) {
+    const candidatePath = path.join(ampBinDir, candidate);
+    if (fs.existsSync(candidatePath)) {
+      return {
+        command: candidatePath,
+        args: []
+      };
+    }
+  }
+  return null;
+}
+function resolveAmpFromPath() {
+  const pathEntries = process.env.PATH?.split(path.delimiter) ?? [];
+  const candidates = isWindows ? ["amp.exe", "amp.cmd", "amp"] : ["amp"];
+  for (const pathEntry of pathEntries) {
+    if (!pathEntry) {
+      continue;
     }
     for (const candidate of candidates) {
-      if (fs.existsSync(candidate)) {
-        return { command: candidate, args: [] };
+      const candidatePath = path.join(pathEntry, candidate);
+      if (fs.existsSync(candidatePath)) {
+        return {
+          command: candidatePath,
+          args: []
+        };
       }
     }
-    try {
-      const whichCmd = process.platform === "win32" ? "where" : "which";
-      const result = execFileSync(whichCmd, ["amp"], { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
-      if (result) {
-        return { command: result, args: [] };
-      }
-    } catch {}
-    throw new Error("Could not find amp CLI. Install it from https://ampcode.com or ensure @sourcegraph/amp is available.");
   }
+  return null;
 }
 function buildCliArgs(options) {
   const args = [];
@@ -9311,6 +9378,9 @@ function buildCliArgs(options) {
   if (options.dangerouslyAllowAll) {
     args.push("--dangerously-allow-all");
   }
+  if (options.archive) {
+    args.push("--archive");
+  }
   if (options.visibility) {
     args.push("--visibility", options.visibility);
   }
@@ -9330,8 +9400,32 @@ function buildCliArgs(options) {
   if (options.mode) {
     args.push("--mode", options.mode);
   }
+  if (options.labels) {
+    for (const label of options.labels) {
+      args.push("--label", label);
+    }
+  }
   return args;
 }
+function throwIfProcessFailed(exitCode, stderr, processSignal, signal) {
+  if (exitCode === null) {
+    if (signal?.aborted) {
+      throw new Error("Amp CLI process was aborted");
+    } else if (processSignal) {
+      throw new Error(`Amp CLI process was killed by signal ${processSignal}`);
+    } else {
+      throw new Error("Amp CLI process terminated unexpectedly");
+    }
+  } else if (exitCode !== 0) {
+    const errorDetails = stderr ? `: ${stderr.trim()}` : "";
+    throw new Error(`Amp CLI process exited with code ${exitCode}${errorDetails}`);
+  }
+}
+function killProcess(proc) {
+  if (!proc.killed) {
+    proc.kill(isWindows ? "SIGKILL" : "SIGTERM");
+  }
+}
 async function* processOutputStream(stdout) {
   if (!stdout) {
     throw new Error("No stdout stream available from Amp CLI process");
@@ -9553,10 +9647,13 @@ function safeJson(x) {
     return;
   }
 }
+
+// src/server.ts
+import path2 from "node:path";
 // package.json
 var package_default = {
   name: "amp-acp",
-  version: "0.6.1",
+  version: "0.7.0",
   private: false,
   type: "module",
   main: "dist/index.js",
@@ -9573,18 +9670,18 @@ var package_default = {
     url: "https://github.com/tao12345666333/amp-acp"
   },
   scripts: {
-    build: "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun scripts/patch-find-amp.ts",
-    "build:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun scripts/patch-find-amp.ts && bun build dist/index.js --compile --outfile dist/amp-acp",
+    build: "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js",
+    "build:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun build dist/index.js --compile --outfile dist/amp-acp",
     start: "bun dist/index.js",
     lint: "tsc --noEmit",
     test: "bun test src/",
-    "test:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun scripts/patch-find-amp.ts && bun build dist/index.js --compile --outfile dist/amp-acp-test && bun test test/binary.test.ts",
+    "test:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun build dist/index.js --compile --outfile dist/amp-acp-test && bun test test/binary.test.ts",
     "test:all": "bun run test && bun run test:binary"
   },
   dependencies: {
     "@agentclientprotocol/sdk": "0.4.8",
     "@sourcegraph/amp": "^0.0.1765685598-g5365e6",
-    "@sourcegraph/amp-sdk": "^0.1.0-20251214200908-g3251f72"
+    "@sourcegraph/amp-sdk": "0.1.0-20260220044036-g88868e6"
   },
   devDependencies: {
     "@types/bun": "^1.2.5",
@@ -9607,12 +9704,29 @@ class AmpAcpAgent {
     console.info(`[acp] amp-acp v${PACKAGE_VERSION} initialized`);
     return {
       protocolVersion: 1,
-      _meta: { version: PACKAGE_VERSION },
+      agentInfo: {
+        name: "amp-acp",
+        title: "Amp ACP Agent",
+        version: PACKAGE_VERSION
+      },
       agentCapabilities: {
         promptCapabilities: { image: true, embeddedContext: true },
         mcpCapabilities: { http: true, sse: true }
       },
-      authMethods: []
+      authMethods: [
+        {
+          id: "setup",
+          name: "Amp API Key Setup",
+          description: "Run interactive setup to configure your Amp API key",
+          _meta: {
+            "terminal-auth": {
+              command: getTerminalAuthCommand(),
+              args: ["--setup"],
+              label: "Amp API Key Setup"
+            }
+          }
+        }
+      ]
     };
   }
   async newSession(params) {
@@ -9658,6 +9772,9 @@ class AmpAcpAgent {
     return result;
   }
   async authenticate(_params) {
+    if (process.env.AMP_API_KEY) {
+      return {};
+    }
     throw RequestError.authRequired();
   }
   async prompt(params) {
@@ -9733,6 +9850,10 @@ ${chunk.resource.text}
           }
         }
         if (message.type === "result" && message.is_error) {
+          if (typeof message.error === "string" && isAuthError(message.error)) {
+            console.error("[amp] Auth error in result, requesting authentication:", message.error);
+            throw RequestError.authRequired();
+          }
           await this.client.sessionUpdate({
             sessionId: params.sessionId,
             update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: `Error: ${message.error}` } }
@@ -9744,6 +9865,10 @@ ${chunk.resource.text}
       if (s.cancelled || err instanceof Error && (err.name === "AbortError" || err.message.includes("aborted"))) {
         return { stopReason: "cancelled" };
       }
+      if (err instanceof Error && isAuthError(err.message)) {
+        console.error("[amp] Auth error, requesting authentication:", err.message);
+        throw RequestError.authRequired();
+      }
       console.error("[amp] Execution error:", err);
       throw err;
     } finally {
@@ -9778,6 +9903,17 @@ ${chunk.resource.text}
     return this.client.writeTextFile(params);
   }
 }
+function isAuthError(message) {
+  const lower = message.toLowerCase();
+  return lower.includes("invalid or missing api key") || lower.includes("run 'amp login'") || lower.includes("authentication") || lower.includes("unauthorized") || lower.includes("no api key found") || lower.includes("api key") && lower.includes("login flow") || lower.includes("api key") && (lower.includes("missing") || lower.includes("invalid"));
+}
+function getTerminalAuthCommand(argv1 = process.argv[1], execPath = process.execPath) {
+  const resolvedArgv1 = argv1 ? path2.resolve(argv1) : "";
+  if (!resolvedArgv1 || resolvedArgv1.startsWith("/$bunfs/")) {
+    return execPath;
+  }
+  return resolvedArgv1;
+}
 
 // src/run-acp.ts
 function runAcp() {
@@ -9792,5 +9928,62 @@ console.log = console.error;
 console.info = console.error;
 console.warn = console.error;
 console.debug = console.error;
-runAcp();
-process.stdin.resume();
+function getConfigDir() {
+  if (process.platform === "win32") {
+    return path3.join(process.env.APPDATA ?? path3.join(os2.homedir(), "AppData", "Roaming"), "amp-acp");
+  }
+  return path3.join(process.env.XDG_CONFIG_HOME ?? path3.join(os2.homedir(), ".config"), "amp-acp");
+}
+function getCredentialsPath() {
+  return path3.join(getConfigDir(), "credentials.json");
+}
+function loadStoredApiKey() {
+  const credPath = getCredentialsPath();
+  try {
+    const data = JSON.parse(fs2.readFileSync(credPath, "utf-8"));
+    return data.apiKey || undefined;
+  } catch {
+    return;
+  }
+}
+function prompt(question) {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+async function setup() {
+  const existing = process.env.AMP_API_KEY || loadStoredApiKey();
+  if (existing) {
+    console.error("AMP API key is already configured.");
+    process.exit(0);
+  }
+  console.error("You can get your API key from: https://ampcode.com/settings");
+  const apiKey = await prompt("Paste your AMP API key: ");
+  if (!apiKey) {
+    console.error("No API key provided. Aborting.");
+    process.exit(1);
+  }
+  const configDir = getConfigDir();
+  fs2.mkdirSync(configDir, { recursive: true });
+  const credPath = getCredentialsPath();
+  fs2.writeFileSync(credPath, JSON.stringify({ apiKey }, null, 2) + `
+`, { mode: 384 });
+  console.error(`API key saved to ${credPath}`);
+  process.exit(0);
+}
+if (process.argv.includes("--setup")) {
+  await setup();
+} else {
+  if (!process.env.AMP_API_KEY) {
+    const stored = loadStoredApiKey();
+    if (stored) {
+      process.env.AMP_API_KEY = stored;
+    }
+  }
+  runAcp();
+  process.stdin.resume();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amp-acp",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "private": false,
   "type": "module",
   "main": "dist/index.js",
@@ -17,18 +17,18 @@
     "url": "https://github.com/tao12345666333/amp-acp"
   },
   "scripts": {
-    "build": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun scripts/patch-find-amp.ts",
-    "build:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun scripts/patch-find-amp.ts && bun build dist/index.js --compile --outfile dist/amp-acp",
+    "build": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js",
+    "build:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun build dist/index.js --compile --outfile dist/amp-acp",
     "start": "bun dist/index.js",
     "lint": "tsc --noEmit",
     "test": "bun test src/",
-    "test:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun scripts/patch-find-amp.ts && bun build dist/index.js --compile --outfile dist/amp-acp-test && bun test test/binary.test.ts",
+    "test:binary": "bun build src/index.ts --target=node --outdir=dist --entry-naming=[dir]/[name].js && bun build dist/index.js --compile --outfile dist/amp-acp-test && bun test test/binary.test.ts",
     "test:all": "bun run test && bun run test:binary"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "0.4.8",
     "@sourcegraph/amp": "^0.0.1765685598-g5365e6",
-    "@sourcegraph/amp-sdk": "^0.1.0-20251214200908-g3251f72"
+    "@sourcegraph/amp-sdk": "0.1.0-20260220044036-g88868e6"
   },
   "devDependencies": {
     "@types/bun": "^1.2.5",