@hienlh/ppm 0.12.11 → 0.13.0

package/src/index.ts

@@ -3,156 +3,170 @@
 import { Command } from "commander";
 import { VERSION } from "./version.ts";
 
-const program = new Command();
-
-program
-  .name("ppm")
-  .description("Personal Project Manager — mobile-first web IDE")
-  .version(VERSION)
-  .hook("preAction", () => {
-    console.log(`  PPM v${VERSION}\n`);
-  });
-
-program
-  .command("start")
-  .description("Start the PPM server (background by default)")
-  .option("-p, --port <port>", "Port to listen on")
-  .option("-s, --share", "(deprecated) Tunnel is now always enabled")
-  .option("--profile <name>", "DB profile name (e.g. 'dev' → ppm.dev.db)")
-  .action(async (options) => {
-    // Set DB profile before any DB access
-    const { setDbProfile } = await import("./services/db.service.ts");
-    if (options.profile) {
-      setDbProfile(options.profile);
-    }
-    // Auto-init on first run
-    const { hasConfig, initProject } = await import("./cli/commands/init.ts");
-    if (!hasConfig()) {
-      await initProject();
-    }
-    const { startServer } = await import("./server/index.ts");
-    await startServer(options);
-  });
-
-program
-  .command("stop")
-  .description("Stop the PPM server (supervisor stays alive)")
-  .option("-a, --all", "Kill all PPM and cloudflared processes (including untracked)")
-  .option("--kill", "Full shutdown (kills supervisor too)")
-  .action(async (options) => {
-    const { stopServer } = await import("./cli/commands/stop.ts");
-    await stopServer(options);
-  });
-
-program
-  .command("down")
-  .description("Fully shut down PPM (supervisor + server + tunnel)")
-  .action(async () => {
-    const { stopServer } = await import("./cli/commands/stop.ts");
-    await stopServer({ kill: true });
-  });
-
-program
-  .command("restart")
-  .description("Restart the server (keeps tunnel alive)")
-  .option("--force", "Force resume from paused state")
-  .action(async (options) => {
-    const { restartServer } = await import("./cli/commands/restart.ts");
-    await restartServer(options);
-  });
-
-program
-  .command("status")
-  .description("Show PPM daemon status")
-  .option("-a, --all", "Show all PPM and cloudflared processes (including untracked)")
-  .option("--json", "Output as JSON")
-  .action(async (options) => {
-    const { showStatus } = await import("./cli/commands/status.ts");
-    await showStatus(options);
-  });
-
-program
-  .command("open")
-  .description("Open PPM in browser")
-  .action(async () => {
-    const { openBrowser } = await import("./cli/commands/open.ts");
-    await openBrowser();
-  });
-
-program
-  .command("logs")
-  .description("View PPM daemon logs")
-  .option("-n, --tail <lines>", "Number of lines to show", "50")
-  .option("-f, --follow", "Follow log output")
-  .option("--clear", "Clear log file")
-  .action(async (options) => {
-    const { showLogs } = await import("./cli/commands/logs.ts");
-    await showLogs(options);
-  });
-
-program
-  .command("report")
-  .description("Report a bug on GitHub (pre-fills env info + logs)")
-  .action(async () => {
-    const { reportBug } = await import("./cli/commands/report.ts");
-    await reportBug();
-  });
-
-program
-  .command("init")
-  .description("Initialize PPM configuration (interactive or via flags)")
-  .option("-p, --port <port>", "Port to listen on")
-  .option("--scan <path>", "Directory to scan for git repos")
-  .option("--auth", "Enable authentication")
-  .option("--no-auth", "Disable authentication")
-  .option("--password <pw>", "Set access password")
-  .option("--share", "Pre-install cloudflared for sharing")
-  .option("-y, --yes", "Non-interactive mode (use defaults + flags)")
-  .action(async (options) => {
-    const { initProject } = await import("./cli/commands/init.ts");
-    await initProject(options);
-  });
-
-const { registerProjectsCommands } = await import("./cli/commands/projects.ts");
-registerProjectsCommands(program);
-
-const { registerConfigCommands } = await import("./cli/commands/config-cmd.ts");
-registerConfigCommands(program);
-
-const { registerGitCommands } = await import("./cli/commands/git-cmd.ts");
-registerGitCommands(program);
-
-const { registerChatCommands } = await import("./cli/commands/chat-cmd.ts");
-registerChatCommands(program);
-
-program
-  .command("upgrade")
-  .description("Check for and install PPM updates")
-  .option("--check", "Only check for updates, don't install")
-  .action(async (options) => {
-    const { upgradeCmd } = await import("./cli/commands/upgrade.ts");
-    await upgradeCmd(options);
-  });
-
-const { registerAutoStartCommands } = await import("./cli/commands/autostart.ts");
-registerAutoStartCommands(program);
-
-const { registerCloudCommands } = await import("./cli/commands/cloud.ts");
-registerCloudCommands(program);
-
-const { registerSkillsCommands } = await import("./cli/commands/skills-cmd.ts");
-registerSkillsCommands(program);
-
-const { registerExtCommands } = await import("./cli/commands/ext-cmd.ts");
-registerExtCommands(program);
-
-const { registerDbCommands } = await import("./cli/commands/db-cmd.ts");
-registerDbCommands(program);
-
-const { registerBotCommands } = await import("./cli/commands/bot-cmd.ts");
-registerBotCommands(program);
-
-const { registerJiraCommands } = await import("./cli/commands/jira-cmd.ts");
-await registerJiraCommands(program);
-
-program.parse();
+/**
+ * Assemble the CLI program without parsing argv. Exported so build-time tools
+ * (e.g. scripts/generate-ppm-skill.ts) can introspect the Commander tree for
+ * auto-generated documentation. `preAction` hooks and action callbacks are
+ * registered but not invoked until `.parseAsync()` runs.
+ */
+export async function buildProgram(): Promise<Command> {
+  const program = new Command();
+
+  program
+    .name("ppm")
+    .description("Personal Project Manager — mobile-first web IDE")
+    .version(VERSION)
+    .hook("preAction", () => {
+      console.log(`  PPM v${VERSION}\n`);
+    });
+
+  program
+    .command("start")
+    .description("Start the PPM server (background by default)")
+    .option("-p, --port <port>", "Port to listen on")
+    .option("-s, --share", "(deprecated) Tunnel is now always enabled")
+    .option("--profile <name>", "DB profile name (e.g. 'dev' → ppm.dev.db)")
+    .action(async (options) => {
+      const { setDbProfile } = await import("./services/db.service.ts");
+      if (options.profile) {
+        setDbProfile(options.profile);
+      }
+      const { hasConfig, initProject } = await import("./cli/commands/init.ts");
+      if (!hasConfig()) {
+        await initProject();
+      }
+      const { startServer } = await import("./server/index.ts");
+      await startServer(options);
+    });
+
+  program
+    .command("stop")
+    .description("Stop the PPM server (supervisor stays alive)")
+    .option("-a, --all", "Kill all PPM and cloudflared processes (including untracked)")
+    .option("--kill", "Full shutdown (kills supervisor too)")
+    .action(async (options) => {
+      const { stopServer } = await import("./cli/commands/stop.ts");
+      await stopServer(options);
+    });
+
+  program
+    .command("down")
+    .description("Fully shut down PPM (supervisor + server + tunnel)")
+    .action(async () => {
+      const { stopServer } = await import("./cli/commands/stop.ts");
+      await stopServer({ kill: true });
+    });
+
+  program
+    .command("restart")
+    .description("Restart the server (keeps tunnel alive)")
+    .option("--force", "Force resume from paused state")
+    .action(async (options) => {
+      const { restartServer } = await import("./cli/commands/restart.ts");
+      await restartServer(options);
+    });
+
+  program
+    .command("status")
+    .description("Show PPM daemon status")
+    .option("-a, --all", "Show all PPM and cloudflared processes (including untracked)")
+    .option("--json", "Output as JSON")
+    .action(async (options) => {
+      const { showStatus } = await import("./cli/commands/status.ts");
+      await showStatus(options);
+    });
+
+  program
+    .command("open")
+    .description("Open PPM in browser")
+    .action(async () => {
+      const { openBrowser } = await import("./cli/commands/open.ts");
+      await openBrowser();
+    });
+
+  program
+    .command("logs")
+    .description("View PPM daemon logs")
+    .option("-n, --tail <lines>", "Number of lines to show", "50")
+    .option("-f, --follow", "Follow log output")
+    .option("--clear", "Clear log file")
+    .action(async (options) => {
+      const { showLogs } = await import("./cli/commands/logs.ts");
+      await showLogs(options);
+    });
+
+  program
+    .command("report")
+    .description("Report a bug on GitHub (pre-fills env info + logs)")
+    .action(async () => {
+      const { reportBug } = await import("./cli/commands/report.ts");
+      await reportBug();
+    });
+
+  program
+    .command("init")
+    .description("Initialize PPM configuration (interactive or via flags)")
+    .option("-p, --port <port>", "Port to listen on")
+    .option("--scan <path>", "Directory to scan for git repos")
+    .option("--auth", "Enable authentication")
+    .option("--no-auth", "Disable authentication")
+    .option("--password <pw>", "Set access password")
+    .option("--share", "Pre-install cloudflared for sharing")
+    .option("-y, --yes", "Non-interactive mode (use defaults + flags)")
+    .action(async (options) => {
+      const { initProject } = await import("./cli/commands/init.ts");
+      await initProject(options);
+    });
+
+  const { registerProjectsCommands } = await import("./cli/commands/projects.ts");
+  registerProjectsCommands(program);
+
+  const { registerConfigCommands } = await import("./cli/commands/config-cmd.ts");
+  registerConfigCommands(program);
+
+  const { registerGitCommands } = await import("./cli/commands/git-cmd.ts");
+  registerGitCommands(program);
+
+  const { registerChatCommands } = await import("./cli/commands/chat-cmd.ts");
+  registerChatCommands(program);
+
+  program
+    .command("upgrade")
+    .description("Check for and install PPM updates")
+    .option("--check", "Only check for updates, don't install")
+    .action(async (options) => {
+      const { upgradeCmd } = await import("./cli/commands/upgrade.ts");
+      await upgradeCmd(options);
+    });
+
+  const { registerAutoStartCommands } = await import("./cli/commands/autostart.ts");
+  registerAutoStartCommands(program);
+
+  const { registerCloudCommands } = await import("./cli/commands/cloud.ts");
+  registerCloudCommands(program);
+
+  const { registerSkillsCommands } = await import("./cli/commands/skills-cmd.ts");
+  registerSkillsCommands(program);
+
+  const { registerExtCommands } = await import("./cli/commands/ext-cmd.ts");
+  registerExtCommands(program);
+
+  const { registerDbCommands } = await import("./cli/commands/db-cmd.ts");
+  registerDbCommands(program);
+
+  const { registerBotCommands } = await import("./cli/commands/bot-cmd.ts");
+  registerBotCommands(program);
+
+  const { registerJiraCommands } = await import("./cli/commands/jira-cmd.ts");
+  await registerJiraCommands(program);
+
+  const { registerExportCommands } = await import("./cli/commands/export-cmd.ts");
+  registerExportCommands(program);
+
+  return program;
+}
+
+if (import.meta.main) {
+  const program = await buildProgram();
+  program.parse();
+}

