@hienlh/ppm 0.17.31 → 0.17.32

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.17.32] - 2026-08-27
+
+### Fixed
+- **A forked chat and the chat it was forked from could not both appear in the history list** — the list showed one of the two and hid the other, and which one it hid kept changing: refresh after working in the fork and the original was gone, refresh after working in the original and the fork was gone. Pinning one of them brought both back, which was the only reliable way to reach either. Forking a chat and editing one of your earlier messages both create a new chat behind the scenes, and the history list deliberately folds the versions of an edited message into a single row, so that revising one message five times does not leave five near-identical rows behind. The two kinds were not being told apart, so a fork — a separate conversation you opened in its own tab on purpose — was folded in as though it were just another version of an edited message, and only whichever of the pair had been written to most recently survived the fold. A fork is now recorded as a conversation in its own right and always keeps its own row, whichever side you last used. Edited messages still collapse into one row, with the other versions reachable from the arrows on the message itself. Forks and edits made before this release can no longer be told apart, so all of them are now treated as forks and will each keep a row — a message you had revised several times may therefore show more rows in the list than it used to.
+
 ## [0.17.31] - 2026-08-27
 
 ### Added

package/assets/skills/ppm/SKILL.md

@@ -71,4 +71,4 @@ This skill covers the `ppm` CLI, its HTTP API, and its config DB. It does **not*
 - Third-party extensions (inspect via `ppm ext list`).
 - The Claude Agent SDK internals (separate skill).
 
-<!-- Generated for PPM v0.17.31 at build time. Re-run `ppm export skill --install` to refresh. -->
+<!-- Generated for PPM v0.17.32 at build time. Re-run `ppm export skill --install` to refresh. -->

package/assets/skills/ppm/references/http-api.md

