@trim21/personal-pi-extensions 0.1.527 → 0.1.529

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.527",
+  "version": "0.1.529",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/bwrap/core.ts

@@ -2,6 +2,7 @@ import { type ChildProcess, spawn } from "node:child_process";
 import { constants, type Dirent, existsSync, readFileSync } from "node:fs";
 import { access as fsAccess, readdir, realpath, stat } from "node:fs/promises";
 import { delimiter, join } from "node:path";
+import process from "node:process";
 import { fileURLToPath } from "node:url";
 
 import { StringEnum } from "@earendil-works/pi-ai";
@@ -353,6 +354,15 @@ async function realpathOrSelf(path: string): Promise<string> {
 
 export async function buildBwrapArgs(resolved: ResolvedBwrap, cwd: string): Promise<string[]> {
   const args = ["--new-session", "--die-with-parent", "--unshare-user", "--unshare-pid"];
+  // 沙箱进程以调用方（pi）的 uid/gid 运行，而不是 userns 里的 0。
+  // net-allowlist 模式下命令先经 nsenter 进入 holder 的 userns（unshare -r 把 pi 的 uid 映射成 0），
+  // bwrap 默认继承该 uid 会让沙箱内 id/stat 自称 root、与宿主视角不一致；
+  // 直接模式（无 holder）下这两个值本就等于 bwrap 的 real uid，等价于默认行为。
+  const uid = process.getuid?.();
+  const gid = process.getgid?.();
+  if (uid !== undefined && gid !== undefined) {
+    args.push("--uid", String(uid), "--gid", String(gid));
+  }
   // --*-bind-try：配置的路径不存在时忽略该项而不是让整条命令失败
   for (const path of resolved.writablePaths) {
     const absolutePath = await realpathOrSelf(resolveBwrapPath(path, cwd));

package/src/spawn-agent.ts

@@ -15,9 +15,11 @@
  * `text: <content>` lines for completed text blocks, keeping the last
  * `MAX_PROGRESS_LINES` lines. Consecutive tool calls are merged into a
  * single `tool:` line (`read x 2, glob`) and over-long line content is
- * folded to the first/last 7 chars joined by `…`, so a burst of tool calls
+ * folded to the first/last 9 chars joined by `…`, so a burst of tool calls
  * or a long text block does not flood the window; any text block starts a
- * new line.
+ * new line. The final line is always the subagent name as a code span
+ * (`` `scout` ``), followed by the live usage stats when there are any; it
+ * rides outside the rolling window so it is never trimmed.
  *
  * Security default: without an explicit `tools:` in the frontmatter, the
  * subagent only gets read-only tools (read/grep/find/ls) — no bash/write/edit.
@@ -396,12 +398,13 @@ export async function runAgent(
   };
 
   const emitUpdate = () => {
-    // Usage line rides on the last row so the TUI always shows live token
-    // cost; it lives outside the rolling window so it is never trimmed.
+    // 最后一行固定是「子代理名 + 运行中统计」：名字用 code span 标出，进度流里
+    // 一眼能看出属于哪个 subagent；usage 与它同行，TUI 始终能看到实时 token 开销。
+    // 这行位于滚动窗口之外，因此永远不会被挤掉。
     const usageLine = formatUsageStats(result.usage, result.model);
-    const lines = usageLine ? [...logLines, usageLine] : logLines;
+    const footer = usageLine ? `\`${result.agent}\` ${usageLine}` : `\`${result.agent}\``;
     onUpdate?.({
-      content: [{ type: "text", text: lines.join("\n") || "(running...)" }],
+      content: [{ type: "text", text: [...logLines, footer].join("\n") }],
       details: { ...result },
     });
   };