package/src/providers/claude-agent-sdk.ts

@@ -19,6 +19,7 @@ import { updateFromSdkEvent } from "../services/claude-usage.service.ts";
 import { getSessionProjectPath, setSessionMetadata, getSessionTitles } from "../services/db.service.ts";
 import { accountSelector } from "../services/account-selector.service.ts";
 import { accountService, type AccountWithTokens } from "../services/account.service.ts";
+import { parseSessionMessage, nestChildEvents } from "../services/jsonl-transcript-parser.ts";
 import { resolve } from "node:path";
 import { existsSync, readdirSync, unlinkSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
@@ -1587,135 +1588,6 @@ export class ClaudeAgentSdkProvider implements AIProvider {
   }
 }
 
-/** Parse SDK SessionMessage into ChatMessage with events for tool_use blocks */
-function parseSessionMessage(msg: { uuid: string; type: string; message: unknown; parent_tool_use_id?: string | null }): ChatMessage {
-  const message = msg.message as Record<string, unknown> | undefined;
-  const role = msg.type as "user" | "assistant";
-  const parentId = (msg as any).parent_tool_use_id as string | undefined;
-
-  // Filter synthetic SDK-generated error messages (auth failures, rate limits, etc.).
-  // Structure: { isApiErrorMessage: true, error: "authentication_failed"|"rate_limit"|...,
-  //   message: { model: "<synthetic>", content: [{text: "Failed to authenticate..."}] } }
-  // Our retry loop handles these; the raw text must not render in chat history.
-  const isSdkErrorMessage =
-    (msg as any).isApiErrorMessage === true ||
-    typeof (msg as any).error === "string" ||
-    (message && (message as any).model === "<synthetic>" &&
-      Array.isArray(message.content) &&
-      (message.content as Array<Record<string, unknown>>).some(
-        (b) => b.type === "text" && typeof b.text === "string" &&
-          /Failed to authenticate|API Error: 40[13]|hit your limit|rate.?limit/i.test(b.text as string),
-      ));
-  if (isSdkErrorMessage) {
-    return {
-      id: msg.uuid,
-      role,
-      content: "",
-      timestamp: new Date().toISOString(),
-      sdkUuid: msg.uuid,
-    };
-  }
-
-  // Parse content blocks for both user and assistant messages
-  const events: ChatEvent[] = [];
-  let textContent = "";
-
-  if (message && Array.isArray(message.content)) {
-    for (const block of message.content as Array<Record<string, unknown>>) {
-      if (block.type === "text" && typeof block.text === "string") {
-        const cleaned = role === "assistant" ? stripTeammateXml(block.text) : block.text;
-        textContent += cleaned;
-        if (role === "assistant" && cleaned) {
-          events.push({ type: "text", content: cleaned, ...(parentId && { parentToolUseId: parentId }) });
-        }
-      } else if (block.type === "tool_use") {
-        events.push({
-          type: "tool_use",
-          tool: (block.name as string) ?? "unknown",
-          input: block.input ?? {},
-          toolUseId: block.id as string | undefined,
-          ...(parentId && { parentToolUseId: parentId }),
-        });
-      } else if (block.type === "tool_result") {
-        const output = block.content ?? block.output ?? "";
-        events.push({
-          type: "tool_result",
-          output: typeof output === "string" ? output : JSON.stringify(output),
-          isError: !!(block as Record<string, unknown>).is_error,
-          toolUseId: block.tool_use_id as string | undefined,
-          ...(parentId && { parentToolUseId: parentId }),
-        });
-      }
-    }
-  } else {
-    textContent = extractText(message);
-  }
-
-  // SDK-generated user messages carry system text (tool_result blocks,
-  // <teammate-message> XML, <task-notification> XML) — not actual user input.
-  // Clear so they don't render as user bubbles.
-  if (role === "user" && (events.some((e) => e.type === "tool_result") || textContent.includes("<teammate-message"))) {
-    textContent = "";
-  }
-
-  return {
-    id: msg.uuid,
-    role,
-    content: textContent,
-    events: events.length > 0 ? events : undefined,
-    timestamp: new Date().toISOString(),
-    sdkUuid: msg.uuid,
-  };
-}
-
-/**
- * Move events with parentToolUseId into their parent Agent/Task tool_use's children array.
- * Mutates the array in-place: child events are removed from the top level and pushed into parent.children.
- */
-function nestChildEvents(events: ChatEvent[]): void {
-  // Build map of Agent/Task tool_use events by toolUseId
-  const parentMap = new Map<string, ChatEvent & { type: "tool_use" }>();
-  for (const ev of events) {
-    if (ev.type === "tool_use" && (ev.tool === "Agent" || ev.tool === "Task") && ev.toolUseId) {
-      parentMap.set(ev.toolUseId, ev);
-    }
-  }
-  if (parentMap.size === 0) return;
-
-  // Collect indices of child events to remove
-  const childIndices: number[] = [];
-  for (let i = 0; i < events.length; i++) {
-    const ev = events[i]!;
-    const pid = (ev as any).parentToolUseId as string | undefined;
-    if (!pid) continue;
-    const parent = parentMap.get(pid);
-    if (parent) {
-      if (!parent.children) parent.children = [];
-      parent.children.push(ev);
-      childIndices.push(i);
-    }
-  }
-
-  // Remove children from flat array (reverse order to keep indices valid)
-  for (let i = childIndices.length - 1; i >= 0; i--) {
-    events.splice(childIndices[i]!, 1);
-  }
-}
-
-/** Extract plain text from message payload */
-function extractText(message: unknown): string {
-  if (!message || typeof message !== "object") return "";
-  const msg = message as Record<string, unknown>;
-  if (typeof msg.content === "string") return msg.content;
-  if (Array.isArray(msg.content)) {
-    return (msg.content as Array<Record<string, unknown>>)
-      .filter((b) => b.type === "text" && typeof b.text === "string")
-      .map((b) => b.text as string)
-      .join("");
-  }
-  return "";
-}
-
 /**
  * Scan a JSONL project directory for sessions that the SDK's listSessions missed.
  * The SDK uses a 64KB head buffer; sessions with very large first messages
@@ -1791,9 +1663,3 @@ function findMissingSessions(
   return results;
 }
 
-/** Strip SDK teammate-message XML tags from assistant text */
-const TEAMMATE_MSG_RE = /<teammate-message[^>]*>[\s\S]*?<\/teammate-message>/g;
-function stripTeammateXml(text: string): string {
-  if (!text.includes("<teammate-message")) return text;
-  return text.replace(TEAMMATE_MSG_RE, "").replace(/\n{3,}/g, "\n\n").trim();
-}

