opencode-landstrip 0.18.42 → 0.18.43

package/index.ts

@@ -78,8 +78,8 @@ function normalizePathForMatch(filePath: string): string {
   return process.platform === 'win32' ? normalizePathSeparators(filePath).toLowerCase() : filePath;
 }
 
-// Component count of an absolute path; "/" is 0. Used to rank how specific a
-// matching pattern is so the most specific allow/deny rule wins.
+// Component count of an absolute path; "/" is 0. Read rules use it to rank
+// matching allow and deny patterns by specificity.
 function pathDepth(absolutePath: string): number {
   return absolutePath.split('/').filter((segment) => segment.length > 0).length;
 }
@@ -135,7 +135,7 @@ function isDomainAllowed(domain: string, config: SandboxConfig): boolean {
   );
 }
 
-function isFilesystemAllowed(
+function isReadAllowed(
   path: string,
   allowPatterns: string[],
   denyPatterns: string[],
@@ -146,6 +146,16 @@ function isFilesystemAllowed(
   return allowDepth >= 0 && allowDepth >= denyDepth;
 }
 
+function writeAccess(
+  path: string,
+  allowPatterns: string[],
+  denyPatterns: string[],
+  baseDirectory: string,
+): 'allow' | 'deny' | 'unlisted' {
+  if (matchDepth(path, denyPatterns, baseDirectory) >= 0) return 'deny';
+  return matchDepth(path, allowPatterns, baseDirectory) >= 0 ? 'allow' : 'unlisted';
+}
+
 function extractCandidatePaths(command: string): string[] {
   const paths: string[] = [];
   const tokens = command.match(/[^\s"']+|"[^"]*"|'[^']*'/g) ?? [];
@@ -219,9 +229,7 @@ function evaluateReadPermission(
   // everything else asks for approval (allow once/session/persist or reject)
   // rather than being blocked outright. denyRead still hard-applies to bash
   // through the landstrip binary policy, which has no way to prompt.
-  if (
-    isFilesystemAllowed(filePath, effectiveAllowRead, config.filesystem.denyRead, baseDirectory)
-  ) {
+  if (isReadAllowed(filePath, effectiveAllowRead, config.filesystem.denyRead, baseDirectory)) {
     return { status: 'allow', kind: 'read', resource: filePath, message: '' };
   }
 
@@ -240,10 +248,14 @@ function evaluateWritePermission(
   effectiveAllowWrite: string[],
 ): SandboxPermissionDecision {
   const filePath = canonicalizePath(path, baseDirectory);
-  const allowDepth = matchDepth(filePath, effectiveAllowWrite, baseDirectory);
-  const denyDepth = matchDepth(filePath, config.filesystem.denyWrite, baseDirectory);
+  const access = writeAccess(
+    filePath,
+    effectiveAllowWrite,
+    config.filesystem.denyWrite,
+    baseDirectory,
+  );
 
-  if (denyDepth >= 0 && denyDepth >= allowDepth) {
+  if (access === 'deny') {
     return {
       status: 'deny',
       kind: 'write',
@@ -252,9 +264,7 @@ function evaluateWritePermission(
     };
   }
 
-  if (
-    isFilesystemAllowed(filePath, effectiveAllowWrite, config.filesystem.denyWrite, baseDirectory)
-  ) {
+  if (access === 'allow') {
     return { status: 'allow', kind: 'write', resource: filePath, message: '' };
   }
 
@@ -427,8 +437,8 @@ function startTrapServer(
             const operation = trap.operation;
             const allowed =
               operation === 'read'
-                ? isFilesystemAllowed(path, effectiveAllowRead, denyRead, baseDirectory)
-                : isFilesystemAllowed(path, effectiveAllowWrite, denyWrite, baseDirectory);
+                ? isReadAllowed(path, effectiveAllowRead, denyRead, baseDirectory)
+                : writeAccess(path, effectiveAllowWrite, denyWrite, baseDirectory) === 'allow';
             if (allowed) {
               trapSocket.write(controlResponseLine(queryId, 'allow'));
             } else {
@@ -1051,7 +1061,12 @@ const plugin: Plugin = async ({ client, directory }: PluginInput, options?: Plug
         config.filesystem.allowWrite,
       );
       for (const decision of decisions) {
-        if (decision.status === 'allow' || hasCallAllowance(input.callID, decision)) continue;
+        if (
+          decision.status === 'allow' ||
+          (decision.status === 'ask' && hasCallAllowance(input.callID, decision))
+        ) {
+          continue;
+        }
         reportBlocked(decision);
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-landstrip",
-  "version": "0.18.42",
+  "version": "0.18.43",
   "description": "OS-level AI command sandboxing for OpenCode with Landstrip",
   "keywords": [
     "landlock",
@@ -48,7 +48,7 @@
     "ci:test": "npm test"
   },
   "dependencies": {
-    "@landstrip/landstrip-api": "^0.18.42",
+    "@landstrip/landstrip-api": "^0.18.43",
     "@opentui/core": ">=0.3.4",
     "@opentui/solid": ">=0.3.4",
     "solid-js": "1.9.12"

package/shared.ts

@@ -1,33 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) Jarkko Sakkinen 2026
 
-import {
-  binaryPath,
-  type LandstripControlResponse,
-  type LandstripTrap,
-} from '@landstrip/landstrip-api';
-
-import {
-  allowsAllDomains,
-  canonicalizeGlobPattern,
-  canonicalizePath,
-  controlResponseLine,
-  decodeLandstripTrap,
-  domainMatchesAny,
-  domainMatchesPattern,
-  expandHomePath,
-  expandPath,
-  globToRegExp,
-  formatLandstripTrap,
-  formatLandstripTraps,
-  isRecord,
-  normalizePathSeparators,
-  parseLandstripTraps,
-  pathUnderDirectory,
-  sessionAllows,
-  sessionScopeFor,
-} from '@landstrip/landstrip-api/shared';
+import { binaryPath } from '@landstrip/landstrip-api';
+import { isRecord } from '@landstrip/landstrip-api/shared';
 
+export type { LandstripControlResponse, LandstripTrap } from '@landstrip/landstrip-api';
 export {
   allowsAllDomains,
   canonicalizeGlobPattern,
@@ -47,11 +24,7 @@ export {
   pathUnderDirectory,
   sessionAllows,
   sessionScopeFor,
-};
-
-// Re-exported so index.ts/tui.ts can import the trap/response types from this
-// module alongside the parsing functions that produce/consume them.
-export type { LandstripControlResponse, LandstripTrap };
+} from '@landstrip/landstrip-api/shared';
 
 import { createHash } from 'node:crypto';
 import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs';
@@ -99,10 +72,6 @@ const LANDSTRIP_PACKAGE_NAMES = new Set([
   '@landstrip/landstrip-win32-arm64',
 ]);
 
-export function list(values: string[]): string {
-  return values.join(', ') || '(none)';
-}
-
 function rejectUnknownFields(
   value: Record<string, unknown>,
   fields: readonly string[],
@@ -601,54 +570,3 @@ export function readDiscoveryPort(baseDirectory: string): number | null {
     return null;
   }
 }
-
-/**
- * Human-readable sandbox configuration report consumed by both the server
- * command and the TUI inspector dialog.
- */
-export function sandboxSummary(
-  config: SandboxConfig,
-  globalPath: string,
-  projectPath: string,
-  statusOverride?: string,
-): string {
-  const networkMode = config.network.allowNetwork ? 'unrestricted' : 'proxied';
-  const allowed = list(config.network.allowedDomains);
-  const denied = list(config.network.deniedDomains);
-  const unixSockets = config.network.allowAllUnixSockets
-    ? 'all'
-    : list(config.network.allowUnixSockets);
-  const denyRead = list(config.filesystem.denyRead);
-  const allowRead = list(config.filesystem.allowRead);
-  const allowWrite = list(config.filesystem.allowWrite);
-  const denyWrite = list(config.filesystem.denyWrite);
-
-  const status = statusOverride ?? (config.enabled ? 'active' : 'disabled by config');
-  let binary: string;
-  try {
-    binary = landstripBinaryPath();
-  } catch {
-    binary = '(unavailable)';
-  }
-
-  return [
-    `Status: ${status}`,
-    `landstrip package binary: ${binary}`,
-    '',
-    'Config files',
-    `${projectPath} ${existsSync(projectPath) ? '(found)' : '(missing)'}`,
-    `${globalPath} ${existsSync(globalPath) ? '(found)' : '(missing)'}`,
-    '',
-    `Network: ${networkMode}`,
-    `allow network: ${config.network.allowNetwork ? 'yes' : 'no'}`,
-    `allowed: ${allowed}`,
-    `denied: ${denied}`,
-    `unix sockets: ${unixSockets}`,
-    '',
-    'Filesystem',
-    `deny read: ${denyRead}`,
-    `allow read: ${allowRead}`,
-    `allow write: ${allowWrite}`,
-    `deny write: ${denyWrite}`,
-  ].join('\n');
-}

package/tui.ts

@@ -585,6 +585,10 @@ const tui: TuiPlugin = async (api, options, meta) => {
             }
 
             if (trap.kind === 'filesystem') {
+              if (trap.operation === 'write' && trap.reason === 'deny_match') {
+                respondQuery(socket, trap.query_id, 'deny');
+                continue;
+              }
               const sessionPaths =
                 trap.operation === 'read' ? allowances.readPaths : allowances.writePaths;
               if (sessionAllows(sessionPaths, trap.path)) {