pi-cc-extensions 0.1.1 → 0.1.2

package/README.md

@@ -18,6 +18,13 @@
 ## 截图
 
 <table>
+  <tr>
+    <td colspan="2" align="center">
+      <img src="./assets/readme/welcome.webp" width="100%" alt="Pi 的 Welcome 界面，展示 Tips、已加载上下文、扩展和最近会话">
+      <br>
+      <sub><b>Welcome 界面</b><br>启动时查看已加载上下文、扩展与最近会话</sub>
+    </td>
+  </tr>
   <tr>
     <td width="50%" align="center">
       <img src="./assets/readme/showcase.webp" width="100%" alt="Pi 终端中的 Claude Code 风格扩展界面，包含工具调用摘要、Diff 预览和 Powerline 状态栏">
@@ -86,7 +93,7 @@
 2. 从 `[Session] ...` 或 `[SubAgent] ...` 补全项中选择要引用的上下文。
 3. 提交时以 `@session:<session-id>` 引用其当前有效上下文。
 
-Session 模糊查询默认显示 3 个候选；若已加载 `pi-subagents`，也可直接引用现有 SubAgent。一次提示词可以引用多个 Session；扩展会自动去重，并限制注入规模以避免上下文无限膨胀。更多细节见 [`extensions/session-reference/README.md`](./extensions/session-reference/README.md)。
+Session 模糊查询默认显示 5 个候选；若已加载 `pi-subagents`，也可直接引用现有 SubAgent。一次提示词可以引用多个 Session；扩展会自动去重，并限制注入规模以避免上下文无限膨胀。更多细节见 [`extensions/session-reference/README.md`](./extensions/session-reference/README.md)。
 
 ## 安装
 
@@ -133,9 +140,23 @@ pi install /absolute/path/to/pi-cc-extensions
 - Node.js `>=22.19.0`
 - 作为 Pi package 加载，入口由根目录 `package.json` 的 `pi.extensions` 显式声明
 
-## 发布检查
+## 发布
+
+发布前检查：
 
 ```bash
 npm test
 npm pack --dry-run
 ```
+
+使用 npm 发布。未指定 tag 时使用 `latest`：
+
+```bash
+npm run release
+npm run release -- --tag next
+npm run release -- --tag beta
+```
+
+## 致谢
+
+本项目中的 Powerline 状态栏、Welcome 界面、Working Vibes 等功能基于 [nicobailon/pi-powerline-footer](https://github.com/nicobailon/pi-powerline-footer) 二次开发，感谢原作者的开源贡献。

package/extensions/ccstyle-powerline/git-status.ts

@@ -5,6 +5,8 @@ interface CachedGitStatus {
   staged: number;
   unstaged: number;
   untracked: number;
+  added: number;
+  deleted: number;
   timestamp: number;
 }
 
@@ -19,19 +21,25 @@ const CACHE_TTL_MS = 1000; // 1 second for file status
 const BRANCH_TTL_MS = 500; // Shorter TTL so branch updates quickly after invalidation
 let cachedStatus: CachedGitStatus | null = null;
 let cachedBranch: CachedBranch | null = null;
+let statusCwd: string | null = null;
+let branchCwd: string | null = null;
 let pendingFetch: Promise<void> | null = null;
 let pendingBranchFetch: Promise<void> | null = null;
+let fetchCwd: string | null = null;
+let branchFetchCwd: string | null = null;
 let invalidationCounter = 0; // Track invalidations to prevent stale updates
 let branchInvalidationCounter = 0;
 
 /**
- * Parse git status --porcelain output
- * 
+ * Parse git status --porcelain output.
+ *
  * Format: XY filename
  * X = index status, Y = working tree status
  * ?? = untracked
- * Other X values = staged
- * Other Y values = unstaged
+ *
+ * Each file is counted exactly once:
+ * - Y ≠ ' ' → unstaged (working tree has changes; if X also shows staged, Y wins)
+ * - X ≠ ' ' && X ≠ '?' → staged only (index has changes, working tree is clean)
  */
 function parseGitStatusOutput(output: string): { staged: number; unstaged: number; untracked: number } {
   let staged = 0;
@@ -48,24 +56,24 @@ function parseGitStatusOutput(output: string): { staged: number; unstaged: numbe
       continue;
     }
 
-    // X position (index/staged)
-    if (x && x !== " " && x !== "?") {
-      staged++;
-    }
-
-    // Y position (working tree/unstaged)
+    // Y position (working tree) takes priority — if the file has working-tree
+    // changes at all, count it as unstaged.
     if (y && y !== " ") {
       unstaged++;
+    } else if (x && x !== " " && x !== "?") {
+      // X position (index) only counted when working tree is clean.
+      staged++;
     }
   }
 
   return { staged, unstaged, untracked };
 }
 
