pi-acp 0.0.29 → 0.0.30

package/dist/index.js

@@ -529,16 +529,16 @@ function expandSlashCommand(text, fileCommands) {
 // src/acp/translate/pi-tools.ts
 function toolResultToText(result) {
   if (!result) return "";
-  const content = result.content;
-  if (Array.isArray(content)) {
-    const texts = content.map((c) => c?.type === "text" && typeof c.text === "string" ? c.text : "").filter(Boolean);
-    if (texts.length) return texts.join("");
-  }
   const details = result?.details;
   const diff = details?.diff;
   if (typeof diff === "string" && diff.trim()) {
     return diff;
   }
+  const content = result.content;
+  if (Array.isArray(content)) {
+    const texts = content.map((c) => c?.type === "text" && typeof c.text === "string" ? c.text : "").filter(Boolean);
+    if (texts.length) return texts.join("");
+  }
   const stdout = (typeof details?.stdout === "string" ? details.stdout : void 0) ?? (typeof result?.stdout === "string" ? result.stdout : void 0) ?? (typeof details?.output === "string" ? details.output : void 0) ?? (typeof result?.output === "string" ? result.output : void 0);
   const stderr = (typeof details?.stderr === "string" ? details.stderr : void 0) ?? (typeof result?.stderr === "string" ? result.stderr : void 0);
   const exitCode = (typeof details?.exitCode === "number" ? details.exitCode : void 0) ?? (typeof result?.exitCode === "number" ? result.exitCode : void 0) ?? (typeof details?.code === "number" ? details.code : void 0) ?? (typeof result?.code === "number" ? result.code : void 0);
@@ -576,8 +576,58 @@ function findUniqueLineNumber(text, needle) {
   }
   return line;
 }
+function getToolPath(args) {
+  const record = args;
+  if (typeof record?.path === "string") return record.path;
+  if (typeof record?.file_path === "string") return record.file_path;
+  return void 0;
+}
+function getParsedEdits(args) {
+  const record = args;
+  const parsed = [];
+  if (typeof record?.oldText === "string" && typeof record?.newText === "string") {
+    parsed.push({ oldText: record.oldText, newText: record.newText });
+  }
+  let edits = record?.edits;
+  if (typeof edits === "string") {
+    try {
+      edits = JSON.parse(edits);
+    } catch {
+      edits = void 0;
+    }
+  }
+  if (Array.isArray(edits)) {
+    for (const edit of edits) {
+      const item = edit;
+      if (typeof item?.oldText === "string" && typeof item?.newText === "string") {
+        parsed.push({ oldText: item.oldText, newText: item.newText });
+      }
+    }
+  }
+  return parsed;
+}
+function getEditOldTexts(args) {
+  const record = args;
+  const oldTexts = getParsedEdits(args).map((edit) => edit.oldText);
+  if (typeof record?.oldText === "string" && !oldTexts.includes(record.oldText)) oldTexts.push(record.oldText);
+  let edits = record?.edits;
+  if (typeof edits === "string") {
+    try {
+      edits = JSON.parse(edits);
+    } catch {
+      edits = void 0;
+    }
+  }
+  if (Array.isArray(edits)) {
+    for (const edit of edits) {
+      const oldText = edit?.oldText;
+      if (typeof oldText === "string" && !oldTexts.includes(oldText)) oldTexts.push(oldText);
+    }
+  }
+  return oldTexts;
+}
 function toToolCallLocations(args, cwd, line) {
-  const path = typeof args?.path === "string" ? args.path : void 0;
+  const path = getToolPath(args);
   if (!path) return void 0;
   const resolvedPath = isAbsolute(path) ? path : resolvePath(cwd, path);
   return [{ path: resolvedPath, ...typeof line === "number" ? { line } : {} }];
@@ -694,10 +744,11 @@ var PiAcpSession = class {
   // pi can emit multiple `turn_end` events for a single user prompt (e.g. after tool_use).
   // The overall agent loop completes when `agent_end` is emitted.
   inAgentLoop = false;
-  // For ACP diff support: capture file contents before edits, then emit ToolCallContent {type:"diff"}.
-  // This is due to pi sending diff as a string as opposed to ACP expected diff format.
-  // Compatible format may need to be implemented in pi in the future.
-  editSnapshots = /* @__PURE__ */ new Map();
+  // For ACP diff support: capture file contents before edit/write mutations,
+  // then emit ToolCallContent {type:"diff"}. Compatible structured edit/write
+  // events may need to be implemented in pi in the future.
+  fileSnapshots = /* @__PURE__ */ new Map();
+  fileMutationToolCallIds = /* @__PURE__ */ new Set();
   // Ensure `session/update` notifications are sent in order and can be awaited
   // before completing a `session/prompt` request.
   lastEmit = Promise.resolve();
@@ -878,16 +929,25 @@ var PiAcpSession = class {
         const toolName = String(ev.toolName ?? "tool");
         const args = ev.args;
         let line;
-        if (toolName === "edit") {
-          const p = typeof args?.path === "string" ? args.path : void 0;
+        const isFileMutation = toolName === "edit" || toolName === "write";
+        let snapshotOldText;
+        if (isFileMutation) {
+          this.fileMutationToolCallIds.add(toolCallId);
+          const p = getToolPath(args);
           if (p) {
             try {
               const abs = isAbsolute(p) ? p : resolvePath(this.cwd, p);
-              const oldText = readFileSync3(abs, "utf8");
-              this.editSnapshots.set(toolCallId, { path: p, oldText });
-              const needle = typeof args?.oldText === "string" ? args.oldText : "";
-              line = findUniqueLineNumber(oldText, needle);
+              snapshotOldText = readFileSync3(abs, "utf8");
+              this.fileSnapshots.set(toolCallId, { path: p, oldText: snapshotOldText });
+              if (toolName === "edit") {
+                for (const needle of getEditOldTexts(args)) {
+                  line = findUniqueLineNumber(snapshotOldText, needle);
+                  if (typeof line === "number") break;
+                }
+              }
             } catch {
+              snapshotOldText = null;
+              this.fileSnapshots.set(toolCallId, { path: p, oldText: null });
             }
           }
         }
@@ -919,13 +979,13 @@ var PiAcpSession = class {
         const toolCallId = String(ev.toolCallId ?? "");
         if (!toolCallId) break;
         const partial = ev.partialResult;
-        const text = toolResultToText(partial);
+        const text = this.fileMutationToolCallIds.has(toolCallId) ? "" : toolResultToText(partial);
         this.emit({
           sessionUpdate: "tool_call_update",
           toolCallId,
           status: "in_progress",
           content: text ? [{ type: "content", content: { type: "text", text } }] : void 0,
-          rawOutput: partial
+          ...this.fileMutationToolCallIds.has(toolCallId) ? {} : { rawOutput: partial }
         });
         break;
       }
@@ -935,27 +995,28 @@ var PiAcpSession = class {
         const result = ev.result;
         const isError = Boolean(ev.isError);
         const text = toolResultToText(result);
-        const snapshot = this.editSnapshots.get(toolCallId);
+        const snapshot = this.fileSnapshots.get(toolCallId);
         let content;
+        let hasStructuredDiff = false;
         if (!isError && snapshot) {
           try {
             const abs = isAbsolute(snapshot.path) ? snapshot.path : resolvePath(this.cwd, snapshot.path);
             const newText = readFileSync3(abs, "utf8");
-            if (newText !== snapshot.oldText) {
+            if (snapshot.oldText === null || newText !== snapshot.oldText) {
+              hasStructuredDiff = true;
               content = [
                 {
                   type: "diff",
                   path: snapshot.path,
                   oldText: snapshot.oldText,
                   newText
-                },
-                ...text ? [{ type: "content", content: { type: "text", text } }] : []
+                }
               ];
             }
           } catch {
           }
         }
-        if (!content && text) {
+        if (!content && !hasStructuredDiff && text) {
           content = [{ type: "content", content: { type: "text", text } }];
         }
         this.emit({
@@ -963,10 +1024,11 @@ var PiAcpSession = class {
           toolCallId,
           status: isError ? "failed" : "completed",
           content,
-          rawOutput: result
+          ...hasStructuredDiff ? {} : { rawOutput: result }
         });
         this.currentToolCalls.delete(toolCallId);
-        this.editSnapshots.delete(toolCallId);
+        this.fileSnapshots.delete(toolCallId);
+        this.fileMutationToolCallIds.delete(toolCallId);
         break;
       }
       case "extension_ui_request": {
@@ -1430,10 +1492,9 @@ function listPiSessions() {
   });
   return items;
 }
-function findPiSessionFile(sessionId) {
+function findPiSession(sessionId) {
   const all = listPiSessions();
-  const found = all.find((s) => s.sessionId === sessionId);
-  return found?.sessionFile ?? null;
+  return all.find((s) => s.sessionId === sessionId) ?? null;
 }
 
 // src/acp/translate/pi-messages.ts
@@ -1647,6 +1708,7 @@ var PiAcpAgent = class {
   conn;
   sessions = new SessionManager();
   store = new SessionStore();
+  restoringSessions = /* @__PURE__ */ new Map();
   dispose() {
     this.sessions.disposeAll();
   }
@@ -1667,6 +1729,66 @@ var PiAcpAgent = class {
     }
     this.store.delete(sessionId);
   }
+  findStoredSession(sessionId) {
+    const stored = this.store.get(sessionId);
+    if (stored?.cwd && stored?.sessionFile) {
+      return { cwd: stored.cwd, sessionFile: stored.sessionFile };
+    }
+    const piSession = findPiSession(sessionId);
+    if (!piSession) return null;
+    this.store.upsert({
+      sessionId,
+      cwd: piSession.cwd,
+      sessionFile: piSession.sessionFile
+    });
+    return {
+      cwd: piSession.cwd,
+      sessionFile: piSession.sessionFile
+    };
+  }
+  async restoreSession(sessionId, opts) {
+    const existing = this.sessions.maybeGet(sessionId);
+    if (existing) return existing;
+    const inFlight = this.restoringSessions.get(sessionId);
+    if (inFlight) return inFlight;
+    const restorePromise = (async () => {
+      const stored = this.findStoredSession(sessionId);
+      if (!stored) {
+        throw RequestError3.invalidParams(`Unknown sessionId: ${sessionId}`);
+      }
+      const cwd = opts?.cwd ?? stored.cwd;
+      let proc;
+      try {
+        proc = await PiRpcProcess.spawn({
+          cwd,
+          sessionPath: stored.sessionFile,
+          piCommand: process.env.PI_ACP_PI_COMMAND
+        });
+      } catch (e) {
+        if (e?.name === "PiRpcSpawnError") {
+          throw RequestError3.internalError({ code: e?.code }, String(e?.message ?? e));
+        }
+        throw e;
+      }
+      const fileCommands = loadSlashCommands(cwd);
+      const session = this.sessions.getOrCreate(sessionId, {
+        cwd,
+        mcpServers: opts?.mcpServers ?? [],
+        conn: this.conn,
+        proc,
+        fileCommands
+      });
+      this.lastSessionCwd = cwd;
+      this.store.upsert({ sessionId, cwd, sessionFile: stored.sessionFile });
+      return session;
+    })();
+    this.restoringSessions.set(sessionId, restorePromise);
+    try {
+      return await restorePromise;
+    } finally {
+      this.restoringSessions.delete(sessionId);
+    }
+  }
   async initialize(params) {
     const supportedVersion = 1;
     const requested = params.protocolVersion;
@@ -1813,7 +1935,7 @@ var PiAcpAgent = class {
     return;
   }
   async prompt(params) {
-    const session = this.sessions.get(params.sessionId);
+    const session = await this.restoreSession(params.sessionId);
     const { message, images } = promptToPiMessage(params.prompt);
     if (images.length === 0 && message.trimStart().startsWith("/")) {
       const trimmed = message.trim();
@@ -2186,7 +2308,8 @@ ${JSON.stringify(stats, null, 2)}`;
     return { stopReason };
   }
   async cancel(params) {
-    const session = this.sessions.get(params.sessionId);
+    const session = this.sessions.maybeGet(params.sessionId);
+    if (!session) return;
     await session.cancel();
   }
   async unstable_listSessions(params) {
@@ -2212,38 +2335,22 @@ ${JSON.stringify(stats, null, 2)}`;
     }
     this.sessions.close(params.sessionId);
     this.lastSessionCwd = params.cwd;
-    const stored = this.store.get(params.sessionId);
-    const sessionFile = stored?.sessionFile ?? findPiSessionFile(params.sessionId);
-    if (!sessionFile) {
+    const stored = this.findStoredSession(params.sessionId);
+    if (!stored) {
       throw RequestError3.invalidParams(`Unknown sessionId: ${params.sessionId}`);
     }
-    let proc;
-    try {
-      proc = await PiRpcProcess.spawn({
-        cwd: params.cwd,
-        sessionPath: sessionFile,
-        piCommand: process.env.PI_ACP_PI_COMMAND
-      });
-    } catch (e) {
-      if (e?.name === "PiRpcSpawnError") {
-        throw RequestError3.internalError({ code: e?.code }, String(e?.message ?? e));
-      }
-      throw e;
-    }
-    const fileCommands = loadSlashCommands(params.cwd);
     const enableSkillCommands = getEnableSkillCommands(params.cwd);
-    const session = this.sessions.getOrCreate(params.sessionId, {
+    const session = await this.restoreSession(params.sessionId, {
       cwd: params.cwd,
-      mcpServers: params.mcpServers,
-      conn: this.conn,
-      proc,
-      fileCommands
+      mcpServers: params.mcpServers
     });
+    const proc = session.proc;
+    const fileCommands = loadSlashCommands(params.cwd);
     this.sessions.closeAllExcept?.(session.sessionId);
     this.store.upsert({
       sessionId: params.sessionId,
       cwd: params.cwd,
-      sessionFile
+      sessionFile: stored.sessionFile
     });
     const data = await proc.getMessages();
     const messages = Array.isArray(data?.messages) ? data.messages : [];
@@ -2343,12 +2450,12 @@ ${JSON.stringify(stats, null, 2)}`;
     return response;
   }
   async unstable_setSessionModel(params) {
-    const session = this.sessions.get(params.sessionId);
+    const session = await this.restoreSession(params.sessionId);
     await setSessionModel(session.proc, params.modelId);
     await emitConfigOptionsUpdate(this.conn, session.sessionId, session.proc);
   }
   async setSessionMode(params) {
-    const session = this.sessions.get(params.sessionId);
+    const session = await this.restoreSession(params.sessionId);
     const mode = String(params.modeId);
     if (!isThinkingLevel(mode)) {
       throw RequestError3.invalidParams(`Unknown modeId: ${mode}`);
@@ -2365,7 +2472,7 @@ ${JSON.stringify(stats, null, 2)}`;
     return {};
   }
   async setSessionConfigOption(params) {
-    const session = this.sessions.get(params.sessionId);
+    const session = await this.restoreSession(params.sessionId);
     const configId = String(params.configId);
     if (typeof params.value !== "string") {
       throw RequestError3.invalidParams(`Expected string value for config option: ${configId}`);