@punkcode/cli 0.1.12 → 0.1.14

package/dist/cli.js

@@ -493,13 +493,11 @@ function getModel() {
 }
 
 // src/lib/session.ts
-import { readdir as readdir2, readFile as readFile2, stat, open } from "fs/promises";
+import { readdir as readdir2, readFile as readFile2 } from "fs/promises";
 import { join as join2 } from "path";
 import { homedir as homedir2 } from "os";
+import { listSessions as sdkListSessions } from "@anthropic-ai/claude-agent-sdk";
 var CLAUDE_DIR = join2(homedir2(), ".claude", "projects");
-function pathToProjectDir(dir) {
-  return dir.replace(/\//g, "-");
-}
 async function loadSession(sessionId) {
   const sessionFile = `${sessionId}.jsonl`;
   let projectDirs;
@@ -512,149 +510,61 @@ async function loadSession(sessionId) {
     const sessionPath = join2(CLAUDE_DIR, projectDir, sessionFile);
     try {
       const content = await readFile2(sessionPath, "utf-8");
-      return parseSessionFile(content);
+      const messages = parseSessionFile(content);
+      const subagentsDir = join2(CLAUDE_DIR, projectDir, sessionId, "subagents");
+      await attachSubagentData(messages, subagentsDir);
+      return messages;
     } catch {
     }
   }
   return null;
 }
-var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function isValidSessionUUID(name) {
-  return UUID_RE.test(name);
-}
-async function listSessions(workingDirectory) {
-  let projectDirs;
-  try {
-    if (workingDirectory) {
-      projectDirs = [pathToProjectDir(workingDirectory)];
-    } else {
-      projectDirs = await readdir2(CLAUDE_DIR);
+var AGENT_ID_RE = /agentId: (\w+)/;
+async function attachSubagentData(messages, subagentsDir) {
+  const taskBlocks = [];
+  for (const msg of messages) {
+    if (msg.role !== "assistant") continue;
+    const blocks = msg.content;
+    if (!Array.isArray(blocks)) continue;
+    for (const block of blocks) {
+      if (block.type !== "tool_use" || block.name !== "Task") continue;
+      const result = block.result;
+      if (typeof result !== "string") continue;
+      const match = result.match(AGENT_ID_RE);
+      if (match) {
+        taskBlocks.push({ block, agentId: match[1] });
+      }
     }
-  } catch {
-    return [];
   }
-  const candidates = [];
-  for (const projectDir of projectDirs) {
-    const projectPath = join2(CLAUDE_DIR, projectDir);
-    let files;
+  if (taskBlocks.length === 0) return;
+  await Promise.all(taskBlocks.map(async ({ block, agentId }) => {
     try {
-      files = await readdir2(projectPath);
+      const content = await readFile2(join2(subagentsDir, `agent-${agentId}.jsonl`), "utf-8");
+      block.subagentMessages = parseSessionFile(content);
     } catch {
-      continue;
     }
-    for (const file of files) {
-      if (!file.endsWith(".jsonl")) continue;
-      const sessionId = file.replace(".jsonl", "");
-      if (!isValidSessionUUID(sessionId)) continue;
-      candidates.push({
-        sessionId,
-        // When a workingDirectory is provided, return the original path so it
-        // matches the device's defaultWorkingDirectory on the mobile side.
-        project: workingDirectory ?? projectDir,
-        filePath: join2(projectPath, file)
-      });
-    }
-  }
-  const results = await Promise.all(
-    candidates.map(async (c) => {
-      try {
-        const fileStat = await stat(c.filePath);
-        const titleInfo = await extractTitle(c.filePath);
-        return {
-          sessionId: c.sessionId,
-          project: c.project,
-          title: titleInfo.title,
-          lastModified: fileStat.mtimeMs,
-          ...titleInfo.summary && { summary: titleInfo.summary }
-        };
-      } catch {
-        return null;
-      }
-    })
-  );
-  const sessions = results.filter((s) => s !== null);
-  sessions.sort((a, b) => b.lastModified - a.lastModified);
-  return sessions.slice(0, 50);
+  }));
 }
-var HEAD_READ_BYTES = 8192;
-var TAIL_READ_BYTES = 16384;
-async function extractTitle(filePath) {
-  const fh = await open(filePath, "r");
+async function listSessions(workingDirectory) {
   try {
-    const tailResult = await extractFromTail(fh, filePath);
-    if (tailResult) return tailResult;
-    const firstMsg = await extractFirstUserMessage(fh);
-    return { title: firstMsg };
-  } finally {
-    await fh.close();
-  }
-}
-async function extractFromTail(fh, filePath) {
-  const fileStat = await stat(filePath);
-  const fileSize = fileStat.size;
-  if (fileSize === 0) return null;
-  const readSize = Math.min(TAIL_READ_BYTES, fileSize);
-  const offset = fileSize - readSize;
-  const buf = Buffer.alloc(readSize);
-  const { bytesRead } = await fh.read(buf, 0, readSize, offset);
-  const chunk = buf.toString("utf-8", 0, bytesRead);
-  const lines = chunk.split("\n");
-  let customTitle = null;
-  let summary = null;
-  for (let i = lines.length - 1; i >= 0; i--) {
-    const line = lines[i].trim();
-    if (!line) continue;
-    try {
-      const entry = JSON.parse(line);
-      if (entry.type === "custom-title" && entry.title && !customTitle) {
-        customTitle = entry.title;
-      }
-      if (entry.type === "summary" && entry.summary && !summary) {
-        summary = typeof entry.summary === "string" ? entry.summary : null;
-      }
-      if (customTitle && summary) break;
-    } catch {
-    }
-  }
-  if (customTitle) return { title: customTitle, summary: summary ?? void 0 };
-  if (summary) return { title: summary, summary };
-  return null;
-}
-async function extractFirstUserMessage(fh) {
-  const buf = Buffer.alloc(HEAD_READ_BYTES);
-  const { bytesRead } = await fh.read(buf, 0, HEAD_READ_BYTES, 0);
-  const chunk = buf.toString("utf-8", 0, bytesRead);
-  const lines = chunk.split("\n");
-  const metaUuids = /* @__PURE__ */ new Set();
-  for (const line of lines.slice(0, 20)) {
-    if (!line.trim()) continue;
-    try {
-      const entry = JSON.parse(line);
-      if (entry.isMeta || entry.parentUuid && metaUuids.has(entry.parentUuid)) {
-        if (entry.uuid && entry.message?.role !== "assistant") {
-          metaUuids.add(entry.uuid);
-        }
-        continue;
-      }
-      if (entry.type === "user" && entry.message?.role === "user") {
-        const content = entry.message.content;
-        if (typeof content === "string" && content.trim()) {
-          return content.trim().slice(0, 100);
-        }
-        if (Array.isArray(content)) {
-          const textBlock = content.find(
-            (b) => b.type === "text" && "text" in b && b.text && !b.text.startsWith("[Request interrupted")
-          );
-          if (textBlock && "text" in textBlock && typeof textBlock.text === "string") {
-            return textBlock.text.slice(0, 100);
-          }
-        }
-      }
-    } catch {
-    }
+    const sdkSessions = await sdkListSessions({
+      ...workingDirectory && { dir: workingDirectory },
+      limit: 50
+    });
+    return sdkSessions.map((s) => ({
+      sessionId: s.sessionId,
+      project: workingDirectory ?? s.cwd ?? "",
+      title: s.summary,
+      lastModified: s.lastModified,
+      cwd: s.cwd,
+      gitBranch: s.gitBranch,
+      fileSize: s.fileSize
+    }));
+  } catch {
+    return [];
   }
-  return "Untitled session";
 }
+var TOOL_RESULT_PREVIEW_BYTES = 2048;
 var ANSI_RE = /\u001b\[\d*m/g;
 function stripAnsi(text) {
   return text.replace(ANSI_RE, "");
@@ -663,6 +573,7 @@ function parseSessionFile(content) {
   const messages = [];
   const lines = content.split("\n").filter((line) => line.trim());
   const metaUuids = /* @__PURE__ */ new Set();
+  const taskNotifications = /* @__PURE__ */ new Map();
   for (const line of lines) {
     try {
       const entry = JSON.parse(line);
@@ -732,6 +643,21 @@ function parseSessionFile(content) {
         }
         continue;
       }
+      if (entry.type === "user" && typeof entry.message?.content === "string") {
+        const raw = entry.message.content;
+        const notifMatch = raw.match(/<task-notification>([\s\S]*?)<\/task-notification>/);
+        if (notifMatch) {
+          const inner = notifMatch[1];
+          const toolUseId = inner.match(/<tool-use-id>(.*?)<\/tool-use-id>/)?.[1];
+          if (toolUseId) {
+            const taskId = inner.match(/<task-id>(.*?)<\/task-id>/)?.[1] ?? "";
+            const status = inner.match(/<status>(.*?)<\/status>/)?.[1] ?? "completed";
+            const summary = inner.match(/<summary>([\s\S]*?)<\/summary>/)?.[1]?.trim() ?? "";
+            taskNotifications.set(toolUseId, { taskId, status, summary });
+          }
+          continue;
+        }
+      }
       if ((entry.type === "user" || entry.type === "assistant") && entry.message) {
         const msgContent = entry.message.content;
         messages.push({
@@ -780,9 +706,24 @@ function parseSessionFile(content) {
         );
         if (toolUse) {
           if (dataUri) toolUse.imageUri = dataUri;
-          if (resultText) toolUse.result = resultText;
+          if (resultText) toolUse.result = resultText.length > TOOL_RESULT_PREVIEW_BYTES ? resultText.slice(0, TOOL_RESULT_PREVIEW_BYTES) + "\u2026" : resultText;
+          break;
+        }
+      }
+    }
+  }
+  if (taskNotifications.size > 0) {
+    for (const msg of messages) {
+      if (msg.role !== "assistant") continue;
+      const blocks = msg.content;
+      if (!Array.isArray(blocks)) continue;
+      for (const block of blocks) {
+        if (block.type !== "tool_use" || block.name !== "Task") continue;
+        const notif = taskNotifications.get(block.id);
+        if (notif) {
+          block.taskStatus = notif.status;
+          block.taskSummary = notif.summary;
         }
-        break;
       }
     }
   }
@@ -915,7 +856,7 @@ function escapeRegex(str) {
 
 // src/lib/directory-discovery.ts
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
-async function findProjectDirectory(description, searchRoot, rejections) {
+async function findProjectDirectory(description, searchRoot, rejections, signal) {
   let prompt2 = `Find up to 3 project directories on this machine that best match: "${description}"
 
 Search starting from ${searchRoot}. Rank by relevance. Include a brief reason for each match.`;
@@ -961,6 +902,8 @@ Search starting from ${searchRoot}. Rank by relevance. Include a brief reason fo
       }
     }
   });
+  const onAbort = () => q.close();
+  signal?.addEventListener("abort", onAbort, { once: true });
   try {
     for await (const msg of q) {
       if (msg.type === "result") {
@@ -973,10 +916,10 @@ Search starting from ${searchRoot}. Rank by relevance. Include a brief reason fo
           }
           const result = resultMsg.result?.trim();
           if (result && result !== "null" && result.startsWith("/")) {
-            const path3 = result.split("\n")[0].trim();
-            const name = path3.split("/").pop() ?? path3;
-            logger.info({ path: path3, name }, "Project directory found (text fallback)");
-            return [{ path: path3, name, reason: "Best match" }];
+            const path4 = result.split("\n")[0].trim();
+            const name = path4.split("/").pop() ?? path4;
+            logger.info({ path: path4, name }, "Project directory found (text fallback)");
+            return [{ path: path4, name, reason: "Best match" }];
           }
           logger.info("No matching directories found");
           return [];
@@ -986,10 +929,81 @@ Search starting from ${searchRoot}. Rank by relevance. Include a brief reason fo
       }
     }
   } finally {
+    signal?.removeEventListener("abort", onAbort);
     q.close();
   }
   return [];
 }
+async function suggestProjectLocation(description, searchRoot, name, signal) {
+  const prompt2 = `Suggest up to 3 suitable locations on this machine to create a new project.
+
+User's description: "${description}"
+${name ? `Desired project name: "${name}"` : ""}
+
+Search starting from ${searchRoot}. Look at common project directories (e.g. ~/github, ~/projects, ~/code, ~/Desktop).
+For each suggestion, provide the full path WHERE the project folder would be created (including the project name as the last segment), a human-readable name, and a brief reason.`;
+  const q = query2({
+    prompt: prompt2,
+    options: {
+      systemPrompt: {
+        type: "preset",
+        preset: "claude_code",
+        append: "IMPORTANT: When searching for directories, always try listing likely parent directories with ls FIRST (e.g. ls ~/github, ls ~/projects). Only use find as a last resort, and always with -maxdepth 3. Never scan the entire home directory. The path in each suggestion must be the FULL path including the new project folder name."
+      },
+      permissionMode: "bypassPermissions",
+      persistSession: false,
+      cwd: searchRoot,
+      outputFormat: {
+        type: "json_schema",
+        schema: {
+          type: "object",
+          properties: {
+            suggestions: {
+              type: "array",
+              items: {
+                type: "object",
+                properties: {
+                  path: { type: "string", description: "Absolute path for the new project directory (including project folder name)" },
+                  name: { type: "string", description: "Human-readable project name" },
+                  reason: { type: "string", description: "Brief reason why this location is suitable" }
+                },
+                required: ["path", "name", "reason"]
+              }
+            }
+          },
+          required: ["suggestions"]
+        }
+      }
+    }
+  });
+  const onAbort = () => q.close();
+  signal?.addEventListener("abort", onAbort, { once: true });
+  try {
+    for await (const msg of q) {
+      if (msg.type === "result") {
+        const resultMsg = msg;
+        if (resultMsg.subtype === "success") {
+          const structured = resultMsg.structured_output;
+          if (structured?.suggestions?.length) {
+            logger.info({ count: structured.suggestions.length }, "Location suggestions found (structured)");
+            return structured.suggestions;
+          }
+          logger.info("No location suggestions found");
+          return [];
+        }
+        logger.warn({ subtype: resultMsg.subtype }, "Location suggestion query failed");
+        return [];
+      }
+    }
+  } finally {
+    signal?.removeEventListener("abort", onAbort);
+    q.close();
+  }
+  return [];
+}
+
+// src/commands/connect.ts
+import path3 from "path";
 
 // src/lib/auth.ts
 import fs2 from "fs";
@@ -1215,7 +1229,22 @@ async function connect(server, options) {
   });
   socket.on("find-project", (msg) => {
     if (msg.type === "find-project") {
-      handleFindProject(socket, msg, defaultCwd);
+      handleFindProject(socket, msg, defaultCwd, activeSessions);
+    }
+  });
+  socket.on("suggest-project-location", (msg) => {
+    if (msg.type === "suggest-project-location") {
+      handleSuggestProjectLocation(socket, msg, activeSessions);
+    }
+  });
+  socket.on("create-project", (msg) => {
+    if (msg.type === "create-project") {
+      handleCreateProject(socket, msg);
+    }
+  });
+  socket.on("check-path", (msg) => {
+    if (msg.type === "check-path") {
+      handleCheckPath(socket, msg);
     }
   });
   socket.on("cancel", (msg) => {
@@ -1244,6 +1273,9 @@ async function connect(server, options) {
     logger.error(detail, `Connection error: ${reason}`);
     logger.debug({ err }, "Connection error (raw)");
   });
+  socket.on("error", (err) => {
+    logger.error({ err }, "Socket error");
+  });
   const refreshInterval = setInterval(async () => {
     try {
       const token = await refreshIdToken();
@@ -1322,6 +1354,7 @@ function formatConnectionError(err) {
   return { reason, ...result };
 }
 function send(socket, event, msg) {
+  if (!socket.connected) return;
   socket.emit(event, msg);
 }
 function handlePrompt(socket, msg, activeSessions) {
@@ -1389,6 +1422,8 @@ function handleCancel(id, activeSessions) {
     session.abort();
     activeSessions.delete(id);
     logger.info({ sessionId: id }, "Session cancelled");
+  } else {
+    logger.warn({ sessionId: id }, "Cancel: session not found in activeSessions");
   }
 }
 async function handleListSessions(socket, msg, defaultCwd) {
@@ -1399,14 +1434,16 @@ async function handleListSessions(socket, msg, defaultCwd) {
   send(socket, "response", { type: "sessions_list", sessions, requestId: id });
   logger.info({ count: sessions.length }, "Listed sessions");
 }
+var DEFAULT_HISTORY_LIMIT = 30;
 async function handleLoadSession(socket, msg) {
-  const { id, sessionId } = msg;
+  const { id, sessionId, limit = DEFAULT_HISTORY_LIMIT } = msg;
   const log2 = createChildLogger({ sessionId });
   log2.info("Loading session...");
-  const messages = await loadSession(sessionId);
-  if (messages) {
-    send(socket, "response", { type: "history", messages, requestId: id });
-    log2.info({ count: messages.length }, "Session loaded");
+  const all = await loadSession(sessionId);
+  if (all) {
+    const messages = limit > 0 && all.length > limit ? all.slice(-limit) : all;
+    send(socket, "response", { type: "history", messages, total: all.length, requestId: id });
+    log2.info({ count: messages.length, total: all.length }, "Session loaded");
   } else {
     send(socket, "response", { type: "session_not_found", session_id: sessionId, requestId: id });
     log2.warn("Session not found");
@@ -1426,20 +1463,100 @@ async function handleGetCommands(socket, msg) {
     log2.error({ err }, "Commands error");
   }
 }
-async function handleFindProject(socket, msg, _defaultCwd) {
+async function handleFindProject(socket, msg, _defaultCwd, activeSessions) {
   const { id, description, rootDirectory, rejections } = msg;
   const searchRoot = rootDirectory ?? os3.homedir();
   const log2 = createChildLogger({ requestId: id });
   log2.info({ description, searchRoot }, "Finding project directory...");
+  const ac = new AbortController();
+  const handle = {
+    abort: () => ac.abort(),
+    resolvePermission: () => {
+    },
+    setPermissionMode: async () => {
+    }
+  };
+  activeSessions.set(id, handle);
   try {
-    const suggestions = await findProjectDirectory(description, searchRoot, rejections);
+    const suggestions = await findProjectDirectory(description, searchRoot, rejections, ac.signal);
     send(socket, "response", { type: "project_suggestions", suggestions, requestId: id });
     log2.info({ count: suggestions.length }, "Project suggestions sent");
   } catch (err) {
+    if (ac.signal.aborted) {
+      log2.info("Find project cancelled");
+      return;
+    }
     const message = err instanceof Error ? err.message : String(err);
     send(socket, "response", { type: "error", message, requestId: id });
     log2.error({ err }, "Find project error");
+  } finally {
+    activeSessions.delete(id);
+  }
+}
+async function handleSuggestProjectLocation(socket, msg, activeSessions) {
+  const { id, description, name, rootDirectory } = msg;
+  const searchRoot = rootDirectory ?? os3.homedir();
+  const log2 = createChildLogger({ requestId: id });
+  log2.info({ description, name, searchRoot }, "Suggesting project location...");
+  const ac = new AbortController();
+  const handle = {
+    abort: () => ac.abort(),
+    resolvePermission: () => {
+    },
+    setPermissionMode: async () => {
+    }
+  };
+  activeSessions.set(id, handle);
+  try {
+    const suggestions = await suggestProjectLocation(description, searchRoot, name, ac.signal);
+    send(socket, "response", { type: "project_suggestions", suggestions, requestId: id });
+    log2.info({ count: suggestions.length }, "Location suggestions sent");
+  } catch (err) {
+    if (ac.signal.aborted) {
+      log2.info("Suggest project location cancelled");
+      return;
+    }
+    const message = err instanceof Error ? err.message : String(err);
+    send(socket, "response", { type: "error", message, requestId: id });
+    log2.error({ err }, "Suggest project location error");
+  } finally {
+    activeSessions.delete(id);
+  }
+}
+function handleCreateProject(socket, msg) {
+  const { id, path: projectPath } = msg;
+  const log2 = createChildLogger({ requestId: id });
+  log2.info({ path: projectPath }, "Creating project directory...");
+  try {
+    fs3.mkdirSync(projectPath, { recursive: true });
+    send(socket, "response", { type: "project_created", path: projectPath, requestId: id });
+    log2.info({ path: projectPath }, "Project directory created");
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    send(socket, "response", { type: "error", message, requestId: id });
+    log2.error({ err }, "Create project error");
+  }
+}
+function handleCheckPath(socket, msg) {
+  const { id, path: checkTarget } = msg;
+  const log2 = createChildLogger({ requestId: id });
+  log2.info({ path: checkTarget }, "Checking path...");
+  let exists = false;
+  let isDirectory = false;
+  let parentExists = false;
+  try {
+    const stat = fs3.statSync(checkTarget);
+    exists = true;
+    isDirectory = stat.isDirectory();
+  } catch {
+  }
+  try {
+    const parentStat = fs3.statSync(path3.dirname(checkTarget));
+    parentExists = parentStat.isDirectory();
+  } catch {
   }
+  send(socket, "response", { type: "path_check", exists, isDirectory, parentExists, requestId: id });
+  log2.info({ exists, isDirectory, parentExists }, "Path check complete");
 }
 async function handleGetContext(socket, msg, defaultCwd) {
   const { id, sessionId } = msg;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@punkcode/cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Control Claude Code from your phone",
   "type": "module",
   "bin": {
@@ -53,7 +53,7 @@
     "vitest": "^4.0.18"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.49",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.62",
     "@anthropic-ai/sdk": "^0.78.0",
     "commander": "^14.0.3",
     "execa": "^9.6.1",