@trim21/personal-pi-extensions 0.0.361 → 0.0.363

package/package.json

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

package/src/bwrap/core.ts

@@ -237,7 +237,14 @@ function killChild(child: ChildProcess): void {
   }
 }
 
-export function createBwrapBashOperations(resolved: ResolvedBwrap): BashOperations {
+/**
+ * @param workspace session 工作区：writablePaths 的 "." 与 PROTECTED_DIRS 都基于它解析，
+ *   与当次命令的 cwd（仅作为进程执行目录）解耦，避免 workdir 参数漂移可写边界。
+ */
+export function createBwrapBashOperations(
+  resolved: ResolvedBwrap,
+  workspace: string,
+): BashOperations {
   return {
     async exec(command, cwd, { onData, signal, timeout }) {
       await fsAccess(cwd, constants.F_OK).catch(() => {
@@ -250,7 +257,7 @@ export function createBwrapBashOperations(resolved: ResolvedBwrap): BashOperatio
         "--ro-bind",
         "/",
         "/",
-        ...buildBwrapArgs(resolved, cwd),
+        ...buildBwrapArgs(resolved, workspace),
         "--dev",
         "/dev",
         "--proc",

package/src/bwrap/runtime.ts

@@ -87,8 +87,8 @@ export interface BwrapExecutionRequest {
   timeout?: number;
   requestFullAccess?: boolean;
   requestFullAccessReason?: string;
-  /** bash 工具显式传入的 workdir 参数；存在时审批对话框显示实际执行目录。 */
-  workdir?: string;
+  /** 解析后的实际执行目录；缺省时与 ctx.cwd 相同。ctx.cwd 始终是 session 工作区。 */
+  cwd?: string;
   signal?: AbortSignal;
   onUpdate?: AgentToolUpdateCallback;
   ctx: ExtensionContext;
@@ -334,6 +334,10 @@ export class BwrapRuntime {
           "Install bubblewrap and restart the session, or pass --no-bwrap to disable the sandbox explicitly.",
       );
     }
+    // workspace 恒为 session 工作区；cwd 只是本次命令的进程执行目录，
+    // 二者解耦后 workdir 参数无法把沙箱可写边界带出工作区。
+    const workspace = request.ctx.cwd;
+    const execCwd = request.cwd ?? workspace;
     // 需要人工审批：非 Windows 仅 requestFullAccess；Windows 上默认所有命令
     // （allow-all 模式是显式 opt-out，仍直接执行）。
     const needsApproval = request.requestFullAccess === true || (isWindows && runtime.bwrapEnabled);
@@ -348,14 +352,14 @@ export class BwrapRuntime {
           request.ctx,
           request.command,
           request.requestFullAccessReason,
-          request.workdir,
+          execCwd,
         );
       }
     }
     const operations =
       isWindows || needsApproval || !runtime.bwrapEnabled
         ? createLocalBashOperations()
-        : createBwrapBashOperations(runtime);
+        : createBwrapBashOperations(runtime, workspace);
     const output = new BashOutput();
     const { onUpdate } = request;
 
@@ -391,7 +395,7 @@ export class BwrapRuntime {
 
     try {
       if (onUpdate) onUpdate({ content: [], details: undefined });
-      const { exitCode } = await operations.exec(request.command, request.ctx.cwd, {
+      const { exitCode } = await operations.exec(request.command, execCwd, {
         onData: (data) => {
           output.append(data);
           scheduleUpdate();
@@ -439,11 +443,11 @@ export class BwrapRuntime {
     ctx: ExtensionContext,
     command: string,
     reason: string | undefined,
-    workdir?: string,
+    execCwd: string,
   ): Promise<void> {
     const policy = resolveEscalation({ hasUI: ctx.hasUI });
     if (policy.kind === "deny") throw new Error(policy.reason);
-    const decision = await this.approveFullAccessUI(ctx, command, reason, workdir);
+    const decision = await this.approveFullAccessUI(ctx, command, reason, execCwd);
     // 关闭对话框 = 中断并拒绝，不循环重问
     if (decision === undefined) {
       ctx.abort();
@@ -490,7 +494,7 @@ export class BwrapRuntime {
     ctx: ExtensionContext,
     command: string,
     reason: string | undefined,
-    workdir?: string,
+    execCwd: string,
   ): Promise<FullAccessUIDecision | undefined> {
     // 弹框前解析命令的持久化规则（勾选的 pattern 会写入），在弹框里以
     // checkbox 列出：`echo 1 | head` → `echo *`、`head *`，逐项决定是否
@@ -529,9 +533,9 @@ export class BwrapRuntime {
       );
     }
     lines.push(fenceCodeBlock(command));
-    // workdir 存在时展示实际执行目录（ctx.cwd 已被 bash 工具解析为绝对路径）
-    if (workdir) {
-      lines.push(`Workdir: ${escapeHtml(ctx.cwd)}`);
+    // 执行目录与工作区不同时，提示实际执行目录（execCwd 是解析后的绝对路径）
+    if (execCwd !== ctx.cwd) {
+      lines.push(`Workdir: ${escapeHtml(execCwd)}`);
     }
     const description = lines.join("\n");
 

package/src/claude-code/shell.ts

@@ -121,13 +121,13 @@ export function registerShellTools(
       let result: Awaited<ReturnType<BwrapRuntime["execute"]>>;
       try {
         result = await runtime.execute({
-          ctx: { ...ctx, cwd },
+          ctx,
+          cwd,
           toolCallId: id,
           command: params.command,
           timeout: timeout / 1000,
           requestFullAccess: params.dangerouslyDisableSandbox,
           requestFullAccessReason: params.description,
-          workdir: params.workdir,
           signal,
           onUpdate,
         });

package/src/lib/lsp/client.ts

@@ -259,11 +259,8 @@ export async function create(input: CreateInput): Promise<LspClient> {
     (params: { uri: string; version?: number; diagnostics: Diagnostic[] }) => {
       const filePath = getFilePath(params.uri);
       if (!filePath) return;
-      // 支持 pull 诊断的服务器：push 的结果可能来自旧内容（异步重算迟到），
-      // 直接忽略，只信任 pull 返回的当前文档结果，从源头避免 stale。
-      if (supportsPullDiagnostics()) return;
-      // 纯 push 服务器：服务器版本滞后于已发送版本时，该 push 对应的是旧内容
-      // （重算未完成时的迟到结果），同样忽略。
+      // 服务器版本滞后于已发送版本时，该 push 对应的是旧内容（异步重算未完成
+      // 时的迟到结果）。忽略，避免与当前版本结果混淆。
       const currentVersion = documentVersions.get(filePath);
       const isStalePush =
         typeof params.version === "number" &&
@@ -461,15 +458,6 @@ export async function create(input: CreateInput): Promise<LspClient> {
     return { handled: true, matched, byFile, timedOut };
   }
 
-  /** 是否支持文档级 pull 诊断：静态 diagnosticProvider 或动态注册的 document 诊断。 */
-  function supportsPullDiagnostics(): boolean {
-    if (hasStaticPullDiagnostics) return true;
-    for (const registration of diagnosticRegistrations.values()) {
-      if (registration.registerOptions?.workspaceDiagnostics !== true) return true;
-    }
-    return false;
-  }
-
   function documentPullState() {
     const documentRegistrations = [...diagnosticRegistrations.values()].filter(
       (registration) => registration.registerOptions?.workspaceDiagnostics !== true,
@@ -478,7 +466,7 @@ export async function create(input: CreateInput): Promise<LspClient> {
       documentIdentifiers: [
         ...new Set(documentRegistrations.flatMap((r) => r.registerOptions?.identifier ?? [])),
       ],
-      supported: supportsPullDiagnostics(),
+      supported: hasStaticPullDiagnostics || documentRegistrations.length > 0,
     };
   }
 
@@ -634,18 +622,9 @@ export async function create(input: CreateInput): Promise<LspClient> {
     signal?: AbortSignal;
   }): Promise<void> {
     const startedAt = request.after ?? Date.now();
-    // 支持 pull 的服务器：push 已被忽略，pull 是唯一通道。正常返回但未拿到
-    // 当前文档结果时重试；请求超时（服务器未响应）则中断，避免阻塞编辑。
-    if (supportsPullDiagnostics()) {
-      while (!connectionClosed && !request.signal?.aborted) {
-        const result = await requestDocumentDiagnostics(request.path);
-        if (result.matched) return;
-        if (result.timedOut) return;
-        await sleep(PULL_RETRY_INTERVAL_MS);
-      }
-      return;
-    }
-
+    // pull 与 push 语义相同：都是等「当前文档版本」的诊断结果，统一一个循环。
+    // 先 pull（拿到即返回）；pull 超时说明服务器未响应，不再重试 pull，只等
+    // 版本匹配的 push 兜底；版本不匹配的 push 一律忽略（防迟到旧结果）。
     const pushWait = waitForFreshPush({
       path: request.path,
       version: request.version,
@@ -653,18 +632,23 @@ export async function create(input: CreateInput): Promise<LspClient> {
       timeout: diagnosticsDocumentWaitTimeoutMs,
     });
 
-    while (Date.now() - startedAt < diagnosticsDocumentWaitTimeoutMs) {
-      const result = await requestDocumentDiagnostics(request.path);
-      if (result.matched) return;
+    while (!connectionClosed && !request.signal?.aborted) {
       const remaining = diagnosticsDocumentWaitTimeoutMs - (Date.now() - startedAt);
       if (remaining <= 0) return;
+      const result = await requestDocumentDiagnostics(request.path);
+      if (result.matched) return;
+      if (result.timedOut) {
+        await pushWait;
+        return;
+      }
       const next = await Promise.race([
-        pushWait.then((ready) => (ready ? "push" : ("timeout" as const))),
+        pushWait.then((ready) => (ready ? ("push" as const) : ("timeout" as const))),
         waitForRegistrationChange(remaining).then((changed) =>
           changed ? ("registration" as const) : ("timeout" as const),
         ),
+        sleep(Math.min(remaining, PULL_RETRY_INTERVAL_MS)).then(() => "interval" as const),
       ]);
-      if (next !== "registration") return;
+      if (next === "push") return;
     }
   }
 
@@ -675,16 +659,6 @@ export async function create(input: CreateInput): Promise<LspClient> {
     signal?: AbortSignal;
   }): Promise<void> {
     const startedAt = request.after ?? Date.now();
-    if (supportsPullDiagnostics()) {
-      while (!connectionClosed && !request.signal?.aborted) {
-        const result = await requestFullDiagnostics(request.path);
-        if (result.handled || result.matched) return;
-        if (result.timedOut) return;
-        await sleep(PULL_RETRY_INTERVAL_MS);
-      }
-      return;
-    }
-
     const pushWait = waitForFreshPush({
       path: request.path,
       version: request.version,
@@ -692,18 +666,23 @@ export async function create(input: CreateInput): Promise<LspClient> {
       timeout: diagnosticsFullWaitTimeoutMs,
     });
 
-    while (Date.now() - startedAt < diagnosticsFullWaitTimeoutMs) {
-      const result = await requestFullDiagnostics(request.path);
-      if (result.handled || result.matched) return;
+    while (!connectionClosed && !request.signal?.aborted) {
       const remaining = diagnosticsFullWaitTimeoutMs - (Date.now() - startedAt);
       if (remaining <= 0) return;
+      const result = await requestFullDiagnostics(request.path);
+      if (result.handled || result.matched) return;
+      if (result.timedOut) {
+        await pushWait;
+        return;
+      }
       const next = await Promise.race([
-        pushWait.then((ready) => (ready ? "push" : ("timeout" as const))),
+        pushWait.then((ready) => (ready ? ("push" as const) : ("timeout" as const))),
         waitForRegistrationChange(remaining).then((changed) =>
           changed ? ("registration" as const) : ("timeout" as const),
         ),
+        sleep(Math.min(remaining, PULL_RETRY_INTERVAL_MS)).then(() => "interval" as const),
       ]);
-      if (next !== "registration") return;
+      if (next === "push") return;
     }
   }
 

package/src/opencode/bash.ts

@@ -67,12 +67,12 @@ export default function opencodeBash(
       let result: Awaited<ReturnType<BwrapRuntime["execute"]>>;
       try {
         result = await runtime.execute({
-          ctx: { ...ctx, cwd },
+          ctx,
+          cwd,
           toolCallId: id,
           command: params.command,
           timeout: timeout / 1000,
           requestFullAccess: params.dangerouslyDisableSandbox,
-          workdir: params.workdir,
           signal,
           onUpdate,
         });