package/src/server/index.ts

@@ -530,7 +530,8 @@ if (process.argv.includes("__serve__")) {
   const idx = process.argv.indexOf("__serve__");
   const port = parseInt(process.argv[idx + 1] ?? "8080", 10);
   const host = process.argv[idx + 2] ?? "0.0.0.0";
-  const profileArg = process.argv[idx + 3] && process.argv[idx + 3] !== "_" ? process.argv[idx + 3] : undefined;
+  const profileRaw = process.argv[idx + 3];
+  const profileArg = profileRaw && profileRaw !== "_" && !profileRaw.startsWith("--") ? profileRaw : undefined;
 
   // Set DB profile for daemon child
   const { setDbProfile } = await import("../services/db.service.ts");

package/src/server/routes/chat.ts

@@ -9,6 +9,7 @@ import { listSlashItems, searchSlashItems, invalidateCache } from "../../service
 import { upsertSlashRecent, getSlashRecents } from "../../services/db.service.ts";
 import { getCachedUsage, refreshUsageNow } from "../../services/claude-usage.service.ts";
 import { getSessionLog } from "../../services/session-log.service.ts";
+import { parseJsonlTranscript, validateJsonlPath } from "../../services/jsonl-transcript-parser.ts";
 import { getSessionProjectPath, setSessionMetadata, setSessionTitle, getPinnedSessionIds, pinSession, unpinSession, deleteSessionMapping, deleteSessionMetadata, deleteSessionTitle } from "../../services/db.service.ts";
 import { setSessionTag, bulkSetSessionTag, getTagById, getSessionTags, getProjectDefaultTagId } from "../../services/tag.service.ts";
 import { ok, err } from "../../types/api.ts";
@@ -363,6 +364,23 @@ chatRoutes.get("/sessions/:id/debug", (c) => {
   return c.json(ok({ sessionId, jsonlPath: jsonlExists ? jsonlPath : null, jsonlDir, projectPath }));
 });
 
+/** GET /chat/pre-compact-messages — read and parse a JSONL transcript file (for expand-compact feature) */
+chatRoutes.get("/pre-compact-messages", async (c) => {
+  try {
+    const jsonlPath = c.req.query("jsonlPath");
+    if (!jsonlPath) return c.json(err("jsonlPath query param required"), 400);
+    const validated = validateJsonlPath(jsonlPath);
+    const messages = await parseJsonlTranscript(validated);
+    return c.json(ok(messages));
+  } catch (e) {
+    const message = e instanceof Error ? e.message : "Unknown error";
+    const status = /not found/i.test(message) ? 404
+      : /denied|traversal|Invalid path|too large|Not a regular/i.test(message) ? 403
+      : 500;
+    return c.json(err(message), status);
+  }
+});
+
 /** POST /chat/upload — upload files for chat attachments, returns server-side paths */
 chatRoutes.post("/upload", async (c) => {
   try {

package/src/server/routes/git.ts

@@ -57,6 +57,22 @@ gitRoutes.get("/file-diff", async (c) => {
   }
 });
 
+/** GET /git/file-full-diff?file=&ref=
+ *  Returns full file contents (VSCode-style) for both sides:
+ *  { original: <ref version>, modified: <working tree> } */
+gitRoutes.get("/file-full-diff", async (c) => {
+  try {
+    const projectPath = c.get("projectPath");
+    const file = c.req.query("file");
+    if (!file) return c.json(err("Missing query: file"), 400);
+    const ref = c.req.query("ref") || "HEAD";
+    const result = await gitService.fileFullDiff(projectPath, file, ref);
+    return c.json(ok(result));
+  } catch (e) {
+    return c.json(err((e as Error).message), 500);
+  }
+});
+
 /** GET /git/graph?max=200&skip=0 */
 gitRoutes.get("/graph", async (c) => {
   try {

package/src/services/git.service.ts

@@ -122,6 +122,40 @@ class GitService {
     return files;
   }
 
+  /**
+   * Returns full file contents for both sides of a diff (VSCode-style).
+   * - original: file at HEAD (empty if new/untracked/ref missing)
+   * - modified: working tree content (empty if deleted on disk)
+   * Monaco DiffEditor will compute/render the diff from these full contents.
+   */
+  async fileFullDiff(
+    projectPath: string,
+    filePath: string,
+    ref: string = "HEAD",
+  ): Promise<{ original: string; modified: string }> {
+    const git = this.git(projectPath);
+    const absPath = path.resolve(projectPath, filePath);
+
+    let original = "";
+    try {
+      original = await git.show([`${ref}:${filePath}`]);
+    } catch {
+      // File does not exist at ref (new/untracked/added) → empty original
+      original = "";
+    }
+
+    let modified = "";
+    try {
+      const f = Bun.file(absPath);
+      if (await f.exists()) modified = await f.text();
+    } catch {
+      // File missing on disk (deleted) → empty modified
+      modified = "";
+    }
+
+    return { original, modified };
+  }
+
   async fileDiff(
     projectPath: string,
     filePath: string,