@anhlp/alp 0.0.0-beta.1 → 0.0.0-beta.2

package/docs/modular-monorepo.md

@@ -53,7 +53,7 @@ npm run build --workspace=@anhlp/alp-runtime
 npm run test --workspace=@anhlp/alp-runtime
 ```
 
-Root `npm run build` retains the neutral legacy bundle paths and builds the CLI without Paseo. `npm run build:paseo` builds the optional plugin. Workspace builds compile the selected package and its dependencies, preserving individual module imports and emitting declarations. The `alp-source` export condition is only for repository builds/typechecking; published consumers use ordinary JavaScript and declaration exports.
+Root `npm run build` retains the neutral legacy bundle paths and builds the CLI without Paseo. `npm run build:paseo` builds the optional plugin. Workspace builds compile the selected package and its dependencies, preserving individual module imports and emitting declarations. The `alp-source` export condition is only for repository builds/typechecking; published consumers use ordinary JavaScript and declaration exports. The Paseo plugin `@anhlp/alp-paseo` is the exception: it ships no declarations, since Paseo installs an `npm:` plugin without its peers and resolves every type import ([#111](https://github.com/phucanh08/alp/issues/111)).
 
 ## Test layout
 
@@ -138,7 +138,7 @@ Restarting is non-destructive. `alp daemon restart` (or the plugin's supervision
 
 ## Independent versions and publishing
 
-> **For the beta `0.0.0-beta.1`, do not use the commands in this section.** The beta gives all
+> **For the beta `0.0.0-beta.2`, do not use the commands in this section.** The beta gives all
 > eight published packages one version, packs them once and publishes those tarballs with
 > `--tag beta`, following the manual checklist in [beta-scope.md](alp/beta-scope.md) §7. The
 > `npm publish` below has no `--tag`, so it would set `latest`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anhlp/alp",
-  "version": "0.0.0-beta.1",
+  "version": "0.0.0-beta.2",
   "description": "ALP command line and alpd, the per-user daemon that runs filesystem-defined Codex and Claude Code agent teams",
   "type": "module",
   "files": [
@@ -67,7 +67,7 @@
     "build:alp-web": "npm run build --workspace @anhlp/alp-web",
     "typecheck:alp-web": "npm run typecheck --workspace @anhlp/alp-web",
     "test:alp-web": "npm test --workspace @anhlp/alp-web",
-    "test:alp-web:e2e": "node scripts/build-workspace.mjs cli && node scripts/build-workspace.mjs daemon && npm run build --workspace @anhlp/alp-web && npm run test:e2e --workspace @anhlp/alp-web",
+    "test:alp-web:e2e": "npm run test:e2e --workspace @anhlp/alp-web",
     "validate:web": "node scripts/validate.mjs web"
   },
   "engines": {
@@ -91,9 +91,9 @@
     "zod": "4.4.3"
   },
   "dependencies": {
-    "@anhlp/alp-client": "0.0.0-beta.1",
-    "@anhlp/alp-core": "0.0.0-beta.1",
-    "@anhlp/alp-protocol": "0.0.0-beta.1",
+    "@anhlp/alp-client": "0.0.0-beta.2",
+    "@anhlp/alp-core": "0.0.0-beta.2",
+    "@anhlp/alp-protocol": "0.0.0-beta.2",
     "@anthropic-ai/claude-agent-sdk": "^0.3.292",
     "smol-toml": "1.9.0"
   },

package/packages/cli/dist/acp/agent.d.ts

@@ -22,8 +22,16 @@ export type AcpAgentOptions = {
 export declare function hostServers(servers?: acp.McpServer[]): Record<string, HostMcpServer>;
 /** A prompt's content as the text ALP gives the agent: files the editor attaches are named or inlined. */
 export declare function promptText(blocks: acp.ContentBlock[]): string;
-/** What kind of work a tool call is, from its name or its command's first word (Claude reports tools as `Read {…}`). */
-export declare function toolKind(item: Extract<TimelineItem, {
+type ToolItem = Extract<TimelineItem, {
     kind: 'tool_call';
-}>): acp.ToolKind;
+}>;
+/** What kind of work a tool call is: from its typed detail, else its name or its command's first word (older Claude items are `Read {…}` commands). */
+export declare function toolKind(item: ToolItem): acp.ToolKind;
+export declare function toolTitle(item: ToolItem, cwd?: string): string;
+export declare function toolOutput(item: ToolItem): acp.ToolCallContent[];
+/** The call's input as the editor shows it raw: a command, a typed call's own fields without its long texts, or the tool's input. */
+export declare function toolInput(item: ToolItem): unknown;
+/** The file a typed call read or changed, for the editor to follow. */
+export declare function toolLocations(item: ToolItem): acp.ToolCallLocation[] | undefined;
 export declare function createAcpAgent(options: AcpAgentOptions): acp.AgentApp;
+export {};

package/packages/cli/dist/acp/agent.js

@@ -2,6 +2,7 @@
 import * as acp from "@agentclientprotocol/sdk";
 import { randomUUID } from "node:crypto";
 import path from "node:path";
+var unlistedOf = ({ teams, team, teamLabel }) => teams.some((entry) => entry.id === team) ? void 0 : { id: team, label: teamLabel ?? (team === "custom" ? "Custom" : team) };
 var MODES = [
   { id: "read-only", name: "Read only", description: "Agents read and search; nothing is changed" },
   { id: "workspace-write", name: "Workspace write", description: "Agents change files and run commands inside the project" },
@@ -43,34 +44,120 @@ ${resource.text}
   }
   return text.trim();
 }
+function shown(file, cwd) {
+  if (!cwd || !path.isAbsolute(file)) return file;
+  const relative = path.relative(cwd, file);
+  return relative && !relative.startsWith("..") && !path.isAbsolute(relative) ? relative : file;
+}
 function toolKind(item) {
-  const word = item.detail.type === "shell" ? String(item.detail.command ?? "").trim().split(/[\s{(]/)[0] : item.name;
+  const detail = item.detail;
+  switch (detail.type) {
+    case "read":
+      return "read";
+    case "edit":
+    case "write":
+      return "edit";
+    case "search":
+      return detail.toolName === "web_search" ? "fetch" : "search";
+    case "fetch":
+      return "fetch";
+    case "plan":
+      return "think";
+    case "sub_agent":
+    case "plain_text":
+      return "other";
+  }
+  const word = detail.type === "shell" ? String(detail.command ?? "").trim().split(/[\s{(]/)[0] : item.name;
   if (/^(Read|NotebookRead|LS)$/.test(word)) return "read";
   if (/^(Edit|MultiEdit|Write|NotebookEdit)$/.test(word)) return "edit";
   if (/^(Grep|Glob)$/.test(word)) return "search";
   if (/^(WebFetch|WebSearch)$/.test(word)) return "fetch";
   if (/^(Skill|Task|TodoWrite)$/.test(word) || item.name.startsWith("alp_")) return "other";
-  return item.detail.type === "shell" ? "execute" : "other";
+  return detail.type === "shell" ? "execute" : "other";
 }
-function toolTitle(item) {
-  if (item.detail.type === "shell") return clip(String(item.detail.command ?? "").split("\n")[0], 160);
-  const input = item.detail.input ?? {};
+function toolTitle(item, cwd) {
+  const detail = item.detail;
+  switch (detail.type) {
+    case "shell":
+      return clip(String(detail.command ?? "").split("\n")[0], 160);
+    case "read":
+      return clip(`Read ${shown(detail.filePath, cwd)}`, 160);
+    case "edit":
+      return clip(`Edit ${shown(detail.filePath, cwd)}`, 160);
+    case "write":
+      return clip(`Write ${shown(detail.filePath, cwd)}`, 160);
+    case "search":
+      return clip(`${detail.toolName === "web_search" ? "Search the web" : "Search"} ${detail.query}`, 160);
+    case "fetch":
+      return clip(`Fetch ${detail.url}`, 160);
+    case "sub_agent":
+      return clip(`${detail.subAgentType ?? "Sub-agent"}${detail.description ? `: ${detail.description.split("\n")[0]}` : ""}`, 160);
+    case "plan":
+      return "Plan";
+    case "plain_text":
+      return clip(`${item.name}${detail.label ? `: ${detail.label}` : ""}`, 160);
+  }
+  const input = detail.input ?? {};
   if (item.name === "alp_delegate") return clip(`Delegate to ${input.agent ?? "an agent"}: ${String(input.task ?? "").split("\n")[0]}`, 160);
   return clip(`${item.name} ${JSON.stringify(input)}`, 160);
 }
+var bounded = (text) => text.length > OUTPUT_CHARS ? `${text.slice(0, OUTPUT_CHARS)}
+\u2026 (${text.length - OUTPUT_CHARS} more characters)` : text;
 function toolOutput(item) {
+  const detail = item.detail;
+  const parts = [];
   let text = "";
-  if (item.detail.type === "shell") text = item.detail.output ?? "";
-  else {
-    const output = item.detail.output;
-    text = Array.isArray(output) ? output.map((part) => typeof part?.text === "string" ? part.text : JSON.stringify(part)).join("\n") : output == null ? "" : typeof output === "string" ? output : JSON.stringify(output, null, 2);
+  switch (detail.type) {
+    case "shell":
+      text = detail.output ?? "";
+      break;
+    case "read":
+      text = detail.content ?? "";
+      break;
+    case "edit":
+      if (detail.newString !== void 0 || detail.oldString !== void 0) parts.push({ type: "diff", path: detail.filePath, oldText: detail.oldString ?? null, newText: detail.newString ?? "" });
+      else if (detail.unifiedDiff) text = "```diff\n" + detail.unifiedDiff + (detail.unifiedDiff.endsWith("\n") ? "" : "\n") + "```";
+      break;
+    case "write":
+      if (detail.content !== void 0) parts.push({ type: "diff", path: detail.filePath, oldText: null, newText: detail.content });
+      break;
+    case "search":
+      text = detail.content ?? [...detail.filePaths ?? [], ...(detail.webResults ?? []).map((hit) => `${hit.title} \u2014 ${hit.url}`)].join("\n");
+      break;
+    case "fetch":
+      text = detail.result ?? "";
+      break;
+    case "sub_agent":
+      text = detail.log || detail.description || "";
+      break;
+    case "plan":
+      text = detail.text;
+      break;
+    case "plain_text":
+      text = detail.text ?? "";
+      break;
+    default: {
+      const output = detail.output;
+      text = Array.isArray(output) ? output.map((part) => typeof part?.text === "string" ? part.text : JSON.stringify(part)).join("\n") : output == null ? "" : typeof output === "string" ? output : JSON.stringify(output, null, 2);
+    }
   }
   if (item.error) text = text ? `${text}
 ${item.error}` : item.error;
-  if (!text) return [];
-  if (text.length > OUTPUT_CHARS) text = `${text.slice(0, OUTPUT_CHARS)}
-\u2026 (${text.length - OUTPUT_CHARS} more characters)`;
-  return [{ type: "content", content: { type: "text", text } }];
+  if (text) parts.push({ type: "content", content: { type: "text", text: bounded(text) } });
+  return parts.map((part) => part.type === "diff" ? { ...part, newText: bounded(part.newText), ...part.oldText ? { oldText: bounded(part.oldText) } : {} } : part);
+}
+function toolInput(item) {
+  const detail = item.detail;
+  if (detail.type === "shell") return { command: detail.command, cwd: detail.cwd };
+  if (detail.type === "unknown" || !["read", "edit", "write", "search", "fetch", "sub_agent", "plan", "plain_text"].includes(detail.type)) return detail.input;
+  const { type: _type, content: _content, oldString: _old, newString: _new, unifiedDiff: _diff, result: _result, log: _log, text: _text, filePaths: _paths, webResults: _hits, ...rest } = detail;
+  return rest;
+}
+function toolLocations(item) {
+  const detail = item.detail;
+  if (detail.type !== "read" && detail.type !== "edit" && detail.type !== "write") return void 0;
+  const filePath = String(detail.filePath);
+  return [{ path: filePath, ...detail.type === "read" && typeof detail.offset === "number" ? { line: detail.offset } : {} }];
 }
 var clip = (text, chars) => text.length > chars ? `${text.slice(0, chars - 1)}\u2026` : text;
 var status = (state) => state === "running" ? "in_progress" : state;
@@ -109,7 +196,7 @@ function createAcpAgent(options) {
   }
   const say = (session, text) => send(session, { sessionUpdate: "agent_message_chunk", content: { type: "text", text } });
   function configOptions(session) {
-    const teams = session.opened ? session.preview.teams.filter((team) => team.id === session.preview.team) : session.preview.teams;
+    const teams = session.opened ? choices(session).filter((team) => team.id === session.preview.team) : choices(session);
     return [
       {
         id: "team",
@@ -118,14 +205,21 @@ function createAcpAgent(options) {
         type: "select",
         currentValue: session.preview.team,
         description: session.opened ? "A session keeps its team; start a new one for another team" : "The team that works on this session",
-        options: (teams.length ? teams : [{ id: session.preview.team, label: session.preview.teamLabel ?? session.preview.team }]).map((team) => ({ value: team.id, name: team.label, ...team.description ? { description: team.description } : {} }))
+        options: teams.map((team) => ({ value: team.id, name: team.label, ...team.description ? { description: team.description } : {} }))
       },
       { id: "mode", name: "Permissions", category: "mode", type: "select", currentValue: session.preview.mode, options: MODES.map((mode) => ({ value: mode.id, name: mode.name, description: mode.description })) }
     ];
   }
+  function choices(session) {
+    const { teams, team } = session.preview;
+    const own = unlistedOf(session.preview);
+    const first = session.unlisted && session.unlisted.id !== team && !teams.some((entry) => entry.id === session.unlisted.id) ? [session.unlisted] : [];
+    return [...first, ...own ? [own] : [], ...teams];
+  }
   const modeState = (session) => ({ currentModeId: session.preview.mode, availableModes: MODES });
   function track(id, cwd, mcpServers, preview2, opened) {
-    const session = { id, cwd, mcpServers, preview: preview2, opened, ours: /* @__PURE__ */ new Set(), texts: /* @__PURE__ */ new Map(), tools: /* @__PURE__ */ new Set(), questions: /* @__PURE__ */ new Map(), queue: Promise.resolve() };
+    const unlisted = unlistedOf(preview2);
+    const session = { id, cwd, mcpServers, preview: preview2, opened, ...unlisted ? { unlisted } : {}, ours: /* @__PURE__ */ new Set(), texts: /* @__PURE__ */ new Map(), tools: /* @__PURE__ */ new Set(), questions: /* @__PURE__ */ new Map(), queue: Promise.resolve() };
     sessions.set(id, session);
     return session;
   }
@@ -223,7 +317,8 @@ ${item2.text}`;
         send(session, { sessionUpdate: "plan", entries: item2.items.map((entry) => ({ content: entry.text, priority: "medium", status: entry.status })) });
         return;
       case "tool_call": {
-        const fields = { title: toolTitle(item2), kind: toolKind(item2), status: status(item2.status), content: toolOutput(item2), rawInput: item2.detail.type === "shell" ? { command: item2.detail.command, cwd: item2.detail.cwd } : item2.detail.input };
+        const locations = toolLocations(item2);
+        const fields = { title: toolTitle(item2, session.cwd), kind: toolKind(item2), status: status(item2.status), content: toolOutput(item2), rawInput: toolInput(item2), ...locations ? { locations } : {} };
         if (session.tools.has(item2.id)) send(session, { sessionUpdate: "tool_call_update", toolCallId: item2.id, ...fields });
         else {
           session.tools.add(item2.id);
@@ -356,7 +451,7 @@ ${item2.text}`;
     if (params.configId === "mode") await setMode(session, value);
     else if (params.configId === "team") {
       if (session.opened && value !== session.preview.team) throw acp.RequestError.invalidParams(void 0, "A session keeps its team; start a new one for another team");
-      if (!session.preview.teams.some((team) => team.id === value)) throw acp.RequestError.invalidParams(void 0, `Unknown team ${value}`);
+      if (!choices(session).some((team) => team.id === value)) throw acp.RequestError.invalidParams(void 0, `Unknown team ${value}`);
       session.preview = { ...await preview(session.cwd, session.mcpServers, value), mode: session.preview.mode };
     } else throw acp.RequestError.invalidParams(void 0, `Unknown option ${params.configId}`);
     return { configOptions: configOptions(session) };
@@ -386,5 +481,9 @@ export {
   createAcpAgent,
   hostServers,
   promptText,
-  toolKind
+  toolInput,
+  toolKind,
+  toolLocations,
+  toolOutput,
+  toolTitle
 };

package/packages/cli/dist/acp/main.js

@@ -6,7 +6,7 @@ import { startDaemon } from "@anhlp/alp-client/supervise";
 import { createLogger } from "@anhlp/alp-core/log";
 import { createAcpAgent } from "./agent.js";
 async function runAcp({ daemonEntry }) {
-  const version = true ? "0.0.0-beta.1" : "0.0.0";
+  const version = true ? "0.0.0-beta.2" : "0.0.0";
   const logger = createLogger({ component: "acp" });
   const log = (message, fields) => logger.warn(message, fields);
   const app = createAcpAgent({

package/packages/cli/dist/acp.js

@@ -18552,8 +18552,10 @@ var AlpRpcError = class extends Error {
 };
 var ERROR = Object.freeze({ failed: 1e3, notFound: 1001, forbidden: 1003, conflict: 1004, unavailable: 1005, protocol: 1006 });
 var RPC_ERROR = Object.freeze({ parseError: -32700, invalidRequest: -32600, methodNotFound: -32601, invalidParams: -32602 });
-var CAPABILITY = Object.freeze({ attachAfter: "attach.after", promptReceipts: "prompt.receipts", extensionMethods: "extension.methods", team: "team", task: "task", library: "library", settingsLanguage: "settings.language" });
-var RPC_METHODS = Object.freeze(["assignment.recall", "board.list", "catalog.get", "daemon.hello", "daemon.pause", "daemon.pauses", "daemon.resume", "daemon.shutdown", "daemon.status", "daemon.usage", "extension.register", "extension.unregister", "library.delete", "library.duplicate", "library.get", "library.list", "library.models", "library.rename", "library.save", "library.skills.set", "question.answer", "question.list", "session.archive", "session.attach", "session.close", "session.configure", "session.create", "session.get", "session.interrupt", "session.list", "session.log", "session.message", "session.preview", "session.prompt", "session.release", "session.rename", "session.status", "settings.language.get", "settings.language.set", "task.create", "task.gate.resolve", "task.list", "task.update", "team.list"]);
+var CAPABILITY = Object.freeze({ attachAfter: "attach.after", promptReceipts: "prompt.receipts", extensionMethods: "extension.methods", team: "team", task: "task", library: "library", settingsLanguage: "settings.language", sessionListPage: "session.list.page", questionWatch: "question.watch", questionWatchTurns: "question.watch.turns", workspaceFiles: "workspace.files", workspaceFilesRead: "workspace.files.read", promptImages: "prompt.images" });
+var PROMPT_IMAGES = Object.freeze({ mimeTypes: Object.freeze(["image/png", "image/jpeg", "image/gif", "image/webp"]), maxCount: 8, maxBytes: 5 * 1024 * 1024, maxTotalBytes: 11 * 1024 * 1024 });
+var RPC_METHODS = Object.freeze(["assignment.recall", "board.list", "catalog.get", "daemon.hello", "daemon.pause", "daemon.pauses", "daemon.resume", "daemon.shutdown", "daemon.status", "daemon.usage", "extension.register", "extension.unregister", "library.delete", "library.duplicate", "library.get", "library.list", "library.models", "library.rename", "library.save", "library.skills.set", "question.answer", "question.list", "question.watch", "session.archive", "session.attach", "session.close", "session.configure", "session.create", "session.get", "session.interrupt", "session.list", "session.log", "session.message", "session.preview", "session.prompt", "session.release", "session.rename", "session.status", "settings.language.get", "settings.language.set", "task.create", "task.gate.resolve", "task.list", "task.update", "team.list", "workspace.files.list", "workspace.files.read", "workspace.files.search"]);
+var WORKSPACE_FILES = Object.freeze({ maxReadBytes: 1024 * 1024, maxListEntries: 1e3, maxPathLength: 4096 });
 
 // packages/client/src/rpc/errors.js
 var BRAND = Symbol.for("@anhlp/alp-client/AlpClientError");
@@ -19323,6 +19325,7 @@ async function startDaemon({ home, entry, env = process.env, timeoutMs = 15e3 })
 // packages/cli/src/acp/agent.ts
 import { randomUUID } from "node:crypto";
 import path4 from "node:path";
+var unlistedOf = ({ teams, team, teamLabel }) => teams.some((entry) => entry.id === team) ? void 0 : { id: team, label: teamLabel ?? (team === "custom" ? "Custom" : team) };
 var MODES = [
   { id: "read-only", name: "Read only", description: "Agents read and search; nothing is changed" },
   { id: "workspace-write", name: "Workspace write", description: "Agents change files and run commands inside the project" },
@@ -19364,34 +19367,120 @@ ${resource.text}
   }
   return text.trim();
 }
+function shown(file2, cwd) {
+  if (!cwd || !path4.isAbsolute(file2)) return file2;
+  const relative = path4.relative(cwd, file2);
+  return relative && !relative.startsWith("..") && !path4.isAbsolute(relative) ? relative : file2;
+}
 function toolKind(item) {
-  const word = item.detail.type === "shell" ? String(item.detail.command ?? "").trim().split(/[\s{(]/)[0] : item.name;
+  const detail = item.detail;
+  switch (detail.type) {
+    case "read":
+      return "read";
+    case "edit":
+    case "write":
+      return "edit";
+    case "search":
+      return detail.toolName === "web_search" ? "fetch" : "search";
+    case "fetch":
+      return "fetch";
+    case "plan":
+      return "think";
+    case "sub_agent":
+    case "plain_text":
+      return "other";
+  }
+  const word = detail.type === "shell" ? String(detail.command ?? "").trim().split(/[\s{(]/)[0] : item.name;
   if (/^(Read|NotebookRead|LS)$/.test(word)) return "read";
   if (/^(Edit|MultiEdit|Write|NotebookEdit)$/.test(word)) return "edit";
   if (/^(Grep|Glob)$/.test(word)) return "search";
   if (/^(WebFetch|WebSearch)$/.test(word)) return "fetch";
   if (/^(Skill|Task|TodoWrite)$/.test(word) || item.name.startsWith("alp_")) return "other";
-  return item.detail.type === "shell" ? "execute" : "other";
-}
-function toolTitle(item) {
-  if (item.detail.type === "shell") return clip(String(item.detail.command ?? "").split("\n")[0], 160);
-  const input = item.detail.input ?? {};
+  return detail.type === "shell" ? "execute" : "other";
+}
+function toolTitle(item, cwd) {
+  const detail = item.detail;
+  switch (detail.type) {
+    case "shell":
+      return clip(String(detail.command ?? "").split("\n")[0], 160);
+    case "read":
+      return clip(`Read ${shown(detail.filePath, cwd)}`, 160);
+    case "edit":
+      return clip(`Edit ${shown(detail.filePath, cwd)}`, 160);
+    case "write":
+      return clip(`Write ${shown(detail.filePath, cwd)}`, 160);
+    case "search":
+      return clip(`${detail.toolName === "web_search" ? "Search the web" : "Search"} ${detail.query}`, 160);
+    case "fetch":
+      return clip(`Fetch ${detail.url}`, 160);
+    case "sub_agent":
+      return clip(`${detail.subAgentType ?? "Sub-agent"}${detail.description ? `: ${detail.description.split("\n")[0]}` : ""}`, 160);
+    case "plan":
+      return "Plan";
+    case "plain_text":
+      return clip(`${item.name}${detail.label ? `: ${detail.label}` : ""}`, 160);
+  }
+  const input = detail.input ?? {};
   if (item.name === "alp_delegate") return clip(`Delegate to ${input.agent ?? "an agent"}: ${String(input.task ?? "").split("\n")[0]}`, 160);
   return clip(`${item.name} ${JSON.stringify(input)}`, 160);
 }
+var bounded = (text) => text.length > OUTPUT_CHARS ? `${text.slice(0, OUTPUT_CHARS)}
+\u2026 (${text.length - OUTPUT_CHARS} more characters)` : text;
 function toolOutput(item) {
+  const detail = item.detail;
+  const parts = [];
   let text = "";
-  if (item.detail.type === "shell") text = item.detail.output ?? "";
-  else {
-    const output = item.detail.output;
-    text = Array.isArray(output) ? output.map((part) => typeof part?.text === "string" ? part.text : JSON.stringify(part)).join("\n") : output == null ? "" : typeof output === "string" ? output : JSON.stringify(output, null, 2);
+  switch (detail.type) {
+    case "shell":
+      text = detail.output ?? "";
+      break;
+    case "read":
+      text = detail.content ?? "";
+      break;
+    case "edit":
+      if (detail.newString !== void 0 || detail.oldString !== void 0) parts.push({ type: "diff", path: detail.filePath, oldText: detail.oldString ?? null, newText: detail.newString ?? "" });
+      else if (detail.unifiedDiff) text = "```diff\n" + detail.unifiedDiff + (detail.unifiedDiff.endsWith("\n") ? "" : "\n") + "```";
+      break;
+    case "write":
+      if (detail.content !== void 0) parts.push({ type: "diff", path: detail.filePath, oldText: null, newText: detail.content });
+      break;
+    case "search":
+      text = detail.content ?? [...detail.filePaths ?? [], ...(detail.webResults ?? []).map((hit) => `${hit.title} \u2014 ${hit.url}`)].join("\n");
+      break;
+    case "fetch":
+      text = detail.result ?? "";
+      break;
+    case "sub_agent":
+      text = detail.log || detail.description || "";
+      break;
+    case "plan":
+      text = detail.text;
+      break;
+    case "plain_text":
+      text = detail.text ?? "";
+      break;
+    default: {
+      const output = detail.output;
+      text = Array.isArray(output) ? output.map((part) => typeof part?.text === "string" ? part.text : JSON.stringify(part)).join("\n") : output == null ? "" : typeof output === "string" ? output : JSON.stringify(output, null, 2);
+    }
   }
   if (item.error) text = text ? `${text}
 ${item.error}` : item.error;
-  if (!text) return [];
-  if (text.length > OUTPUT_CHARS) text = `${text.slice(0, OUTPUT_CHARS)}
-\u2026 (${text.length - OUTPUT_CHARS} more characters)`;
-  return [{ type: "content", content: { type: "text", text } }];
+  if (text) parts.push({ type: "content", content: { type: "text", text: bounded(text) } });
+  return parts.map((part) => part.type === "diff" ? { ...part, newText: bounded(part.newText), ...part.oldText ? { oldText: bounded(part.oldText) } : {} } : part);
+}
+function toolInput(item) {
+  const detail = item.detail;
+  if (detail.type === "shell") return { command: detail.command, cwd: detail.cwd };
+  if (detail.type === "unknown" || !["read", "edit", "write", "search", "fetch", "sub_agent", "plan", "plain_text"].includes(detail.type)) return detail.input;
+  const { type: _type, content: _content, oldString: _old, newString: _new, unifiedDiff: _diff, result: _result, log: _log, text: _text, filePaths: _paths, webResults: _hits, ...rest } = detail;
+  return rest;
+}
+function toolLocations(item) {
+  const detail = item.detail;
+  if (detail.type !== "read" && detail.type !== "edit" && detail.type !== "write") return void 0;
+  const filePath = String(detail.filePath);
+  return [{ path: filePath, ...detail.type === "read" && typeof detail.offset === "number" ? { line: detail.offset } : {} }];
 }
 var clip = (text, chars) => text.length > chars ? `${text.slice(0, chars - 1)}\u2026` : text;
 var status = (state) => state === "running" ? "in_progress" : state;
@@ -19430,7 +19519,7 @@ function createAcpAgent(options) {
   }
   const say = (session, text) => send(session, { sessionUpdate: "agent_message_chunk", content: { type: "text", text } });
   function configOptions(session) {
-    const teams = session.opened ? session.preview.teams.filter((team) => team.id === session.preview.team) : session.preview.teams;
+    const teams = session.opened ? choices(session).filter((team) => team.id === session.preview.team) : choices(session);
     return [
       {
         id: "team",
@@ -19439,14 +19528,21 @@ function createAcpAgent(options) {
         type: "select",
         currentValue: session.preview.team,
         description: session.opened ? "A session keeps its team; start a new one for another team" : "The team that works on this session",
-        options: (teams.length ? teams : [{ id: session.preview.team, label: session.preview.teamLabel ?? session.preview.team }]).map((team) => ({ value: team.id, name: team.label, ...team.description ? { description: team.description } : {} }))
+        options: teams.map((team) => ({ value: team.id, name: team.label, ...team.description ? { description: team.description } : {} }))
       },
       { id: "mode", name: "Permissions", category: "mode", type: "select", currentValue: session.preview.mode, options: MODES.map((mode) => ({ value: mode.id, name: mode.name, description: mode.description })) }
     ];
   }
+  function choices(session) {
+    const { teams, team } = session.preview;
+    const own2 = unlistedOf(session.preview);
+    const first = session.unlisted && session.unlisted.id !== team && !teams.some((entry) => entry.id === session.unlisted.id) ? [session.unlisted] : [];
+    return [...first, ...own2 ? [own2] : [], ...teams];
+  }
   const modeState = (session) => ({ currentModeId: session.preview.mode, availableModes: MODES });
   function track(id, cwd, mcpServers, preview2, opened) {
-    const session = { id, cwd, mcpServers, preview: preview2, opened, ours: /* @__PURE__ */ new Set(), texts: /* @__PURE__ */ new Map(), tools: /* @__PURE__ */ new Set(), questions: /* @__PURE__ */ new Map(), queue: Promise.resolve() };
+    const unlisted = unlistedOf(preview2);
+    const session = { id, cwd, mcpServers, preview: preview2, opened, ...unlisted ? { unlisted } : {}, ours: /* @__PURE__ */ new Set(), texts: /* @__PURE__ */ new Map(), tools: /* @__PURE__ */ new Set(), questions: /* @__PURE__ */ new Map(), queue: Promise.resolve() };
     sessions.set(id, session);
     return session;
   }
@@ -19544,7 +19640,8 @@ ${item2.text}`;
         send(session, { sessionUpdate: "plan", entries: item2.items.map((entry) => ({ content: entry.text, priority: "medium", status: entry.status })) });
         return;
       case "tool_call": {
-        const fields = { title: toolTitle(item2), kind: toolKind(item2), status: status(item2.status), content: toolOutput(item2), rawInput: item2.detail.type === "shell" ? { command: item2.detail.command, cwd: item2.detail.cwd } : item2.detail.input };
+        const locations = toolLocations(item2);
+        const fields = { title: toolTitle(item2, session.cwd), kind: toolKind(item2), status: status(item2.status), content: toolOutput(item2), rawInput: toolInput(item2), ...locations ? { locations } : {} };
         if (session.tools.has(item2.id)) send(session, { sessionUpdate: "tool_call_update", toolCallId: item2.id, ...fields });
         else {
           session.tools.add(item2.id);
@@ -19677,7 +19774,7 @@ ${item2.text}`;
     if (params.configId === "mode") await setMode(session, value);
     else if (params.configId === "team") {
       if (session.opened && value !== session.preview.team) throw RequestError.invalidParams(void 0, "A session keeps its team; start a new one for another team");
-      if (!session.preview.teams.some((team) => team.id === value)) throw RequestError.invalidParams(void 0, `Unknown team ${value}`);
+      if (!choices(session).some((team) => team.id === value)) throw RequestError.invalidParams(void 0, `Unknown team ${value}`);
       session.preview = { ...await preview(session.cwd, session.mcpServers, value), mode: session.preview.mode };
     } else throw RequestError.invalidParams(void 0, `Unknown option ${params.configId}`);
     return { configOptions: configOptions(session) };
@@ -19706,7 +19803,7 @@ ${item2.text}`;
 
 // packages/cli/src/acp/main.ts
 async function runAcp({ daemonEntry }) {
-  const version2 = true ? "0.0.0-beta.1" : "0.0.0";
+  const version2 = true ? "0.0.0-beta.2" : "0.0.0";
   const logger = createLogger({ component: "acp" });
   const log = (message, fields) => logger.warn(message, fields);
   const app = createAcpAgent({