@hienlh/ppm 0.13.65 → 0.13.67

package/src/services/download-token.service.ts

@@ -16,7 +16,7 @@ export function createDownloadToken(): string {
   return token;
 }
 
-/** Validate and consume a download token (one-time use) */
+/** Validate a download token (TTL-based, allows multiple uses within window) */
 export function consumeDownloadToken(token: string): boolean {
   const entry = tokens.get(token);
   if (!entry) return false;
@@ -24,7 +24,6 @@ export function consumeDownloadToken(token: string): boolean {
     tokens.delete(token);
     return false;
   }
-  tokens.delete(token);
   return true;
 }
 

package/src/services/git.service.ts

@@ -132,9 +132,9 @@ class GitService {
     projectPath: string,
     filePath: string,
     ref: string = "HEAD",
+    ref2?: string,
   ): Promise<{ original: string; modified: string }> {
     const git = this.git(projectPath);
-    const absPath = path.resolve(projectPath, filePath);
 
     let original = "";
     try {
@@ -145,12 +145,22 @@ class GitService {
     }
 
     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 = "";
+    if (ref2) {
+      // Commit-to-commit diff: read modified from git object store
+      try {
+        modified = await git.show([`${ref2}:${filePath}`]);
+      } catch {
+        modified = "";
+      }
+    } else {
+      // Working tree diff: read from disk
+      try {
+        const absPath = path.resolve(projectPath, filePath);
+        const f = Bun.file(absPath);
+        if (await f.exists()) modified = await f.text();
+      } catch {
+        modified = "";
+      }
     }
 
     return { original, modified };

package/src/services/resource-monitor-utils.ts

@@ -14,6 +14,8 @@ const CATEGORY_PATTERNS: [ResourceGroup["type"], RegExp][] = [
 ];
 
 function categorize(cmd: string): ResourceGroup["type"] {
+  // Check full command for well-known AI tool paths before extracting basename
+  if (/claude-agent-sdk|@anthropic-ai\/claude/.test(cmd)) return "ai-tool";
   const basename = cmd.split("/").pop()?.split(" ")[0] ?? cmd;
   for (const [type, re] of CATEGORY_PATTERNS) {
     if (re.test(basename)) return type;
@@ -23,23 +25,25 @@ function categorize(cmd: string): ResourceGroup["type"] {
 
 // ── Parser ─────────────────────────────────────────────────────────────
 
-/** Parse `ps -e -o pid,ppid,%cpu,rss,args` output into structured entries */
+/** Parse `ps -e -o pid,ppid,%cpu,rss,etimes,args` output into structured entries */
 export function parseProcessList(stdout: string): ProcessEntry[] {
   const lines = stdout.trim().split("\n");
   if (lines.length < 2) return [];
 
+  const now = Date.now();
   const entries: ProcessEntry[] = [];
   for (let i = 1; i < lines.length; i++) {
     const line = lines[i]?.trim();
     if (!line) continue;
     const parts = line.split(/\s+/);
-    if (parts.length < 5) continue;
+    if (parts.length < 6) continue;
 
     const pid = parseInt(parts[0]!, 10);
     const ppid = parseInt(parts[1]!, 10);
     const cpu = parseFloat(parts[2]!);
     const rssKB = parseInt(parts[3]!, 10);
-    const command = parts.slice(4).join(" ");
+    const etimes = parseInt(parts[4]!, 10);
+    const command = parts.slice(5).join(" ");
 
     if (isNaN(pid) || pid === 0 || !command) continue;
 
@@ -48,6 +52,7 @@ export function parseProcessList(stdout: string): ProcessEntry[] {
       ppid,
       cpu: Math.round(cpu * 10) / 10,
       ramMB: Math.round((rssKB / 1024) * 10) / 10,
+      startedAt: isNaN(etimes) ? now : now - etimes * 1000,
       command,
     });
   }
@@ -92,6 +97,7 @@ const TYPE_LABELS: Record<ResourceGroup["type"], string> = {
 export function groupProcesses(
   serverEntry: ProcessEntry | undefined,
   children: ProcessEntry[],
+  allEntries: ProcessEntry[] = [],
 ): ResourceGroup[] {
   const groups: ResourceGroup[] = [];
 
@@ -101,12 +107,18 @@ export function groupProcesses(
       label: "PPM Server",
       cpu: serverEntry.cpu,
       ramMB: serverEntry.ramMB,
-      processes: [{ pid: serverEntry.pid, cpu: serverEntry.cpu, ramMB: serverEntry.ramMB, command: serverEntry.command }],
+      processes: [{ pid: serverEntry.pid, cpu: serverEntry.cpu, ramMB: serverEntry.ramMB, startedAt: serverEntry.startedAt, command: serverEntry.command }],
     });
   }
 
+  // Include external AI tool processes not in PPM's process tree (e.g. Claude Code sessions)
+  const ppmPids = new Set([serverEntry?.pid, ...children.map((c) => c.pid)].filter(Boolean));
+  const externalAiProcs = allEntries.filter(
+    (e) => !ppmPids.has(e.pid) && categorize(e.command) === "ai-tool",
+  );
+
   const buckets = new Map<ResourceGroup["type"], ProcessEntry[]>();
-  for (const child of children) {
+  for (const child of [...children, ...externalAiProcs]) {
     const type = categorize(child.command);
     const list = buckets.get(type) ?? [];
     list.push(child);
@@ -121,7 +133,7 @@ export function groupProcesses(
       label: TYPE_LABELS[type],
       cpu: Math.round(procs.reduce((s, p) => s + p.cpu, 0) * 10) / 10,
       ramMB: Math.round(procs.reduce((s, p) => s + p.ramMB, 0) * 10) / 10,
-      processes: procs.map((p) => ({ pid: p.pid, cpu: p.cpu, ramMB: p.ramMB, command: p.command })),
+      processes: procs.map((p) => ({ pid: p.pid, cpu: p.cpu, ramMB: p.ramMB, startedAt: p.startedAt, command: p.command })),
     });
   }
 

package/src/services/resource-monitor.service.ts

@@ -13,6 +13,7 @@ export interface ProcessEntry {
   ppid: number;
   cpu: number;
   ramMB: number;
+  startedAt: number;
   command: string;
 }
 
@@ -78,7 +79,7 @@ class ResourceMonitorService {
   private async poll() {
     try {
       const proc = Bun.spawn({
-        cmd: ["ps", "-e", "-o", "pid,ppid,%cpu,rss,args"],
+        cmd: ["ps", "-e", "-o", "pid,ppid,%cpu,rss,etimes,args"],
         stdout: "pipe",
         stderr: "ignore",
       });
@@ -89,7 +90,7 @@ class ResourceMonitorService {
       const rootPid = process.pid;
       const serverEntry = entries.find((e) => e.pid === rootPid);
       const children = buildTree(entries, rootPid);
-      const groups = groupProcesses(serverEntry, children);
+      const groups = groupProcesses(serverEntry, children, entries);
 
       const allProcs = serverEntry ? [serverEntry, ...children] : children;
       const snapshot: ResourceSnapshot = {

package/src/web/components/editor/diff-viewer.tsx

@@ -86,6 +86,7 @@ export function DiffViewer({ metadata }: DiffViewerProps) {
     if (filePath) {
       const params = new URLSearchParams({ file: filePath });
       if (ref1) params.set("ref", ref1);
+      if (ref2) params.set("ref2", ref2);
       api
         .get<{ original: string; modified: string }>(
           `${projectUrl(projectName)}/git/file-full-diff?${params}`,

package/src/web/components/extensions/extension-webview.tsx

@@ -83,7 +83,7 @@ export function ExtensionWebview({ metadata }: ExtensionWebviewProps) {
       }
       if (cancelled) return;
       window.dispatchEvent(new CustomEvent("ext:command:execute", {
-        detail: { command, args },
+        detail: { command, args, recovery: true },
       }));
     }
 
@@ -117,7 +117,7 @@ export function ExtensionWebview({ metadata }: ExtensionWebviewProps) {
         const match = json.data?.find((p) => p.name === projectName);
         const args = match ? [match.path] : [];
         window.dispatchEvent(new CustomEvent("ext:command:execute", {
-          detail: { command, args },
+          detail: { command, args, recovery: true },
         }));
       } catch {}
     })();

package/src/web/components/system/system-monitor-group-row.tsx

@@ -17,6 +17,18 @@ function formatRam(mb: number) {
   return mb < 1024 ? `${mb.toFixed(0)} MB` : `${(mb / 1024).toFixed(1)} GB`;
 }
 
+function formatAge(startedAt?: number) {
+  if (!startedAt) return "";
+  const secs = Math.round((Date.now() - startedAt) / 1000);
+  if (secs < 60) return `${secs}s`;
+  const mins = Math.floor(secs / 60);
+  if (mins < 60) return `${mins}m`;
+  const hrs = Math.floor(mins / 60);
+  if (hrs < 24) return `${hrs}h ${mins % 60}m`;
+  const days = Math.floor(hrs / 24);
+  return `${days}d ${hrs % 24}h`;
+}
+
 export interface GroupRowProps {
   group: ResourceGroup;
   Icon: React.ElementType;
@@ -85,13 +97,21 @@ export const GroupRow = memo(function GroupRow({
           <td className="text-right py-1 px-2 align-top">{formatRam(proc.ramMB)}</td>
           {!isMobile && (
             <td className="align-top py-1 px-2">
-              <button
-                onClick={(e) => { e.stopPropagation(); onKill(proc.pid); }}
-                className="opacity-0 group-hover/proc:opacity-100 p-0.5 rounded hover:bg-red-500/20 hover:text-red-500 transition-all"
-                title={`End process ${proc.pid}`}
-              >
-                <X className="size-3" />
-              </button>
+              <div className="flex items-center justify-between gap-1">
+                <span
+                  className="text-text-subtle"
+                  title={proc.startedAt ? new Date(proc.startedAt).toLocaleString() : ""}
+                >
+                  {formatAge(proc.startedAt)}
+                </span>
+                <button
+                  onClick={(e) => { e.stopPropagation(); onKill(proc.pid); }}
+                  className="opacity-0 group-hover/proc:opacity-100 p-0.5 rounded hover:bg-red-500/20 hover:text-red-500 transition-all"
+                  title={`End process ${proc.pid}`}
+                >
+                  <X className="size-3" />
+                </button>
+              </div>
             </td>
           )}
         </tr>

package/src/web/components/system/system-monitor-tab.tsx

@@ -137,7 +137,7 @@ export const SystemMonitorTab = memo(function SystemMonitorTab() {
                 className="w-20"
               />
               {!isMobile && (
-                <th className="py-1.5 px-2 font-medium w-[130px]">Trend</th>
+                <th className="py-1.5 px-2 font-medium w-[130px]">Trend / Age</th>
               )}
             </tr>
           </thead>

package/src/web/hooks/use-extension-ws.ts

@@ -16,6 +16,13 @@ import { toast } from "sonner";
  */
 const recentlyClosedViews = new Set<string>();
 
+/**
+ * Track viewTypes whose command dispatch was auto-recovery (not user-initiated).
+ * When `webview:create` arrives for a recovery viewType, skip setActiveTab
+ * to prevent stealing focus from the user's current tab.
+ */
+const recoveryViews = new Set<string>();
+
 /**
  * Hook that manages the WebSocket connection for extension UI bridge.
  * Dispatches server messages into the extension Zustand store.
@@ -161,8 +168,11 @@ export function useExtensionWs(enabled = true) {
               title: msg.title,
               metadata: { ...existingTab, viewType: viewTypeSlug, panelId: msg.panelId, extensionId: msg.extensionId },
             });
-            // Focus the existing tab so Cmd+G / command palette switches to it
-            useTabStore.getState().setActiveTab(existingTabId);
+            // Focus the existing tab only if user explicitly opened it (not auto-recovery)
+            if (!recoveryViews.has(viewTypeSlug)) {
+              useTabStore.getState().setActiveTab(existingTabId);
+            }
+            recoveryViews.delete(viewTypeSlug);
           } else if (!recentlyClosedViews.has(viewTypeSlug)) {
             // Only create a new tab if this viewType wasn't recently closed by user
             const currentProject = useTabStore.getState().currentProject;
@@ -223,10 +233,13 @@ export function useExtensionWs(enabled = true) {
 
     // Listen for command:execute requests (dispatched by StatusBar / TreeView)
     const commandHandler = (e: Event) => {
-      const { command, args } = (e as CustomEvent).detail;
+      const { command, args, recovery } = (e as CustomEvent).detail;
       // User explicitly opened an extension — clear "recently closed" so tab can be created
       const slug = (command as string).replace(/\.view$/, "");
       recentlyClosedViews.delete(slug);
+      // Track recovery dispatches to avoid stealing focus on webview:create
+      if (recovery) recoveryViews.add(slug);
+      else recoveryViews.delete(slug);
       client.send(JSON.stringify({ type: "command:execute", command, args }));
     };
     window.addEventListener("ext:command:execute", commandHandler);

package/src/web/hooks/use-resource-monitor.ts

@@ -8,7 +8,7 @@ export interface ResourceGroup {
   label: string;
   cpu: number;
   ramMB: number;
-  processes: { pid: number; cpu: number; ramMB: number; command: string }[];
+  processes: { pid: number; cpu: number; ramMB: number; startedAt?: number; command: string }[];
 }
 
 export interface ResourceSnapshot {

package/src/web/lib/file-download.ts

@@ -2,6 +2,14 @@ import { api, projectUrl } from "./api-client";
 
 /** Trigger browser-native file download via hidden <a> tag */
 export async function downloadFile(projectName: string, filePath: string): Promise<void> {
+  // Absolute paths (external files opened from filesystem browser) use /api/fs routes
+  const isAbsolute = /^(\/|[A-Za-z]:[/\\])/.test(filePath);
+  if (isAbsolute) {
+    const { token } = await api.post<{ token: string }>("/api/fs/download/token");
+    const url = `/api/fs/raw?path=${encodeURIComponent(filePath)}&download=true&dl_token=${encodeURIComponent(token)}`;
+    triggerDownload(url, filePath.split("/").pop() ?? "download");
+    return;
+  }
   const { token } = await api.post<{ token: string }>(`${projectUrl(projectName)}/files/download/token`);
   const url = `${projectUrl(projectName)}/files/raw?path=${encodeURIComponent(filePath)}&download=true&dl_token=${encodeURIComponent(token)}`;
   triggerDownload(url, filePath.split("/").pop() ?? "download");