@hienlh/ppm 0.9.81 → 0.9.83

package/src/services/supervisor.ts

@@ -6,11 +6,11 @@
  */
 import type { Subprocess } from "bun";
 import { resolve } from "node:path";
-import { homedir } from "node:os";
 import {
   readFileSync, writeFileSync, existsSync, mkdirSync, openSync, appendFileSync,
   unlinkSync,
 } from "node:fs";
+import { getPpmDir } from "./ppm-dir.ts";
 import { isCompiledBinary } from "./autostart-generator.ts";
 import {
   type SupervisorState,
@@ -34,9 +34,8 @@ const UPGRADE_CHECK_INTERVAL_MS = 900_000;  // 15min
 const UPGRADE_SKIP_INITIAL_MS = 300_000;    // 5min delay before first check
 const SELF_REPLACE_TIMEOUT_MS = 30_000;     // 30s to wait for new supervisor
 
-const PPM_DIR = resolve(process.env.PPM_HOME || resolve(homedir(), ".ppm"));
-const LOG_FILE = resolve(PPM_DIR, "ppm.log");
-const RESTARTING_FLAG = resolve(PPM_DIR, ".restarting");
+const logFile = () => resolve(getPpmDir(), "ppm.log");
+const restartingFlag = () => resolve(getPpmDir(), ".restarting");
 
 // ─── State ─────────────────────────────────────────────────────────────
 let serverChild: Subprocess | null = null;
@@ -75,7 +74,7 @@ let originalArgv: string[] = [];
 function log(level: string, msg: string) {
   const ts = new Date().toISOString();
   const line = `[${ts}] [${level}] [supervisor] ${msg}\n`;
-  try { appendFileSync(LOG_FILE, line); } catch {}
+  try { appendFileSync(logFile(), line); } catch {}
   if (level === "ERROR" || level === "FATAL") {
     process.stderr.write(line);
   }
@@ -103,7 +102,7 @@ export async function spawnServer(
 
   const childPid = serverChild.pid;
   updateStatus({ pid: childPid });
-  writeFileSync(PID_FILE, String(process.pid)); // supervisor PID for stop
+  writeFileSync(PID_FILE(), String(process.pid)); // supervisor PID for stop
   log("INFO", `Server started (PID: ${childPid})`);
 
   const exitCode = await serverChild.exited;
@@ -413,7 +412,7 @@ async function selfReplace(): Promise<{ success: boolean; error?: string }> {
     updateStatus({ state: "upgrading" });
 
     // Set restarting flag so server child's stopTunnel() skips killing the tunnel
-    try { writeFileSync(RESTARTING_FLAG, ""); } catch {}
+    try { writeFileSync(restartingFlag(), ""); } catch {}
 
     // Clear probe timer FIRST to prevent race between flush check and queued callback
     if (tunnelProbeTimer) { clearInterval(tunnelProbeTimer); tunnelProbeTimer = null; }
@@ -439,7 +438,7 @@ async function selfReplace(): Promise<{ success: boolean; error?: string }> {
 
     // Spawn new supervisor using saved argv
     const cmd = originalArgv.slice();
-    const logFd = openSync(LOG_FILE, "a");
+    const logFd = openSync(logFile(), "a");
     const child = Bun.spawn({
       cmd,
       stdio: ["ignore", logFd, logFd],
@@ -452,7 +451,7 @@ async function selfReplace(): Promise<{ success: boolean; error?: string }> {
     while (Date.now() - start < SELF_REPLACE_TIMEOUT_MS) {
       await Bun.sleep(1000);
       try {
-        const data = JSON.parse(readFileSync(STATUS_FILE, "utf-8"));
+        const data = JSON.parse(readFileSync(STATUS_FILE(), "utf-8"));
         if (data.supervisorPid && data.supervisorPid !== currentSupervisorPid) {
           log("INFO", `New supervisor detected (PID: ${data.supervisorPid}), old exiting`);
           // Children already killed, just clear remaining timers and exit
@@ -467,7 +466,7 @@ async function selfReplace(): Promise<{ success: boolean; error?: string }> {
     // Timeout — new supervisor didn't start, restore old supervisor
     log("ERROR", "Self-replace timeout: new supervisor did not start");
     try { child.kill(); } catch {}
-    try { unlinkSync(RESTARTING_FLAG); } catch {}
+    try { unlinkSync(restartingFlag()); } catch {}
     shuttingDown = false;
     notifyStateChange("upgrading", "running", "upgrade_failed");
     setState("running");
@@ -475,7 +474,7 @@ async function selfReplace(): Promise<{ success: boolean; error?: string }> {
     return { success: false, error: "New supervisor failed to start within 30s" };
   } catch (e) {
     log("ERROR", `Self-replace error: ${e}`);
-    try { unlinkSync(RESTARTING_FLAG); } catch {}
+    try { unlinkSync(restartingFlag()); } catch {}
     shuttingDown = false;
     notifyStateChange("upgrading", "running", "upgrade_failed");
     setState("running");
@@ -505,7 +504,8 @@ async function notifyStateChange(from: string, to: string, reason: string) {
 /** Connect supervisor to Cloud via WebSocket (if device is linked) */
 async function connectCloud(opts: { port: number }, serverArgs: string[], logFd: number): Promise<boolean> {
   try {
-    const { getCloudDevice } = await import("./cloud.service.ts");
+    const { getCloudDevice, saveCloudDevice } = await import("./cloud.service.ts");
+    const { configService } = await import("./config.service.ts");
     const device = getCloudDevice();
     if (!device) return false; // not linked to cloud
 
@@ -521,6 +521,12 @@ async function connectCloud(opts: { port: number }, serverArgs: string[], logFd:
         const status = readStatus();
         // Re-read device file each heartbeat to pick up name changes
         const currentDevice = getCloudDevice();
+        // Sync device name from config if user changed it in settings
+        const configName = configService.get("device_name") as string;
+        if (configName && currentDevice && configName !== currentDevice.name) {
+          currentDevice.name = configName;
+          saveCloudDevice(currentDevice);
+        }
         return {
           type: "heartbeat" as const,
           tunnelUrl,
@@ -741,15 +747,16 @@ export async function runSupervisor(opts: {
   profile?: string;
   share: boolean;
 }) {
-  if (!existsSync(PPM_DIR)) mkdirSync(PPM_DIR, { recursive: true });
+  const ppmDir = getPpmDir();
+  if (!existsSync(ppmDir)) mkdirSync(ppmDir, { recursive: true });
 
   // Clean up restarting flag from previous upgrade/restart
-  try { unlinkSync(RESTARTING_FLAG); } catch {}
+  try { unlinkSync(restartingFlag()); } catch {}
 
   // Save original argv for self-replace
   originalArgv = [...process.argv];
 
-  const logFd = openSync(LOG_FILE, "a");
+  const logFd = openSync(logFile(), "a");
   log("INFO", `Supervisor started (PID: ${process.pid}, port: ${opts.port}, share: ${opts.share})`);
 
   // Global exception handlers — supervisor must never crash
@@ -761,7 +768,7 @@ export async function runSupervisor(opts: {
   });
 
   // Write supervisor PID + clear stale availableVersion from previous run
-  writeFileSync(PID_FILE, String(process.pid));
+  writeFileSync(PID_FILE(), String(process.pid));
   updateStatus({
     supervisorPid: process.pid, port: opts.port, host: opts.host, availableVersion: null,
     state: "running", pausedAt: null, pauseReason: null, lastCrashError: null,

package/src/services/tunnel.service.ts

@@ -1,12 +1,11 @@
 import type { Subprocess } from "bun";
 import { resolve } from "node:path";
-import { homedir } from "node:os";
 import { existsSync, unlinkSync, readFileSync, writeFileSync, renameSync } from "node:fs";
 import { ensureCloudflared } from "./cloudflared.service.ts";
+import { getPpmDir } from "./ppm-dir.ts";
 
 const TUNNEL_URL_REGEX = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/;
 const decoder = new TextDecoder();
-const RESTARTING_FLAG = resolve(homedir(), ".ppm", ".restarting");
 
 /** Extract tunnel URL from cloudflared stderr output */
 export function extractTunnelUrl(text: string): string | null {
@@ -98,7 +97,7 @@ class TunnelService {
       this.cleanupHandler = null;
     }
     // If server is restarting, keep tunnel alive
-    if (existsSync(RESTARTING_FLAG)) {
+    if (existsSync(resolve(getPpmDir(), ".restarting"))) {
       this.childProcess = null;
       this.externalPid = null;
       this.url = null;
@@ -136,7 +135,7 @@ class TunnelService {
   private syncFromStatusFile(): void {
     if (this.url) return; // already have a URL
     try {
-      const statusFile = resolve(homedir(), ".ppm", "status.json");
+      const statusFile = resolve(getPpmDir(), "status.json");
       const status = JSON.parse(readFileSync(statusFile, "utf-8"));
       if (status.shareUrl) {
         this.url = status.shareUrl;
@@ -166,7 +165,7 @@ class TunnelService {
 
   /** Persist shareUrl + tunnelPid to status.json (atomic write to avoid cross-process races) */
   private persistToStatusFile(): void {
-    const statusFile = resolve(homedir(), ".ppm", "status.json");
+    const statusFile = resolve(getPpmDir(), "status.json");
     if (!existsSync(statusFile)) return;
     try {
       const data = JSON.parse(readFileSync(statusFile, "utf-8"));

package/src/services/upgrade.service.ts

@@ -3,14 +3,13 @@
  * detects install method, runs install command.
  */
 import { resolve } from "node:path";
-import { homedir } from "node:os";
 import { readFileSync } from "node:fs";
 import { VERSION } from "../version.ts";
 import { isCompiledBinary } from "./autostart-generator.ts";
+import { getPpmDir } from "./ppm-dir.ts";
 
 const NPM_REGISTRY_URL = "https://registry.npmjs.org/@hienlh/ppm/latest";
 const FETCH_TIMEOUT_MS = 10_000;
-const STATUS_FILE = resolve(process.env.PPM_HOME || resolve(homedir(), ".ppm"), "status.json");
 
 export type InstallMethod = "bun" | "npm" | "binary";
 
@@ -103,7 +102,7 @@ export async function applyUpgrade(): Promise<{
 /** Send SIGUSR1 to supervisor to trigger self-replace after upgrade */
 export function signalSupervisorUpgrade(): { sent: boolean; error?: string } {
   try {
-    const data = JSON.parse(readFileSync(STATUS_FILE, "utf-8"));
+    const data = JSON.parse(readFileSync(resolve(getPpmDir(), "status.json"), "utf-8"));
     const pid = data.supervisorPid;
     if (!pid) return { sent: false, error: "No supervisor PID" };
     process.kill(pid, 0); // check alive

package/src/types/chat.ts

@@ -116,7 +116,7 @@ export type ChatEvent =
   | { type: "tool_result"; output: string; isError?: boolean; toolUseId?: string; parentToolUseId?: string }
   | { type: "approval_request"; requestId: string; tool: string; input: unknown }
   | { type: "error"; message: string }
-  | { type: "done"; sessionId: string; resultSubtype?: ResultSubtype; numTurns?: number; contextWindowPct?: number }
+  | { type: "done"; sessionId: string; resultSubtype?: ResultSubtype; numTurns?: number; contextWindowPct?: number; lastMessageUuid?: string }
   | { type: "account_info"; accountId: string; accountLabel: string }
   | { type: "account_retry"; reason: string; accountId?: string; accountLabel?: string }
   | { type: "status_update"; phase: "routing" | "refreshing" | "switching"; message: string; accountLabel?: string }
@@ -139,4 +139,6 @@ export interface ChatMessage {
   /** Account used to generate this assistant message */
   accountId?: string;
   accountLabel?: string;
+  /** SDK message UUID — used for fork/rewind (maps to JSONL message IDs) */
+  sdkUuid?: string;
 }

package/src/web/components/chat/chat-tab.tsx

@@ -36,6 +36,7 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
   const [slashItems, setSlashItems] = useState<SlashItem[]>([]);
   const [showSlashPicker, setShowSlashPicker] = useState(false);
   const [slashFilter, setSlashFilter] = useState("");
+  const [slashRanked, setSlashRanked] = useState(false);
   const [slashSelected, setSlashSelected] = useState<SlashItem | null>(null);
 
   // File picker state
@@ -243,6 +244,7 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
   const handleSlashStateChange = useCallback((visible: boolean, filter: string) => {
     setShowSlashPicker(visible);
     setSlashFilter(filter);
+    if (!visible || !filter) setSlashRanked(false);
   }, []);
 
   const handleSlashSelect = useCallback((item: SlashItem) => {
@@ -383,6 +385,7 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
           onSelect={handleSlashSelect}
           onClose={handleSlashClose}
           visible={showSlashPicker}
+          ranked={slashRanked}
         />
         <FilePicker
           items={fileItems}
@@ -404,7 +407,7 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
           initialValue={forkDraft}
           projectName={projectName}
           onSlashStateChange={handleSlashStateChange}
-          onSlashItemsLoaded={setSlashItems}
+          onSlashItemsLoaded={(items, ranked) => { setSlashItems(items); if (ranked !== undefined) setSlashRanked(ranked); }}
           slashSelected={slashSelected}
           onFileStateChange={handleFileStateChange}
           onFileItemsLoaded={setFileItems}

package/src/web/components/chat/message-input.tsx

@@ -32,7 +32,7 @@ interface MessageInputProps {
   projectName?: string;
   /** Slash picker state change */
   onSlashStateChange?: (visible: boolean, filter: string) => void;
-  onSlashItemsLoaded?: (items: SlashItem[]) => void;
+  onSlashItemsLoaded?: (items: SlashItem[], ranked?: boolean) => void;
   slashSelected?: SlashItem | null;
   /** File picker state change */
   onFileStateChange?: (visible: boolean, filter: string) => void;
@@ -83,6 +83,9 @@ export const MessageInput = memo(function MessageInput({
   const mobileTextareaRef = useRef<HTMLTextAreaElement>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
   const slashItemsRef = useRef<SlashItem[]>([]);
+  const slashRankedRef = useRef(false);
+  const slashDebounceRef = useRef<ReturnType<typeof setTimeout>>(undefined);
+  const slashSearchIdRef = useRef(0);
   const fileItemsRef = useRef<FileNode[]>([]);
 
   // Voice input (Web Speech API)
@@ -147,21 +150,29 @@ export const MessageInput = memo(function MessageInput({
   useEffect(() => {
     if (!projectName) {
       slashItemsRef.current = [];
-      onSlashItemsLoaded?.([]);
+      onSlashItemsLoaded?.([], false);
       return;
     }
     api
       .get<SlashItem[]>(`${projectUrl(projectName)}/chat/slash-items`)
       .then((items) => {
         slashItemsRef.current = items;
-        onSlashItemsLoaded?.(items);
+        slashRankedRef.current = false;
+        onSlashItemsLoaded?.(items, false);
       })
       .catch(() => {
         slashItemsRef.current = [];
-        onSlashItemsLoaded?.([]);
+        onSlashItemsLoaded?.([], false);
       });
   }, [projectName]); // eslint-disable-line react-hooks/exhaustive-deps
 
+  // Cleanup debounce timer on unmount
+  useEffect(() => {
+    return () => {
+      if (slashDebounceRef.current) clearTimeout(slashDebounceRef.current);
+    };
+  }, []);
+
   // Fetch file tree when projectName changes
   useEffect(() => {
     if (!projectName) {
@@ -387,6 +398,30 @@ export const MessageInput = memo(function MessageInput({
     [handleSend, permissionMode, onModeChange],
   );
 
+  /** Debounced server-side fuzzy search for slash items */
+  const fetchSlashSearch = useCallback(
+    (query: string) => {
+      if (slashDebounceRef.current) clearTimeout(slashDebounceRef.current);
+      if (!projectName || !query) return;
+      const requestId = ++slashSearchIdRef.current;
+      slashDebounceRef.current = setTimeout(() => {
+        api
+          .get<SlashItem[]>(`${projectUrl(projectName)}/chat/slash-items?q=${encodeURIComponent(query)}`)
+          .then((items) => {
+            if (requestId !== slashSearchIdRef.current) return; // stale response
+            slashItemsRef.current = items;
+            slashRankedRef.current = true;
+            onSlashItemsLoaded?.(items, true);
+          })
+          .catch(() => {
+            if (requestId !== slashSearchIdRef.current) return;
+            slashRankedRef.current = false;
+          });
+      }, 150);
+    },
+    [projectName, onSlashItemsLoaded],
+  );
+
   const updatePickerState = useCallback(
     (text: string, cursorPos: number) => {
       const textBefore = text.slice(0, cursorPos);
@@ -394,11 +429,18 @@ export const MessageInput = memo(function MessageInput({
       // Check for slash anywhere in text (after whitespace or at start)
       const slashMatch = textBefore.match(/(?:^|\s)\/(\S*)$/);
       if (slashMatch && slashItemsRef.current.length > 0) {
-        onSlashStateChange?.(true, slashMatch[1] ?? "");
+        const filter = slashMatch[1] ?? "";
+        onSlashStateChange?.(true, filter);
         onFileStateChange?.(false, "");
+        // Trigger server-side search for non-empty filter
+        if (filter) fetchSlashSearch(filter);
         return;
       }
 
+      // Cancel pending search when slash picker closes
+      if (slashDebounceRef.current) clearTimeout(slashDebounceRef.current);
+      if (slashRankedRef.current) slashRankedRef.current = false;
+
       // Check for @ anywhere in text (after whitespace or at start)
       const atMatch = textBefore.match(/@(\S*)$/);
       if (atMatch && fileItemsRef.current.length > 0) {
@@ -411,7 +453,7 @@ export const MessageInput = memo(function MessageInput({
       onSlashStateChange?.(false, "");
       onFileStateChange?.(false, "");
     },
-    [onSlashStateChange, onFileStateChange],
+    [onSlashStateChange, onFileStateChange, fetchSlashSearch],
   );
 
   const handleChange = useCallback(

package/src/web/components/chat/message-list.tsx

@@ -105,9 +105,9 @@ export function MessageList({
                 isStreaming={isStreaming && msg.id.startsWith("streaming-")}
                 projectName={projectName}
                 onFork={msg.role === "user" && onFork ? () => {
-                  // Pass the previous message ID so the fork includes history up to (but not including) this user message
+                  // Pass the SDK UUID of the previous assistant message for fork (JSONL-level message ID)
                   const prevMsg = idx > 0 ? filtered[idx - 1] : undefined;
-                  onFork(msg.content, prevMsg?.id);
+                  onFork(msg.content, prevMsg?.sdkUuid ?? prevMsg?.id);
                 } : undefined}
               />
             ))}

package/src/web/components/chat/slash-command-picker.tsx

@@ -1,12 +1,14 @@
 import { useState, useEffect, useRef, useCallback, type KeyboardEvent } from "react";
-import { Sparkles, Terminal } from "lucide-react";
+import { Sparkles, Terminal, Zap } from "lucide-react";
 
 export interface SlashItem {
-  type: "skill" | "command";
+  type: "skill" | "command" | "builtin";
   name: string;
   description: string;
   argumentHint?: string;
-  scope?: "project" | "user";
+  scope?: "project" | "user" | "bundled";
+  category?: string;
+  aliases?: string[];
 }
 
 interface SlashCommandPickerProps {
@@ -15,6 +17,8 @@ interface SlashCommandPickerProps {
   onSelect: (item: SlashItem) => void;
   onClose: () => void;
   visible: boolean;
+  /** When true, items are pre-ranked by server — skip client-side filtering */
+  ranked?: boolean;
 }
 
 export function SlashCommandPicker({
@@ -23,17 +27,20 @@ export function SlashCommandPicker({
   onSelect,
   onClose,
   visible,
+  ranked,
 }: SlashCommandPickerProps) {
   const [selectedIndex, setSelectedIndex] = useState(0);
   const listRef = useRef<HTMLDivElement>(null);
 
-  const filtered = items.filter((item) => {
-    const q = filter.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(q) ||
-      item.description.toLowerCase().includes(q)
-    );
-  });
+  const filtered = ranked
+    ? items
+    : items.filter((item) => {
+        const q = filter.toLowerCase();
+        return (
+          item.name.toLowerCase().includes(q) ||
+          item.description.toLowerCase().includes(q)
+        );
+      });
 
   // Reset selection when filter changes
   useEffect(() => {
@@ -105,7 +112,9 @@ export function SlashCommandPicker({
             onClick={() => onSelect(item)}
           >
             <span className="shrink-0 mt-0.5">
-              {item.type === "skill" ? (
+              {item.type === "builtin" ? (
+                <Zap className="size-4 text-emerald-500" />
+              ) : item.type === "skill" ? (
                 <Sparkles className="size-4 text-amber-500" />
               ) : (
                 <Terminal className="size-4 text-blue-500" />
@@ -118,7 +127,7 @@ export function SlashCommandPicker({
                   <span className="text-xs text-text-subtle">{item.argumentHint}</span>
                 )}
                 <span className="text-xs text-text-subtle capitalize ml-auto">
-                  {item.scope === "user" ? "global" : item.type}
+                  {item.scope === "bundled" ? "PPM" : item.scope === "user" ? "global" : item.type}
                 </span>
               </div>
               {item.description && (

package/src/web/components/layout/upgrade-banner.tsx

@@ -5,6 +5,8 @@ import { Loader2, ArrowUpCircle, X } from "lucide-react";
 
 const POLL_INTERVAL_MS = 60_000;
 const DISMISS_KEY_PREFIX = "ppm-upgrade-dismissed-";
+const RESTART_POLL_MS = 1_500;
+const RESTART_TIMEOUT_MS = 60_000;
 
 interface UpgradeStatus {
   currentVersion: string;
@@ -12,6 +14,37 @@ interface UpgradeStatus {
   installMethod: string;
 }
 
+interface UpgradeResult {
+  success: boolean;
+  newVersion?: string;
+  restart: boolean;
+  message?: string;
+}
+
+/** Poll /api/health aggressively until server goes down then back up, then reload. */
+async function waitForServerRestart(): Promise<boolean> {
+  let serverWentDown = false;
+  const start = Date.now();
+
+  while (Date.now() - start < RESTART_TIMEOUT_MS) {
+    await new Promise((r) => setTimeout(r, RESTART_POLL_MS));
+    try {
+      const res = await fetch("/api/health", { cache: "no-store" });
+      if (res.ok && serverWentDown) {
+        if ("caches" in window) {
+          const keys = await caches.keys();
+          await Promise.all(keys.map((k) => caches.delete(k)));
+        }
+        window.location.reload();
+        return true;
+      }
+    } catch {
+      serverWentDown = true;
+    }
+  }
+  return false;
+}
+
 interface UpgradeBannerProps {
   onVisibilityChange?: (visible: boolean) => void;
 }
@@ -50,8 +83,21 @@ export function UpgradeBanner({ onVisibilityChange }: UpgradeBannerProps) {
   const handleUpgrade = useCallback(async () => {
     setUpgrading(true);
     try {
-      await api.post("/api/upgrade/apply");
-      // useServerReload in app.tsx handles the actual page reload after restart
+      const data = await api.post<UpgradeResult>("/api/upgrade/apply");
+
+      if (data.restart) {
+        // Server will restart — poll aggressively until it comes back
+        const restarted = await waitForServerRestart();
+        if (!restarted) {
+          toast.warning("Upgrade installed but server hasn't restarted. Try refreshing manually.");
+          setUpgrading(false);
+        }
+      } else {
+        // No supervisor — manual restart needed
+        toast.info(data.message || "Upgrade installed. Restart PPM manually.");
+        setUpgrading(false);
+        setDismissed(true);
+      }
     } catch (e) {
       toast.error(`Upgrade failed: ${(e as Error).message}`);
       setUpgrading(false);

package/src/web/components/shared/markdown-renderer.tsx

@@ -1,5 +1,6 @@
 import { useMemo, useRef, useEffect } from "react";
 import { marked } from "marked";
+import markedKatex from "marked-katex-extension";
 import { useTabStore } from "@/stores/tab-store";
 import { useFileStore, type FileNode } from "@/stores/file-store";
 import { useImageOverlay } from "@/stores/image-overlay-store";
@@ -29,6 +30,7 @@ const LOCAL_PATH_RE = /^(\/|[A-Za-z]:[/\\])/;
 
 // Configure marked globally
 marked.use({ gfm: true, breaks: true });
+marked.use(markedKatex({ throwOnError: false }));
 
 /** Common text file extensions that PPM can open as editor tabs */
 const FILE_EXTS = "ts|tsx|js|jsx|mjs|cjs|py|json|md|mdx|yaml|yml|toml|css|scss|less|html|htm|sh|bash|zsh|go|rs|sql|rb|java|kt|swift|c|cpp|h|hpp|cs|vue|svelte|txt|env|cfg|conf|ini|xml|csv|log|dockerfile|makefile|gradle";

package/src/web/hooks/use-chat.ts

@@ -343,9 +343,10 @@ export function useChat(sessionId: string | null, providerId = "claude", project
           useNotificationStore.getState().addNotification(sessionIdRef.current, "done", projectNameRef.current);
           playNotificationSound("done");
         }
-        // Finalize the streaming message
+        // Finalize the streaming message — preserve SDK UUID for fork/rewind
         const finalContent = streamingContentRef.current;
         const finalEvents = [...streamingEventsRef.current];
+        const doneUuid = ev.lastMessageUuid as string | undefined;
         setMessages((prev) => {
           const last = prev[prev.length - 1];
           if (last?.role === "assistant") {
@@ -354,6 +355,7 @@ export function useChat(sessionId: string | null, providerId = "claude", project
               id: `final-${Date.now()}`,
               content: finalContent || last.content,
               events: finalEvents.length > 0 ? finalEvents : last.events,
+              ...(doneUuid && { sdkUuid: doneUuid }),
             }];
           }
           return prev;

package/src/web/hooks/use-url-sync.ts

@@ -100,10 +100,12 @@ function buildMetadataFromUrl(
     case "chat": {
       if (!identifier) return null;
       const slashIdx = identifier.indexOf("/");
-      if (slashIdx === -1) return { sessionId: identifier, projectName };
-      const providerId = identifier.slice(0, slashIdx);
-      const sessionId = identifier.slice(slashIdx + 1);
-      return sessionId ? { sessionId, providerId, projectName } : null;
+      const rawSessionId = slashIdx === -1 ? identifier : identifier.slice(slashIdx + 1);
+      const providerId = slashIdx === -1 ? undefined : identifier.slice(0, slashIdx);
+      // Validate UUID format — short/random IDs from tab derivation must not be used as session IDs
+      const isUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(rawSessionId);
+      const sessionId = isUuid ? rawSessionId : undefined;
+      return { ...(sessionId && { sessionId }), ...(providerId && { providerId }), projectName };
     }
     case "terminal": return { terminalIndex: parseInt(identifier ?? "1", 10), projectName };
     case "git-graph": return { projectName };

package/src/web/main.tsx

@@ -2,6 +2,7 @@ import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { App } from "./app.tsx";
 import "./styles/globals.css";
+import "katex/dist/katex.min.css";
 
 createRoot(document.getElementById("root")!).render(
   <StrictMode>

package/.opencode/.ckignore

@@ -1,27 +0,0 @@
-# ClaudeKit Ignore File - SIZE-based blocking
-# Blocks directories with heavy file counts that fill LLM context
-# Syntax: gitignore-spec | Use ! prefix to allow (e.g., !src/vendor)
-
-# JS/TS
-node_modules
-dist
-build
-.next
-.nuxt
-
-# Python
-__pycache__
-.venv
-venv
-
-# Go/PHP/Rust/Java
-vendor
-target
-
-# VCS & Coverage
-.git
-coverage
-
-# Allow reading these files
-!.env
-!.env.*