-function runGit(args: string[], timeoutMs = 200): Promise<string | null> {
+function runGit(args: string[], cwd: string, timeoutMs = 200): Promise<string | null> {
   return new Promise((resolve) => {
     const proc = spawn("git", args, {
       stdio: ["ignore", "pipe", "pipe"],
+      cwd,
     });
 
     let stdout = "";
@@ -83,7 +91,7 @@ function runGit(args: string[], timeoutMs = 200): Promise<string | null> {
     });
 
     proc.on("close", (code) => {
-      finish(code === 0 ? stdout.trim() : null);
+      finish(code === 0 ? stdout.replace(/\n+$/, "") : null);
     });
 
     proc.on("error", () => {
@@ -101,31 +109,50 @@ function runGit(args: string[], timeoutMs = 200): Promise<string | null> {
  * Fetch current git branch asynchronously.
  * For detached HEAD, returns the short commit SHA (matches provider's "detached" behavior).
  */
-async function fetchGitBranch(): Promise<string | null> {
-  const branch = await runGit(["branch", "--show-current"]);
+async function fetchGitBranch(cwd: string): Promise<string | null> {
+  const branch = await runGit(["branch", "--show-current"], cwd);
   if (branch === null) return null;
   if (branch) return branch;
 
-  const sha = await runGit(["rev-parse", "--short", "HEAD"]);
+  const sha = await runGit(["rev-parse", "--short", "HEAD"], cwd);
   return sha ? `${sha} (detached)` : "detached";
 }
 
 /**
- * Fetch git status asynchronously
+ * Parse git diff --shortstat HEAD output.
+ * Format: " N files changed, M insertions(+), K deletions(-)"
+ */
+function parseDiffStat(output: string): { added: number; deleted: number } {
+  const added = (output.match(/(\d+) insertion/) ?? [])[1];
+  const deleted = (output.match(/(\d+) deletion/) ?? [])[1];
+  return {
+    added: added ? Number(added) : 0,
+    deleted: deleted ? Number(deleted) : 0,
+  };
+}
+
+/**
+ * Fetch line-level diff stats (additions / deletions) from HEAD.
  */
-async function fetchGitStatus(): Promise<{ staged: number; unstaged: number; untracked: number } | null> {
-  const output = await runGit(["status", "--porcelain"], 500);
+async function fetchDiffStat(cwd: string): Promise<{ added: number; deleted: number } | null> {
+  const output = await runGit(["diff", "--shortstat", "HEAD"], cwd, 1000);
   if (output === null) return null;
-  return parseGitStatusOutput(output);
+  return parseDiffStat(output);
 }
 
 /**
  * Get the current git branch with caching.
  * Falls back to provider branch if our cache is empty.
  */
-export function getCurrentBranch(providerBranch: string | null): string | null {
+export function getCurrentBranch(providerBranch: string | null, cwd: string): string | null {
   const now = Date.now();
 
+  // Invalidate cache if cwd changed (different repo)
+  if (branchCwd !== cwd) {
+    cachedBranch = null;
+    branchCwd = cwd;
+  }
+
   // Return cached if fresh
   if (cachedBranch && now - cachedBranch.timestamp < BRANCH_TTL_MS) {
     return cachedBranch.branch;
@@ -134,9 +161,10 @@ export function getCurrentBranch(providerBranch: string | null): string | null {
   // Trigger background fetch if not already pending
   if (!pendingBranchFetch) {
     const fetchId = branchInvalidationCounter;
-    pendingBranchFetch = fetchGitBranch().then((result) => {
-      // Cache result if no invalidation happened (including null for non-git dirs)
-      if (fetchId === branchInvalidationCounter) {
+    branchFetchCwd = cwd;
+    pendingBranchFetch = fetchGitBranch(cwd).then((result) => {
+      // Cache result if no invalidation happened AND cwd hasn't changed
+      if (fetchId === branchInvalidationCounter && branchFetchCwd === cwd) {
         cachedBranch = {
           branch: result,
           timestamp: Date.now(),
@@ -156,12 +184,18 @@ export function getCurrentBranch(providerBranch: string | null): string | null {
  * This is designed for synchronous render() calls - returns last known value
  * while refreshing in background.
  */
-export function getGitStatus(providerBranch: string | null, pollingMode: GitPollingMode = "full"): GitStatus {
+export function getGitStatus(providerBranch: string | null, cwd: string, pollingMode: GitPollingMode = "full"): GitStatus {
   const now = Date.now();
-  const branch = pollingMode === "off" ? providerBranch : getCurrentBranch(providerBranch);
+  const branch = pollingMode === "off" ? providerBranch : getCurrentBranch(providerBranch, cwd);
 
   if (pollingMode !== "full") {
-    return { branch, staged: 0, unstaged: 0, untracked: 0 };
+    return { branch, staged: 0, unstaged: 0, untracked: 0, added: 0, deleted: 0 };
+  }
+
+  // Invalidate cache if cwd changed (different repo)
+  if (statusCwd !== cwd) {
+    cachedStatus = null;
+    statusCwd = cwd;
   }
 
   // Return cached if fresh
@@ -171,18 +205,38 @@ export function getGitStatus(providerBranch: string | null, pollingMode: GitPoll
       staged: cachedStatus.staged,
       unstaged: cachedStatus.unstaged,
       untracked: cachedStatus.untracked,
+      added: cachedStatus.added,
+      deleted: cachedStatus.deleted,
     };
   }
 
   // Trigger background fetch if not already pending
   if (!pendingFetch) {
     const fetchId = invalidationCounter; // Capture current counter
-    pendingFetch = fetchGitStatus().then((result) => {
-      // Cache result if no invalidation happened (including null for non-git dirs)
-      if (fetchId === invalidationCounter) {
-        cachedStatus = result
-          ? { staged: result.staged, unstaged: result.unstaged, untracked: result.untracked, timestamp: Date.now() }
-          : { staged: 0, unstaged: 0, untracked: 0, timestamp: Date.now() };
+    fetchCwd = cwd;
+    pendingFetch = Promise.all([
+      fetchGitStatus(cwd),
+      fetchDiffStat(cwd),
+    ]).then(([statusResult, diffResult]) => {
+      // Cache result if no invalidation happened AND cwd hasn't changed
+      if (fetchId === invalidationCounter && fetchCwd === cwd) {
+        cachedStatus = statusResult
+          ? {
+              staged: statusResult.staged,
+              unstaged: statusResult.unstaged,
+              untracked: statusResult.untracked,
+              added: diffResult?.added ?? 0,
+              deleted: diffResult?.deleted ?? 0,
+              timestamp: Date.now(),
+            }
+          : {
+              staged: 0,
+              unstaged: 0,
+              untracked: 0,
+              added: 0,
+              deleted: 0,
+              timestamp: Date.now(),
+            };
       }
       pendingFetch = null;
     });
@@ -195,10 +249,12 @@ export function getGitStatus(providerBranch: string | null, pollingMode: GitPoll
       staged: cachedStatus.staged,
       unstaged: cachedStatus.unstaged,
       untracked: cachedStatus.untracked,
+      added: cachedStatus.added,
+      deleted: cachedStatus.deleted,
     };
   }
 
-  return { branch, staged: 0, unstaged: 0, untracked: 0 };
+  return { branch, staged: 0, unstaged: 0, untracked: 0, added: 0, deleted: 0 };
 }
 
 /**

package/extensions/ccstyle-powerline/powerline.ts

@@ -2181,7 +2181,7 @@ export default function powerlineFooter(pi: ExtensionAPI): PowerlineController {
 
     // Get git status (cached)
     const gitBranch = footerDataRef?.getGitBranch() ?? null;
-    const gitStatus = getGitStatus(gitBranch, segmentOptions.git?.polling);
+    const gitStatus = getGitStatus(gitBranch, ctx.cwd, segmentOptions.git?.polling);
     const extensionStatuses = footerDataRef?.getExtensionStatuses() ?? new Map();
     const customItemsById = new Map(config.customItems.map((item) => [item.id, item]));
     const hiddenExtensionStatusKeys = collectHiddenExtensionStatusKeys(config.customItems);

package/extensions/ccstyle-powerline/presets.ts

@@ -31,7 +31,7 @@ export const PRESETS: Record<StatusLinePreset, PresetDef> = {
     segmentOptions: {
       model: { showThinkingLevel: false },
       path: { mode: "basename" },
-      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true },
+      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true, showLines: true },
     },
   },
 
@@ -42,7 +42,7 @@ export const PRESETS: Record<StatusLinePreset, PresetDef> = {
     colors: MINIMAL_COLORS,
     segmentOptions: {
       path: { mode: "basename" },
-      git: { showBranch: true, showStaged: false, showUnstaged: false, showUntracked: false },
+      git: { showBranch: true, showStaged: false, showUnstaged: false, showUntracked: false, showLines: false },
     },
   },
 
@@ -53,7 +53,7 @@ export const PRESETS: Record<StatusLinePreset, PresetDef> = {
     colors: DEFAULT_COLORS,
     segmentOptions: {
       model: { showThinkingLevel: true },
-      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: false },
+      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: false, showLines: true },
     },
   },
 
@@ -65,7 +65,7 @@ export const PRESETS: Record<StatusLinePreset, PresetDef> = {
     segmentOptions: {
       model: { showThinkingLevel: false },
       path: { mode: "abbreviated", maxLength: 50 },
-      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true },
+      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true, showLines: true },
       time: { format: "24h", showSeconds: false },
     },
   },
@@ -78,7 +78,7 @@ export const PRESETS: Record<StatusLinePreset, PresetDef> = {
     segmentOptions: {
       model: { showThinkingLevel: false },
       path: { mode: "abbreviated", maxLength: 60 },
-      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true },
+      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true, showLines: true },
       time: { format: "24h", showSeconds: true },
     },
   },
@@ -91,7 +91,7 @@ export const PRESETS: Record<StatusLinePreset, PresetDef> = {
     segmentOptions: {
       model: { showThinkingLevel: true },
       path: { mode: "abbreviated", maxLength: 40 },
-      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true },
+      git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: true, showLines: false },
     },
   },
 
@@ -100,7 +100,7 @@ export const PRESETS: Record<StatusLinePreset, PresetDef> = {
     rightSegments: ["token_total", "cost", "context_pct"],
     separator: "pipe",
     colors: DEFAULT_COLORS,
-    segmentOptions: {},
+    segmentOptions: {
   },
 };
 

package/extensions/ccstyle-powerline/segments.ts

@@ -130,7 +130,7 @@ const gitSegment: StatusLineSegment = {
   render(ctx) {
     const icons = getIcons();
     const opts = ctx.options.git ?? {};
-    const { branch, staged, unstaged, untracked } = ctx.git;
+    const { branch, staged, unstaged, untracked, added, deleted } = ctx.git;
     const gitStatus = (staged > 0 || unstaged > 0 || untracked > 0) 
       ? { staged, unstaged, untracked } 
       : null;
@@ -169,6 +169,16 @@ const gitSegment: StatusLineSegment = {
           content += content ? ` ${indicatorText}` : indicatorText;
         }
       }
+
+      // Line-change indicators (added / deleted)
+      if (opts.showLines && (added > 0 || deleted > 0)) {
+        const lineParts: string[] = [];
+        if (added > 0) lineParts.push(applyColor(ctx.theme, "success", `+${added}`));
+        if (deleted > 0) lineParts.push(applyColor(ctx.theme, "error", `-${deleted}`));
+        if (lineParts.length > 0) {
+          content += ` ${lineParts.join(" ")}`;
+        }
+      }
     }
 
     if (!content) return { content: "", visible: false };

package/extensions/ccstyle-powerline/types.ts

@@ -90,6 +90,7 @@ export interface StatusLineSegmentOptions {
     showStaged?: boolean;
     showUnstaged?: boolean;
     showUntracked?: boolean;
+    showLines?: boolean;
     polling?: "full" | "branch" | "off";
   };
   time?: { format?: "12h" | "24h"; showSeconds?: boolean };
@@ -136,6 +137,8 @@ export interface GitStatus {
   staged: number;
   unstaged: number;
   untracked: number;
+  added: number;
+  deleted: number;
 }
 
 // Usage statistics

package/extensions/claude-code-style.ts

@@ -837,6 +837,25 @@ export default function (pi: ExtensionAPI) {
 
 	pi.registerCommand("ccstyle", {
 		description: "Configure Claude Code style and Powerline preset",
+		getArgumentCompletions: (prefix) => {
+			const topLevel = [
+				{ value: "on", label: "on", description: "Enable Claude Code style" },
+				{ value: "off", label: "off", description: "Disable Claude Code style" },
+				{ value: "status", label: "status", description: "Show current toggle and mode" },
+				{ value: "minimal", label: "minimal", description: "Hide most tool output in collapsed view" },
+				{ value: "compact", label: "compact", description: "Show short summaries in collapsed view" },
+				{ value: "powerline", label: "powerline", description: "Set Powerline preset (e.g. powerline compact)" },
+			];
+			// If the user typed "powerline " — suggest available presets
+			const match = prefix.match(/^powerline\s+/i);
+			if (match) {
+				const after = prefix.slice(match[0].length);
+				return powerline.getPresets()
+					.filter((p) => p.startsWith(after))
+					.map((p) => ({ value: `powerline ${p}`, label: p, description: `Powerline preset: ${p}` }));
+			}
+			return topLevel.filter((item) => item.value.startsWith(prefix));
+		},
 		handler: async (args, ctx) => {
 			const arg = args.trim().toLowerCase();
 			const parts = arg.split(/\s+/).filter(Boolean);

package/extensions/session-reference/README.md

@@ -11,7 +11,7 @@
 ## 行为
 
 - 搜索全部 pi 历史 Session；当前 Workspace 的 Session 优先。
-- Session 模糊查询默认最多显示 3 个候选。
+- Session 模糊查询默认最多显示 5 个候选。
 - 与 pi 原有 `@` 文件补全并存。
 - 若已加载 `pi-subagents`，`@` 补全会同时显示现有 SubAgent，并引用其当前有效上下文。
 - 支持一个 prompt 引用多个 Session，并自动去重；单次最多注入前 5 个。

package/extensions/session-reference/index.ts

@@ -22,12 +22,25 @@ import {
 	type ReferenceSource,
 } from "./core.ts";
 
-const MAX_SESSION_SUGGESTIONS = 3;
+const MAX_SESSION_SUGGESTIONS = 5;
 const MAX_FILE_SUGGESTIONS = 10;
 const MAX_REFERENCED_SESSIONS = 5;
 const MENTION_PATTERN = /(?:^|[\t ])@([^\s@]*)$/;
 const SUBAGENT_MANAGER_KEY = Symbol.for("pi-subagents:manager");
 
+// ── In-process subagent record tracker ──────────────────────────────
+// pi-subagents does not expose a global manager; we track records
+// ourselves by listening to the events it emits.
+
+type SubagentLiveRecord = {
+	runId: string;
+	sessionId: string;
+	agent: string;
+	cwd: string;
+	startedAt: number;
+	completedAt?: number;
+};
+
 type ReferenceDetails = {
 	sessions: Array<{ id: string; title: string; cwd: string }>;
 };
@@ -40,27 +53,72 @@ type SessionReference = {
 	messages?: unknown[];
 };
 
-type LiveSubagentSession = {
-	sessionManager: {
-		getSessionId(): string;
-		getCwd(): string;
-		buildSessionContext(): { messages: unknown[] };
-	};
-	sessionName?: string;
-};
-
 type SubagentRecord = {
 	id: string;
 	description?: string;
 	startedAt?: number;
 	completedAt?: number;
-	session?: LiveSubagentSession;
 };
 
 type SubagentManager = {
 	getRecord(id: string): SubagentRecord | undefined;
 };
 
+// Local subagent record tracking (pi-subagents does not expose a global manager).
+const liveSubagentRecords = new Map<string, SubagentLiveRecord>();
+
+function trackSubagentFromEvent(data: unknown): void {
+	if (!data || typeof data !== "object") return;
+	const event = data as Record<string, unknown>;
+	// subagent:async-started payload has "id" as the run ID
+	// subagent:async-complete payload has "runId" as the run ID
+	const runId = (typeof event.id === "string" ? event.id : undefined)
+		?? (typeof event.runId === "string" ? event.runId : undefined);
+	if (!runId) return;
+	const sessionId = typeof event.sessionId === "string" ? event.sessionId : undefined;
+	if (!sessionId) return;
+
+	const existing = liveSubagentRecords.get(runId);
+	if (existing) {
+		// Completion event — mark completedAt
+		if (typeof event.endedAt === "number" || typeof event.lastUpdate === "number") {
+			existing.completedAt = (typeof event.endedAt === "number" ? event.endedAt : event.lastUpdate) as number;
+		}
+		return;
+	}
+	// Started event — create new record
+	const agent = typeof event.agent === "string" ? event.agent : "";
+	const cwd = typeof event.cwd === "string" ? event.cwd : "";
+	const startedAt = typeof event.startedAt === "number" ? event.startedAt as number : Date.now();
+	liveSubagentRecords.set(runId, {
+		runId,
+		sessionId,
+		agent,
+		cwd,
+		startedAt,
+	});
+}
+
+function getSubagentManager(): SubagentManager | undefined {
+	// Try the global manager first (future-proof), fall back to local records.
+	const manager = (globalThis as any)[SUBAGENT_MANAGER_KEY] as SubagentManager | undefined;
+	if (manager && typeof manager.getRecord === "function") return manager;
+	// If no global manager, use our local tracking.
+	if (liveSubagentRecords.size === 0) return undefined;
+	return {
+		getRecord(id: string): SubagentRecord | undefined {
+			const record = liveSubagentRecords.get(id);
+			if (!record) return undefined;
+			return {
+				id: record.runId,
+				description: record.agent || undefined,
+				startedAt: record.startedAt,
+				completedAt: record.completedAt,
+			};
+		},
+	};
+}
+
 function extractMentionQuery(textBeforeCursor: string): string | undefined {
 	return textBeforeCursor.match(MENTION_PATTERN)?.[1];
 }
@@ -108,67 +166,34 @@ function filterSessions(references: SessionReference[], query: string, currentCw
 	return matches.slice(0, MAX_SESSION_SUGGESTIONS).map((reference) => sessionItem(reference, currentCwd));
 }
 
-function getSubagentManager(): SubagentManager | undefined {
-	const manager = (globalThis as any)[SUBAGENT_MANAGER_KEY] as SubagentManager | undefined;
-	return manager && typeof manager.getRecord === "function" ? manager : undefined;
-}
-
-function textFromMessage(message: unknown): string {
-	if (!message || typeof message !== "object") return "";
-	const value = message as Record<string, unknown>;
-	if (typeof value.content === "string") return value.content;
-	if (!Array.isArray(value.content)) return "";
-	return value.content
-		.filter((part): part is Record<string, unknown> => Boolean(part) && typeof part === "object")
-		.filter((part) => part.type === "text" && typeof part.text === "string")
-		.map((part) => part.text as string)
-		.join("\n");
-}
-
-function firstUserMessage(messages: unknown[]): string {
-	for (const message of messages) {
-		if (!message || typeof message !== "object") continue;
-		const role = (message as Record<string, unknown>).role;
-		if (role !== "user") continue;
-		const text = textFromMessage(message).trim();
-		if (text) return text;
-	}
-	return "(no messages)";
-}
-
-function liveSubagentReferences(agentIds: Set<string>, currentSessionId: string): SessionReference[] {
+function filterSessions(agentIds: Set<string>, currentSessionId: string): SessionReference[] {
 	const manager = getSubagentManager();
 	if (!manager) return [];
 
 	const references: SessionReference[] = [];
 	for (const agentId of agentIds) {
 		const record = manager.getRecord(agentId);
-		const session = record?.session;
-		if (!session) continue;
-
-		try {
-			const sessionManager = session.sessionManager;
-			const sessionId = sessionManager.getSessionId();
-			if (!sessionId || sessionId === currentSessionId) continue;
-			const messages = sessionManager.buildSessionContext().messages;
-			const name = record.description?.trim() || session.sessionName?.trim();
-			const modifiedAt = record.completedAt ?? record.startedAt ?? Date.now();
-			references.push({
-				kind: "subagent",
-				referenceIds: [sessionId, agentId],
-				info: {
-					id: sessionId,
-					name,
-					cwd: sessionManager.getCwd(),
-					firstMessage: firstUserMessage(messages),
-					messageCount: messages.length,
-					modified: new Date(modifiedAt),
-				},
-				messages,
-			});
-		} catch {
-			// A subagent can finish or be disposed while the suggestion list is loading.
-		}
+		if (!record) continue;
+
+		// Try the global manager's live session first (future-proof).
+		const liveRecord = liveSubagentRecords.get(agentId);
+		const sessionId = liveRecord?.sessionId ?? record.id;
+		if (!sessionId || sessionId === currentSessionId) continue;
+
+		const name = record.description?.trim() || liveRecord?.agent || undefined;
+		const modifiedAt = record.completedAt ?? record.startedAt ?? Date.now();
+		references.push({
+			kind: "subagent",
+			referenceIds: [sessionId, agentId],
+			info: {
+				id: sessionId,
+				name,
+				cwd: liveRecord?.cwd ?? "",
+				firstMessage: "",
+				messageCount: 0,
+				modified: new Date(modifiedAt),
+			},
+		});
 	}
 	return references;
 }
@@ -239,11 +264,18 @@ function samePath(left: string | undefined, right: string): boolean {
 export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 	let getAvailableReferences: (() => Promise<SessionReference[]>) | undefined;
 	const subagentIds = new Set<string>();
-	const unsubscribeSubagentEvents = ["subagents:created", "subagents:started", "subagents:completed", "subagents:failed"].map(
+	// pi-subagents emits "subagent:async-started" and "subagent:async-complete" events.
+	// We track records locally so @[SubAgent] suggestions work even without a global manager.
+	const subagentEventNames = ["subagent:async-started", "subagent:async-complete"];
+	const unsubscribeSubagentEvents = subagentEventNames.map(
 		(eventName) =>
 			pi.events.on(eventName, (data) => {
+				trackSubagentFromEvent(data);
 				if (!data || typeof data !== "object") return;
-				const id = (data as Record<string, unknown>).id;
+				const payload = data as Record<string, unknown>;
+				// subagent:async-started uses "id", subagent:async-complete uses "runId"
+				const id = (typeof payload.id === "string" ? payload.id : undefined)
+					?? (typeof payload.runId === "string" ? payload.runId : undefined);
 				if (typeof id === "string" && id) subagentIds.add(id);
 			}),
 	);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cc-extensions",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Personal extensions for the Pi coding agent",
   "type": "module",
   "keywords": [
@@ -20,7 +20,9 @@
     ]
   },
   "scripts": {
-    "test": "node --test extensions/session-reference/core.test.ts"
+    "test": "node --test extensions/session-reference/core.test.ts",
+    "prepublishOnly": "npm test",
+    "release": "npm publish"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",