@@ -284,4 +284,4 @@ _Base URL: `http://localhost:8080` (default; override via `ppm config set port <
 - `ws://<host>/ws/terminal` — PTY terminal multiplexer
 - `ws://<host>/ws/extensions` — extension host channel
 
-<!-- Generated from src/server/routes/ for PPM v0.17.31 -->
+<!-- Generated from src/server/routes/ for PPM v0.17.32 -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hienlh/ppm",
-  "version": "0.17.31",
+  "version": "0.17.32",
   "description": "Personal Project Manager — mobile-first web IDE with AI assistance",
   "author": "hienlh",
   "license": "SEE LICENSE IN LICENSE",

package/src/server/routes/chat.ts

@@ -577,7 +577,10 @@ chatRoutes.post("/sessions/:id/fork", async (c) => {
           // partial, inconsistent version counts. Re-parent onto the group root.
           const existingGroup = resolveVersionGroup(sourceId, forkOrdinal);
           const versionParent = existingGroup ? existingGroup.ids[0]! : sourceId;
-          recordBranch(result.sessionId, versionParent, body.messageId, forkOrdinal);
+          // An explicit fork is a separate thread, not another version of this
+          // one: recording it as `edit` would let the history list collapse it
+          // together with its source and show only whichever was touched last.
+          recordBranch(result.sessionId, versionParent, body.messageId, forkOrdinal, isEdit ? "edit" : "fork");
           // Edit versions must show the group root's clean title — codex names a
           // forked thread "<title> (fork)", so without this the suffix compounds
           // ("Hello (fork) (fork)") across repeated edits. Pin the PPM title.

package/src/services/db.service.ts

@@ -3,7 +3,7 @@ import { resolve } from "node:path";
 import { mkdirSync, existsSync } from "node:fs";
 import { encrypt, decrypt } from "../lib/account-crypto.ts";
 import { getPpmDir } from "./ppm-dir.ts";
-export const CURRENT_SCHEMA_VERSION = 36;
+export const CURRENT_SCHEMA_VERSION = 37;
 
 let db: Database | null = null;
 let dbProfile: string | null = null;
@@ -837,6 +837,17 @@ function runMigrations(database: Database): void {
     try { database.exec("ALTER TABLE session_metadata ADD COLUMN thinking_budget INTEGER"); } catch {}
     database.exec("PRAGMA user_version = 36;");
   }
+
+  if (current < 37) {
+    // Same-tab message edits and explicit new-tab forks both land in
+    // session_branches, but only edits are alternate versions of one
+    // conversation — a fork is its own thread and must keep its own history row.
+    // Existing rows can no longer be told apart, so treat them as forks: showing
+    // an extra row is recoverable, hiding a conversation is not.
+    try { database.exec("ALTER TABLE session_branches ADD COLUMN kind TEXT"); } catch { /* column exists */ }
+    database.exec("UPDATE session_branches SET kind = 'fork' WHERE kind IS NULL");
+    database.exec("PRAGMA user_version = 37;");
+  }
 }
 
 // ---------------------------------------------------------------------------

package/src/services/session-branch.service.ts

@@ -1,6 +1,14 @@
 import { getDb } from "./db.service.ts";
 import type { VersionGroup } from "../types/api.ts";
 
+/**
+ * How a branch came to exist. `edit` is an alternate version of the same
+ * conversation, reachable through the in-message version switcher. `fork` is a
+ * deliberate new thread opened in its own tab. Only `edit` nodes collapse in the
+ * history list; a fork stays a first-class conversation there.
+ */
+export type BranchKind = "edit" | "fork";
+
 /** A node in the edit-message branch tree (one forked session). */
 export interface BranchRow {
   child_id: string;
@@ -9,6 +17,8 @@ export interface BranchRow {
   /** User-message ordinal (1-based) of the divergent message — stable across forks. */
   fork_ordinal: number;
   root_id: string;
+  /** Null on rows written before the kind column existed; treated as `fork`. */
+  kind: BranchKind | null;
   created_at: string;
 }
 
@@ -20,13 +30,19 @@ export interface BranchRow {
  * parent-space fork_msg_id can't be matched against the child's transcript).
  * Idempotent on child_id (INSERT OR REPLACE).
  */
-export function recordBranch(childId: string, parentId: string, forkMsgId: string, forkOrdinal: number): void {
+export function recordBranch(
+  childId: string,
+  parentId: string,
+  forkMsgId: string,
+  forkOrdinal: number,
+  kind: BranchKind = "edit",
+): void {
   const parentRoot = getRootId(parentId);
   const rootId = parentRoot ?? parentId;
   getDb().run(
-    `INSERT OR REPLACE INTO session_branches (child_id, parent_id, fork_msg_id, fork_ordinal, root_id)
-     VALUES (?, ?, ?, ?, ?)`,
-    [childId, parentId, forkMsgId, forkOrdinal, rootId],
+    `INSERT OR REPLACE INTO session_branches (child_id, parent_id, fork_msg_id, fork_ordinal, root_id, kind)
+     VALUES (?, ?, ?, ?, ?, ?)`,
+    [childId, parentId, forkMsgId, forkOrdinal, rootId, kind],
   );
 }
 
@@ -171,9 +187,26 @@ export interface GroupableSession {
 }
 
 /**
- * Collapse branch-tree members so each tree shows a single row — its head, the
- * most recently active node (max updatedAt, falling back to createdAt). Pinned
- * sessions are passed through untouched. Caller is responsible for final sort.
+ * Session whose history row this one folds into: climb while every hop is a
+ * message edit, and stop at the first explicit fork. A fork therefore anchors
+ * its own group, so it never displaces — or gets displaced by — the thread it
+ * was forked from. An unclassified (pre-`kind`) row stops the climb too, which
+ * errs toward showing a row rather than hiding a conversation.
+ */
+export function getCollapseGroupId(sessionId: string): string {
+  let current = sessionId;
+  for (let hops = 0; hops < 100; hops++) {
+    const row = getBranchRow(current);
+    if (!row || row.kind !== "edit") return current;
+    current = row.parent_id;
+  }
+  return current;
+}
+
+/**
+ * Collapse each edit-version group to a single row — its head, the most recently
+ * active node (max updatedAt, falling back to createdAt). Pinned sessions are
+ * passed through untouched. Caller is responsible for final sort.
  */
 export function collapseTreesToHeads<T extends GroupableSession>(sessions: T[]): T[] {
   const heads = new Map<string, T>();
@@ -184,9 +217,9 @@ export function collapseTreesToHeads<T extends GroupableSession>(sessions: T[]):
       out.push(s);
       continue;
     }
-    const rootId = getRootId(s.id) ?? s.id;
-    const cur = heads.get(rootId);
-    if (!cur || activity(s) > activity(cur)) heads.set(rootId, s);
+    const groupId = getCollapseGroupId(s.id);
+    const cur = heads.get(groupId);
+    if (!cur || activity(s) > activity(cur)) heads.set(groupId, s);
   }
   out.push(...heads.values());
   return out;

package/skills-lock.json

@@ -1,11 +0,0 @@
-{
-  "version": 1,
-  "skills": {
-    "game-assets": {
-      "source": "Meowa-AI/meowa-skills",
-      "sourceType": "github",
-      "skillPath": "skills/game-assets/SKILL.md",
-      "computedHash": "b3ceb77a09475144f2a598da451ec57a4f4e3994711b62a8eeae60a25fd2d916"
-    }
-  }
-}

package/spike-memory-region-dump.ps1

@@ -1,69 +0,0 @@
-# Enumerate committed memory regions of a process via VirtualQueryEx.
-# Reveals allocation shape: many small regions (per-iteration leak) vs few huge (allocator arena).
-param([int]$ProcessId)
-
-Add-Type -TypeDefinition @"
-using System;
-using System.Runtime.InteropServices;
-public class MemProbe {
-  [StructLayout(LayoutKind.Sequential)]
-  public struct MEMORY_BASIC_INFORMATION {
-    public IntPtr BaseAddress;
-    public IntPtr AllocationBase;
-    public uint AllocationProtect;
-    public uint Alignment1;
-    public IntPtr RegionSize;
-    public uint State;
-    public uint Protect;
-    public uint Type;
-    public uint Alignment2;
-  }
-  [DllImport("kernel32.dll", SetLastError=true)]
-  public static extern IntPtr OpenProcess(uint access, bool inherit, int pid);
-  [DllImport("kernel32.dll", SetLastError=true)]
-  public static extern int VirtualQueryEx(IntPtr h, IntPtr addr, out MEMORY_BASIC_INFORMATION mbi, int len);
-  [DllImport("kernel32.dll")]
-  public static extern bool CloseHandle(IntPtr h);
-}
-"@
-
-$h = [MemProbe]::OpenProcess(0x0400 -bor 0x0010, $false, $ProcessId)
-if ($h -eq [IntPtr]::Zero) { Write-Error "OpenProcess failed: $([ComponentModel.Win32Exception]::new([Runtime.InteropServices.Marshal]::GetLastWin32Error()).Message)"; exit 1 }
-
-$size = [Runtime.InteropServices.Marshal]::SizeOf([type][MemProbe+MEMORY_BASIC_INFORMATION])
-$addr = [IntPtr]::Zero
-$regions = New-Object System.Collections.ArrayList
-$max = [Int64]0x7FFFFFFFFFFF
-
-while ([Int64]$addr -lt $max) {
-  $mbi = New-Object MemProbe+MEMORY_BASIC_INFORMATION
-  if ([MemProbe]::VirtualQueryEx($h, $addr, [ref]$mbi, $size) -eq 0) { break }
-  $rs = [Int64]$mbi.RegionSize
-  if ($rs -le 0) { break }
-  # MEM_COMMIT=0x1000, MEM_PRIVATE=0x20000
-  if ($mbi.State -eq 0x1000 -and $mbi.Type -eq 0x20000) {
-    [void]$regions.Add([pscustomobject]@{ Base=$mbi.BaseAddress; Size=$rs; Protect=$mbi.Protect })
-  }
-  $addr = [IntPtr]([Int64]$addr + $rs)
-}
-[void][MemProbe]::CloseHandle($h)
-
-$total = ($regions | Measure-Object -Property Size -Sum).Sum
-"PID $ProcessId : committed-private regions = $($regions.Count), total = $([math]::Round($total/1GB,2)) GB"
-""
-"--- by protection flag ---"
-$regions | Group-Object Protect | Sort-Object { ($_.Group | Measure-Object Size -Sum).Sum } -Descending |
-  Select-Object @{n='Protect';e={'0x{0:X}' -f [int]$_.Name}}, Count,
-                @{n='TotalGB';e={[math]::Round((($_.Group|Measure-Object Size -Sum).Sum)/1GB,2)}} |
-  Format-Table -AutoSize
-
-"--- by region size bucket ---"
-$regions | Group-Object { [math]::Pow(2,[math]::Floor([math]::Log($_.Size,2))) } |
-  Sort-Object { ($_.Group | Measure-Object Size -Sum).Sum } -Descending |
-  Select-Object -First 12 @{n='BucketMB';e={[math]::Round([double]$_.Name/1MB,3)}}, Count,
-                @{n='TotalGB';e={[math]::Round((($_.Group|Measure-Object Size -Sum).Sum)/1GB,2)}} |
-  Format-Table -AutoSize
-
-"--- top 10 single regions ---"
-$regions | Sort-Object Size -Descending | Select-Object -First 10 @{n='Base';e={'0x{0:X}' -f [Int64]$_.Base}},
-  @{n='MB';e={[math]::Round($_.Size/1MB,1)}}, @{n='Protect';e={'0x{0:X}' -f [int]$_.Protect}} | Format-Table -AutoSize