@punkcode/cli 0.1.5 → 0.1.7

package/dist/cli.js

@@ -49,6 +49,7 @@ function runClaude(options, callbacks) {
         ...opts.allowedTools && { allowedTools: opts.allowedTools },
         ...opts.disallowedTools && { disallowedTools: opts.disallowedTools },
         ...opts.maxTurns && { maxTurns: opts.maxTurns },
+        systemPrompt: opts.systemPrompt ?? { type: "preset", preset: "claude_code" },
         ...options.cwd && { cwd: options.cwd },
         ...options.sessionId && { resume: options.sessionId },
         maxThinkingTokens: 1e4,
@@ -92,6 +93,7 @@ function runClaude(options, callbacks) {
     };
   }
   (async () => {
+    let sentCompactSummary = false;
     try {
       for await (const message of q) {
         switch (message.type) {
@@ -118,7 +120,19 @@ function runClaude(options, callbacks) {
           }
           case "user": {
             const userContent = message.message?.content;
-            if (Array.isArray(userContent)) {
+            if (typeof userContent === "string") {
+              const match = userContent.match(/<local-command-stdout>([\s\S]*?)<\/local-command-stdout>/);
+              if (match) {
+                if (sentCompactSummary && match[1].trim() === "Compacted") {
+                  sentCompactSummary = false;
+                } else {
+                  callbacks.onSlashCommandOutput?.(match[1]);
+                }
+              } else if (userContent.startsWith("This session is being continued")) {
+                sentCompactSummary = true;
+                callbacks.onSlashCommandOutput?.(userContent);
+              }
+            } else if (Array.isArray(userContent)) {
               for (const block of userContent) {
                 if (typeof block === "object" && block !== null && "type" in block && block.type === "tool_result") {
                   const tr = block;
@@ -132,10 +146,35 @@ function runClaude(options, callbacks) {
             }
             break;
           }
-          case "result": {
-            callbacks.onResult(message.session_id);
+          case "system": {
+            const sys = message;
+            if (sys.subtype === "init" && callbacks.onSessionCreated) {
+              callbacks.onSessionCreated({
+                sessionId: sys.session_id ?? "",
+                tools: sys.tools ?? [],
+                slashCommands: (sys.slash_commands ?? []).map((cmd) => ({ name: cmd, description: "" })),
+                skills: sys.skills ?? [],
+                mcpServers: sys.mcp_servers ?? [],
+                model: sys.model ?? "",
+                cwd: sys.cwd ?? "",
+                claudeCodeVersion: sys.claude_code_version ?? "",
+                permissionMode: sys.permissionMode ?? "default"
+              });
+            }
+            break;
+          }
+          case "tool_use_summary": {
+            const summary = message.summary;
+            if (summary) {
+              callbacks.onSlashCommandOutput?.(summary);
+            }
             break;
           }
+          case "result": {
+            const resultText = message.subtype === "success" ? message.result : void 0;
+            callbacks.onResult(message.session_id, resultText);
+            return;
+          }
         }
       }
     } catch (err) {
@@ -300,6 +339,9 @@ import { readdir, readFile, stat, open } from "fs/promises";
 import { join } from "path";
 import { homedir } from "os";
 var CLAUDE_DIR = join(homedir(), ".claude", "projects");
+function pathToProjectDir(dir) {
+  return dir.replace(/\//g, "-");
+}
 async function loadSession(sessionId) {
   const sessionFile = `${sessionId}.jsonl`;
   let projectDirs;
@@ -322,10 +364,14 @@ 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() {
+async function listSessions(workingDirectory) {
   let projectDirs;
   try {
-    projectDirs = await readdir(CLAUDE_DIR);
+    if (workingDirectory) {
+      projectDirs = [pathToProjectDir(workingDirectory)];
+    } else {
+      projectDirs = await readdir(CLAUDE_DIR);
+    }
   } catch {
     return [];
   }
@@ -353,16 +399,12 @@ async function listSessions() {
     candidates.map(async (c) => {
       try {
         const fileStat = await stat(c.filePath);
-        const [titleInfo, turnCount] = await Promise.all([
-          extractTitle(c.filePath),
-          countTurns(c.filePath)
-        ]);
+        const titleInfo = await extractTitle(c.filePath);
         return {
           sessionId: c.sessionId,
           project: c.project,
           title: titleInfo.title,
           lastModified: fileStat.mtimeMs,
-          turnCount,
           ...titleInfo.summary && { summary: titleInfo.summary }
         };
       } catch {
@@ -429,7 +471,9 @@ async function extractFirstUserMessage(fh) {
     try {
       const entry = JSON.parse(line);
       if (entry.isMeta || entry.parentUuid && metaUuids.has(entry.parentUuid)) {
-        if (entry.uuid) metaUuids.add(entry.uuid);
+        if (entry.uuid && entry.message?.role !== "assistant") {
+          metaUuids.add(entry.uuid);
+        }
         continue;
       }
       if (entry.type === "user" && entry.message?.role === "user") {
@@ -439,9 +483,9 @@ async function extractFirstUserMessage(fh) {
         }
         if (Array.isArray(content)) {
           const textBlock = content.find(
-            (b) => b.type === "text" && b.text && !b.text.startsWith("[Request interrupted")
+            (b) => b.type === "text" && "text" in b && b.text && !b.text.startsWith("[Request interrupted")
           );
-          if (textBlock?.text) {
+          if (textBlock && "text" in textBlock && typeof textBlock.text === "string") {
             return textBlock.text.slice(0, 100);
           }
         }
@@ -451,51 +495,81 @@ async function extractFirstUserMessage(fh) {
   }
   return "Untitled session";
 }
-async function countTurns(filePath) {
-  const content = await readFile(filePath, "utf-8");
-  const lines = content.split("\n");
-  let count = 0;
+var ANSI_RE = /\u001b\[\d*m/g;
+function stripAnsi(text) {
+  return text.replace(ANSI_RE, "");
+}
+function parseSessionFile(content) {
+  const messages = [];
+  const lines = content.split("\n").filter((line) => line.trim());
   const metaUuids = /* @__PURE__ */ new Set();
   for (const line of lines) {
-    if (!line.trim()) continue;
     try {
       const entry = JSON.parse(line);
       if (entry.isMeta || entry.parentUuid && metaUuids.has(entry.parentUuid)) {
-        if (entry.uuid) metaUuids.add(entry.uuid);
+        if (entry.uuid && entry.message?.role !== "assistant") {
+          metaUuids.add(entry.uuid);
+        }
+        if (entry.message?.role === "user" && typeof entry.message.content === "string") {
+          const content2 = entry.message.content;
+          const cmdMatch = content2.match(/<command-name>\/(.+?)<\/command-name>/);
+          if (cmdMatch) {
+            messages.push({
+              role: "user",
+              content: [{ type: "text", text: `/${cmdMatch[1]}` }],
+              timestamp: entry.timestamp,
+              isMeta: entry.isMeta,
+              uuid: entry.uuid,
+              parentUuid: entry.parentUuid,
+              type: entry.type
+            });
+          }
+          const outMatch = content2.match(/<local-command-stdout>([\s\S]*?)<\/local-command-stdout>/);
+          if (outMatch && outMatch[1].trim()) {
+            const text = stripAnsi(outMatch[1].trim());
+            if (text) {
+              messages.push({
+                role: "assistant",
+                content: [{ type: "text", text }],
+                timestamp: entry.timestamp,
+                isMeta: entry.isMeta,
+                uuid: entry.uuid,
+                parentUuid: entry.parentUuid,
+                type: entry.type
+              });
+            }
+          }
+        }
+        continue;
+      }
+      if (entry.type === "system" && entry.subtype === "compact_boundary") {
+        messages.push({
+          role: "system",
+          content: [],
+          timestamp: entry.timestamp,
+          type: "system",
+          subtype: entry.subtype,
+          uuid: entry.uuid,
+          parentUuid: entry.parentUuid
+        });
         continue;
       }
-      if (entry.type !== "user" || !entry.message || entry.message.role !== "user") continue;
-      const msgContent = entry.message.content;
-      if (typeof msgContent === "string") {
-        const trimmed = msgContent.trim();
-        if (trimmed && !trimmed.startsWith("<") && !trimmed.startsWith("[") && !trimmed.startsWith("/")) {
-          count++;
+      if (entry.isCompactSummary && entry.message) {
+        const summaryContent = entry.message.content;
+        let summaryText = "";
+        if (typeof summaryContent === "string") {
+          summaryText = summaryContent;
+        } else if (Array.isArray(summaryContent)) {
+          summaryText = summaryContent.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("\n");
         }
-      } else if (Array.isArray(msgContent)) {
-        const textBlock = msgContent.find(
-          (b) => b.type === "text" && b.text
-        );
-        if (textBlock?.text) {
-          const text = textBlock.text.trim();
-          if (text && !text.startsWith("<") && !text.startsWith("[") && !text.startsWith("/")) {
-            count++;
+        if (summaryText) {
+          for (let i = messages.length - 1; i >= 0; i--) {
+            if (messages[i].subtype === "compact_boundary") {
+              messages[i].content = [{ type: "text", text: summaryText }];
+              break;
+            }
           }
         }
-      }
-    } catch {
-    }
-  }
-  return count;
-}
-function parseSessionFile(content) {
-  const messages = [];
-  const lines = content.split("\n").filter((line) => line.trim());
-  const metaUuids = /* @__PURE__ */ new Set();
-  for (const line of lines) {
-    try {
-      const entry = JSON.parse(line);
-      if (entry.isMeta || entry.parentUuid && metaUuids.has(entry.parentUuid)) {
-        if (entry.uuid) metaUuids.add(entry.uuid);
         continue;
       }
       if ((entry.type === "user" || entry.type === "assistant") && entry.message) {
@@ -503,7 +577,10 @@ function parseSessionFile(content) {
         messages.push({
           role: entry.message.role,
           content: typeof msgContent === "string" ? [{ type: "text", text: msgContent }] : msgContent,
-          timestamp: entry.timestamp
+          timestamp: entry.timestamp,
+          uuid: entry.uuid,
+          parentUuid: entry.parentUuid,
+          type: entry.type
         });
       }
     } catch {
@@ -515,12 +592,25 @@ function parseSessionFile(content) {
     const blocks = msg.content;
     if (!Array.isArray(blocks)) continue;
     for (const block of blocks) {
-      if (block.type !== "tool_result" || !Array.isArray(block.content)) continue;
-      const imgBlock = block.content.find(
-        (b) => b?.type === "image" && b?.source?.type === "base64" && b?.source?.data
-      );
-      if (!imgBlock) continue;
-      const dataUri = `data:${imgBlock.source.media_type};base64,${imgBlock.source.data}`;
+      if (block.type !== "tool_result") continue;
+      const content2 = block.content;
+      let dataUri;
+      if (Array.isArray(content2)) {
+        const imgBlock = content2.find(
+          (b) => b?.type === "image" && b?.source?.type === "base64" && b?.source?.data
+        );
+        if (imgBlock) {
+          dataUri = `data:${imgBlock.source.media_type};base64,${imgBlock.source.data}`;
+        }
+      }
+      let resultText;
+      if (typeof content2 === "string") {
+        resultText = content2 || void 0;
+      } else if (Array.isArray(content2)) {
+        const texts = content2.filter((b) => b?.type === "text" && typeof b?.text === "string").map((b) => b.text);
+        resultText = texts.join("\n") || void 0;
+      }
+      if (!dataUri && !resultText) continue;
       for (let j = i - 1; j >= 0; j--) {
         if (messages[j].role !== "assistant") continue;
         const aBlocks = messages[j].content;
@@ -528,7 +618,10 @@ function parseSessionFile(content) {
         const toolUse = aBlocks.find(
           (b) => b.type === "tool_use" && b.id === block.tool_use_id
         );
-        if (toolUse) toolUse.imageUri = dataUri;
+        if (toolUse) {
+          if (dataUri) toolUse.imageUri = dataUri;
+          if (resultText) toolUse.result = resultText;
+        }
         break;
       }
     }
@@ -888,9 +981,16 @@ function handlePrompt(socket, msg, activeSessions) {
   const handle = runClaude(
     { prompt: prompt2, sessionId, cwd, images, options },
     {
+      onSessionCreated: (info) => {
+        send(socket, "response", { type: "session_created", data: info, requestId: id });
+        log2.info({ sessionId: info.sessionId }, "New session created");
+      },
       onText: (text) => {
         send(socket, "response", { type: "text", text, requestId: id });
       },
+      onSlashCommandOutput: (output) => {
+        send(socket, "response", { type: "command_output", output, requestId: id });
+      },
       onThinking: (thinking) => {
         send(socket, "response", { type: "thinking", thinking, requestId: id });
       },
@@ -900,8 +1000,8 @@ function handlePrompt(socket, msg, activeSessions) {
       onToolResult: (toolUseId, content, isError) => {
         send(socket, "response", { type: "tool_result", tool_use_id: toolUseId, content, is_error: isError, requestId: id });
       },
-      onResult: (sid) => {
-        send(socket, "response", { type: "result", session_id: sid, requestId: id });
+      onResult: (sid, result) => {
+        send(socket, "response", { type: "result", session_id: sid, ...result && { result }, requestId: id });
         activeSessions.delete(id);
         log2.info("Session done");
       },
@@ -935,8 +1035,9 @@ function handleCancel(id, activeSessions) {
 }
 async function handleListSessions(socket, msg) {
   const { id } = msg;
+  const workingDirectory = msg.workingDirectory ?? process.cwd();
   logger.info("Listing sessions...");
-  const sessions = await listSessions();
+  const sessions = await listSessions(workingDirectory);
   send(socket, "response", { type: "sessions_list", sessions, requestId: id });
   logger.info({ count: sessions.length }, "Listed sessions");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@punkcode/cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Control Claude Code from your phone",
   "type": "module",
   "bin": {