pi-landstrip 0.16.4 → 0.16.6

package/index.ts

@@ -572,8 +572,9 @@ function notify(ctx: ExtensionContext, message: string, level: NotificationLevel
 }
 
 function hasTuiStatus(ctx: ExtensionContext): boolean {
-  const { mode } = ctx as ExtensionContext & { mode?: string };
-  return mode === undefined ? ctx.hasUI : mode === 'tui';
+  if (!ctx.hasUI) return false;
+  const mode = 'mode' in ctx ? (ctx as Record<string, unknown>).mode : undefined;
+  return mode === undefined || mode === 'tui';
 }
 
 function setTuiStatus(ctx: ExtensionContext, key: string, value: string | undefined): void {
@@ -862,9 +863,9 @@ type LandstripBashTool = ReturnType<typeof createBashToolDefinition>;
 /** Options for creating a landstrip sandbox integration. */
 export interface LandstripIntegrationOptions {
   /** Register a sandboxed bash tool when the integration is registered. */
-  registerBashTool?: boolean;
+  readonly registerBashTool?: boolean;
   /** Working directory used when registering the default bash tool. */
-  cwd?: string;
+  readonly cwd?: string;
 }
 
 /** Landstrip sandbox integration hooks for Pi. */
@@ -1158,13 +1159,17 @@ export function createLandstripIntegration(
       server.on('error', reject);
       let client: NetSocket | null = null;
       server.on('connection', (serverEnd) => {
+        server.removeListener('error', reject);
         server.close();
         try {
           rmSync(sockPath, { force: true });
         } catch {
           /* ok */
         }
-        if (client) resolve([client, serverEnd]);
+        if (client) {
+          client.removeListener('error', reject);
+          resolve([client, serverEnd]);
+        }
       });
       server.listen(sockPath, () => {
         client = new NetSocket();
@@ -1218,7 +1223,7 @@ export function createLandstripIntegration(
             childEnd.destroy();
 
             function killChild(): void {
-              if (!child.pid) return;
+              if (child.pid === undefined) return;
               try {
                 process.kill(-child.pid, 'SIGKILL');
               } catch {
@@ -1247,9 +1252,114 @@ export function createLandstripIntegration(
               callbacks.onStderr?.(data);
               onData(data);
             });
+            let trapBuffer = '';
+            let queryChain: Promise<void> = Promise.resolve();
+
+            const respondQuery = (queryId: number, action: 'allow' | 'deny'): void => {
+              if (trapSocket.destroyed) return;
+              trapSocket.write(JSON.stringify({ query_id: queryId, action }) + '\n');
+            };
+
+            // Surface a denial through the error-fd accumulator so the post-close
+            // notify and the runBashWithOptionalRetry prompt/retry paths still work.
+            const appendErrorLine = (line: string): void => {
+              const infoLine = line + '\n';
+              errorFdAcc += infoLine;
+              callbacks.onErrorFd?.(Buffer.from(infoLine, 'utf8'));
+            };
+
+            // Answer a landstrip query (state:"query"). The broker suspends the
+            // child's syscall until we respond allow/deny on the trap socket.
+            const handleQuery = (
+              queryId: number,
+              operation: LandstripOperation,
+              rawPath: string,
+              rawLine: string,
+            ): void => {
+              const path = normalizeBlockedPath(rawPath, cwd);
+              const config = loadConfig(cwd);
+              const isAllowed = (cfg: SandboxConfig): boolean =>
+                operation === 'read'
+                  ? !matchesPattern(path, cfg.filesystem.denyRead) &&
+                    matchesPattern(path, getEffectiveAllowRead(cfg))
+                  : !matchesPattern(path, cfg.filesystem.denyWrite) &&
+                    !shouldPromptForWrite(path, getEffectiveAllowWrite(cfg));
+
+              if (isAllowed(config)) {
+                respondQuery(queryId, 'allow');
+                return;
+              }
+              // Without an interactive prompt, deny and let the retry path grant.
+              if (!ctx.hasUI || !callbacks.promptOnBlock) {
+                appendErrorLine(rawLine);
+                respondQuery(queryId, 'deny');
+                return;
+              }
+              // denyWrite is a hard block: never prompt to override it.
+              if (operation === 'write' && matchesPattern(path, config.filesystem.denyWrite)) {
+                respondQuery(queryId, 'deny');
+                return;
+              }
+              // Serialize prompts so concurrent queries never overlap on screen and
+              // a path granted by one prompt auto-allows later queries for it.
+              queryChain = queryChain
+                .then(async () => {
+                  const cfg = loadConfig(cwd);
+                  if (isAllowed(cfg)) {
+                    respondQuery(queryId, 'allow');
+                    return;
+                  }
+                  const choice =
+                    operation === 'read'
+                      ? await promptReadBlock(
+                          ctx,
+                          path,
+                          matchesPattern(path, cfg.filesystem.denyRead)
+                            ? 'granting allowRead will override it'
+                            : undefined,
+                        )
+                      : await promptWriteBlock(ctx, path);
+                  if (choice === 'abort') {
+                    respondQuery(queryId, 'deny');
+                    return;
+                  }
+                  if (operation === 'read') await applyReadChoice(choice, path, cwd);
+                  else await applyWriteChoice(choice, path, cwd);
+                  respondQuery(queryId, 'allow');
+                })
+                .catch(() => respondQuery(queryId, 'deny'));
+            };
+
             trapSocket.on('data', (data: Buffer) => {
-              errorFdAcc += data.toString('utf8');
-              callbacks.onErrorFd?.(data);
+              trapBuffer += data.toString('utf8');
+              let nl = trapBuffer.indexOf('\n');
+              while (nl !== -1) {
+                const line = trapBuffer.slice(0, nl);
+                trapBuffer = trapBuffer.slice(nl + 1);
+                nl = trapBuffer.indexOf('\n');
+                if (line.length === 0) continue;
+                let obj: Record<string, unknown> | null = null;
+                try {
+                  const parsed: unknown = JSON.parse(line);
+                  if (typeof parsed === 'object' && parsed !== null) {
+                    obj = parsed as Record<string, unknown>;
+                  }
+                } catch {
+                  obj = null;
+                }
+                if (
+                  obj &&
+                  obj.state === 'query' &&
+                  typeof obj.query_id === 'number' &&
+                  (obj.operation === 'read' || obj.operation === 'write') &&
+                  typeof obj.path === 'string'
+                ) {
+                  handleQuery(obj.query_id, obj.operation, obj.path, line);
+                } else {
+                  // Informational trap (network denials, etc.): keep for post-close handling.
+                  appendErrorLine(line);
+                }
+              }
             });
 
             child.on('error', (error) => {
@@ -1271,39 +1381,12 @@ export function createLandstripIntegration(
 
                 const errorOutput = errorFdAcc || stderrAcc;
 
+                // Filesystem denials are now answered live during execution; only
+                // informational traps (network, etc.) remain to surface here.
                 const blockedPath =
                   extractBlockedPath(errorOutput, cwd) ??
                   (errorFdAcc ? extractBlockedPath(stderrAcc, cwd) : null);
-                const blockedWritePath =
-                  extractBlockedWritePath(errorOutput, cwd) ??
-                  (errorFdAcc ? extractBlockedWritePath(stderrAcc, cwd) : null);
-                if (blockedPath && ctx.hasUI && callbacks.promptOnBlock) {
-                  const config = loadConfig(cwd);
-                  const isDeniedByDenyRead = matchesPattern(
-                    blockedPath,
-                    config.filesystem.denyRead,
-                  );
-                  const isReadAllowed = matchesPattern(blockedPath, getEffectiveAllowRead(config));
-                  const isWriteAllowed = !shouldPromptForWrite(
-                    blockedPath,
-                    getEffectiveAllowWrite(config),
-                  );
-
-                  if (blockedWritePath === blockedPath && !isWriteAllowed) {
-                    const choice = await promptWriteBlock(ctx, blockedPath);
-                    if (choice !== 'abort') await applyWriteChoice(choice, blockedPath, cwd);
-                  } else if (isDeniedByDenyRead || !isReadAllowed) {
-                    const choice = await promptReadBlock(
-                      ctx,
-                      blockedPath,
-                      isDeniedByDenyRead ? 'granting allowRead will override it' : undefined,
-                    );
-                    if (choice !== 'abort') await applyReadChoice(choice, blockedPath, cwd);
-                  } else if (!isWriteAllowed) {
-                    const choice = await promptWriteBlock(ctx, blockedPath);
-                    if (choice !== 'abort') await applyWriteChoice(choice, blockedPath, cwd);
-                  }
-                } else if (!blockedPath && ctx.hasUI) {
+                if (!blockedPath && ctx.hasUI) {
                   const landstripErrors = parseLandstripTraps(errorOutput);
                   if (landstripErrors.length > 0) {
                     const formatted = formatLandstripTraps(landstripErrors);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-landstrip",
-  "version": "0.16.4",
+  "version": "0.16.6",
   "description": "Landlock-based sandboxing for pi with interactive permission prompts",
   "keywords": [
     "landstrip",