opencode-landstrip 0.16.29 → 0.17.1

package/LICENSE

@@ -1,21 +1,201 @@
-MIT License
-
-Copyright (c) 2026 Jarkko Sakkinen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -76,7 +76,7 @@ but they are not process-sandboxed by this plugin.
 
 ## License
 
-`opencode-landstrip` is licensed under `MIT`. See [LICENSE](LICENSE) for more
+`opencode-landstrip` is licensed under `Apache-2.0`. See [LICENSE](LICENSE) for more
 information.
 
 The bundled `@landstrip/landstrip` package is licensed separately as

package/index.ts

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: Apache-2.0
 // Copyright (C) Jarkko Sakkinen 2026
 
 import type { Hooks, Plugin, PluginInput, PluginOptions } from '@opencode-ai/plugin';
@@ -14,6 +14,7 @@ import {
   type LandstripTrap,
   type SandboxConfig,
   type SandboxFilesystemConfig,
+  controlResponseLine,
   extractDomainsFromCommand,
   formatLandstripTraps,
   getConfigPaths,
@@ -61,7 +62,7 @@ interface SandboxPermissionDecision {
 
 type ToastVariant = 'info' | 'success' | 'warning' | 'error';
 
-const LANDSTRIP_VERSION = [0, 16, 4] as const;
+const LANDSTRIP_VERSION = [0, 17, 0] as const;
 const REQUIRED_LANDSTRIP_VERSION = LANDSTRIP_VERSION.join('.');
 const SUPPORTED_PLATFORMS = new Set<NodeJS.Platform>(['linux', 'darwin', 'win32']);
 
@@ -257,9 +258,6 @@ function extractBlockedPath(
   const landstripTraps = parseLandstripTraps(output);
   for (const trap of landstripTraps) {
     if (trap.kind === 'filesystem') return normalizeBlockedPath(trap.path, baseDirectory);
-    if (trap.kind === 'internal' && trap.detail.file) {
-      return normalizeBlockedPath(trap.detail.file, baseDirectory);
-    }
   }
 
   if (
@@ -639,6 +637,7 @@ function startTrapServer(
   baseDirectory: string,
   sessionAllowedReadPaths: Set<string>,
   sessionAllowedWritePaths: Set<string>,
+  sessionAllowedTargets: Set<string>,
 ): Promise<{ server: ReturnType<typeof createServer>; port: number; trapLines: string[] }> {
   const trapLines: string[] = [];
   const server = createServer((trapSocket) => {
@@ -660,33 +659,50 @@ function startTrapServer(
         } catch {
           obj = null;
         }
-        if (
-          obj &&
-          obj.state === 'query' &&
-          typeof obj.query_id === 'number' &&
-          (obj.operation === 'read' || obj.operation === 'write') &&
-          typeof obj.path === 'string'
-        ) {
-          const path = canonicalizePath(obj.path, baseDirectory);
-          const operation = obj.operation as 'read' | 'write';
-          // Per landstrip policy: a deny rule overrides allow only when more
-          // specific; a tie or more-specific allow carves the path back in.
-          const denyReadDepth = matchDepth(path, denyRead, baseDirectory);
-          const allowReadDepth = matchDepth(path, effectiveAllowRead, baseDirectory);
-          const denyWriteDepth = matchDepth(path, denyWrite, baseDirectory);
-          const allowWriteDepth = matchDepth(path, effectiveAllowWrite, baseDirectory);
-          const allowed =
-            operation === 'read'
-              ? !(denyReadDepth > allowReadDepth) && allowReadDepth >= 0
-              : !(denyWriteDepth > allowWriteDepth) && allowWriteDepth >= 0;
-          if (allowed) {
-            trapSocket.write(JSON.stringify({ query_id: obj.query_id, action: 'allow' }) + '\n');
+        if (obj && obj.state === 'query' && typeof obj.query_id === 'string') {
+          const queryId = obj.query_id;
+          if (
+            (obj.operation === 'read' || obj.operation === 'write') &&
+            typeof obj.path === 'string'
+          ) {
+            const path = canonicalizePath(obj.path, baseDirectory);
+            const operation = obj.operation as 'read' | 'write';
+            // Per landstrip policy: a deny rule overrides allow only when more
+            // specific; a tie or more-specific allow carves the path back in.
+            const denyReadDepth = matchDepth(path, denyRead, baseDirectory);
+            const allowReadDepth = matchDepth(path, effectiveAllowRead, baseDirectory);
+            const denyWriteDepth = matchDepth(path, denyWrite, baseDirectory);
+            const allowWriteDepth = matchDepth(path, effectiveAllowWrite, baseDirectory);
+            const allowed =
+              operation === 'read'
+                ? !(denyReadDepth > allowReadDepth) && allowReadDepth >= 0
+                : !(denyWriteDepth > allowWriteDepth) && allowWriteDepth >= 0;
+            if (allowed) {
+              trapSocket.write(controlResponseLine(queryId, 'allow'));
+            } else {
+              // Auto-grant via session scope and allow so the command proceeds.
+              const scope = sessionScopeFor(path, baseDirectory);
+              if (operation === 'read') sessionAllowedReadPaths.add(scope);
+              else sessionAllowedWritePaths.add(scope);
+              trapSocket.write(controlResponseLine(queryId, 'allow'));
+              trapLines.push(line);
+            }
+          } else if (
+            (obj.operation === 'connect' || obj.operation === 'bind') &&
+            typeof obj.target === 'string'
+          ) {
+            // No policy field expresses "allow this address:port" (allowedDomains
+            // is hostname-based and enforced by the HTTP(S) proxy, not the broker),
+            // so — matching the filesystem branch above — auto-grant, remember it
+            // for the rest of the session, and surface it afterward rather than
+            // hanging or hard-denying an already-approved command.
+            const target = obj.target;
+            if (!sessionAllowedTargets.has(target)) {
+              sessionAllowedTargets.add(target);
+              trapLines.push(line);
+            }
+            trapSocket.write(controlResponseLine(queryId, 'allow'));
           } else {
-            // Auto-grant via session scope and allow so the command proceeds.
-            const scope = sessionScopeFor(path, baseDirectory);
-            if (operation === 'read') sessionAllowedReadPaths.add(scope);
-            else sessionAllowedWritePaths.add(scope);
-            trapSocket.write(JSON.stringify({ query_id: obj.query_id, action: 'allow' }) + '\n');
             trapLines.push(line);
           }
         } else {
@@ -829,6 +845,7 @@ const plugin: Plugin = async ({ client, directory }: PluginInput, options?: Plug
   const callAllowances = new Set<string>();
   const sessionAllowedReadPaths = new Set<string>();
   const sessionAllowedWritePaths = new Set<string>();
+  const sessionAllowedTargets = new Set<string>();
 
   function getEffectiveAllowRead(config: SandboxConfig): string[] {
     return [...config.filesystem.allowRead, ...sessionAllowedReadPaths];
@@ -1153,6 +1170,7 @@ const plugin: Plugin = async ({ client, directory }: PluginInput, options?: Plug
       directory,
       sessionAllowedReadPaths,
       sessionAllowedWritePaths,
+      sessionAllowedTargets,
     );
 
     const wrappedCommand = buildWrappedCommand(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-landstrip",
-  "version": "0.16.29",
+  "version": "0.17.1",
   "description": "Landlock-based sandboxing for opencode with landstrip",
   "keywords": [
     "landlock",
@@ -8,16 +8,15 @@
     "opencode-plugin",
     "sandbox"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/landstrip/opencode-landstrip.git"
+    "url": "git+https://github.com/landstrip/landstrip.git"
   },
   "files": [
     "index.ts",
     "tui.ts",
     "shared.ts",
-    "landstrip.d.ts",
     "README.md",
     "sandbox.json"
   ],
@@ -49,7 +48,7 @@
     "ci:test": "npm test"
   },
   "dependencies": {
-    "@landstrip/landstrip": "^0.16.19"
+    "@landstrip/landstrip": "^0.17.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.7",

package/shared.ts

@@ -1,7 +1,15 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: Apache-2.0
 // Copyright (C) Jarkko Sakkinen 2026
 
-import { binaryPath } from '@landstrip/landstrip';
+import {
+  binaryPath,
+  type LandstripControlResponse,
+  type LandstripTrap,
+} from '@landstrip/landstrip';
+
+// 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 };
 
 import { createHash } from 'node:crypto';
 import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs';
@@ -396,81 +404,54 @@ export function updateForPermission(
 }
 
 // Landstrip emits one JSON trap per line on its trap fd/file. The `state` field
-// (landstrip >= 0.15.4) distinguishes a terminal `info` trap from a `query`
-// trap that holds a syscall pending until the host answers with `queryId`. It
-// is absent on the static-profile platforms (macOS/Windows), so both fields are
-// optional. Parsing lives here so the server hook and the TUI socket handler
-// decode identically.
-export type LandstripTrapState = 'query' | 'info';
-
-export type LandstripTrap =
-  | {
-      kind: 'filesystem';
-      operation: 'read' | 'write';
-      path: string;
-      mechanism: string;
-      state?: LandstripTrapState;
-      queryId?: number;
-    }
-  | { kind: 'network'; operation: string; target: string; mechanism: string }
-  | { kind: 'launch'; program: string; message: string }
-  | { kind: 'usage'; message: string }
-  | { kind: 'internal'; detail: Record<string, string> };
-
+// distinguishes a terminal `info` trap from a `query` trap that holds a syscall
+// pending until the host answers with the trap's `query_id`. Parsing lives here
+// so the server hook and the TUI socket handler decode identically.
 const LANDSTRIP_OPERATIONS = new Set<'read' | 'write'>(['read', 'write']);
 
 function isLandstripOperation(value: unknown): value is 'read' | 'write' {
   return typeof value === 'string' && LANDSTRIP_OPERATIONS.has(value as 'read' | 'write');
 }
 
-function decodeTrapState(value: unknown): LandstripTrapState | undefined {
-  return value === 'query' || value === 'info' ? value : undefined;
-}
-
-export function decodeLandstripTrap(value: unknown): LandstripTrap | null {
-  if (!isRecord(value)) return null;
-  const mechanism = typeof value.mechanism === 'string' ? value.mechanism : '';
+// The declarations landstrip ships are compile-time only, so a runtime guard is
+// still required — but it only has to validate the fields actually read below.
+// Deliberately does not validate `state`: a missing or unknown state degrades to
+// "informational", the safe direction. `query_id` must be a string on both
+// filesystem and network traps — landstrip < 0.17 sent a number here, and a
+// numeric id fails landstrip's own deserializer when echoed back, so treating
+// it as undecodable (rather than coercing it) keeps a stale/mismatched trap
+// from ever being answered with a shape the broker would reject.
+function isLandstripTrap(value: unknown): value is LandstripTrap {
+  if (!isRecord(value)) return false;
 
   switch (value.kind) {
-    case 'filesystem': {
-      const { operation, path } = value;
-      if (!isLandstripOperation(operation) || typeof path !== 'string') return null;
-      const trap: LandstripTrap = { kind: 'filesystem', operation, path, mechanism };
-      const state = decodeTrapState(value.state);
-      if (state) trap.state = state;
-      if (typeof value.query_id === 'number') trap.queryId = value.query_id;
-      return trap;
-    }
-    case 'network': {
-      const { operation, target } = value;
-      if (typeof operation !== 'string' || typeof target !== 'string') return null;
-      return { kind: 'network', operation, target, mechanism };
-    }
-    case 'launch': {
-      const { program, message } = value;
-      if (typeof program !== 'string') return null;
-      return { kind: 'launch', program, message: typeof message === 'string' ? message : '' };
-    }
-    case 'usage': {
-      const { message } = value;
-      if (typeof message !== 'string') return null;
-      return { kind: 'usage', message };
-    }
-    case 'internal': {
-      const detail: Record<string, string> = {};
-      const payload = value.detail;
-      if (isRecord(payload)) {
-        for (const [key, val] of Object.entries(payload)) {
-          detail[key] = typeof val === 'string' ? val : JSON.stringify(val);
-        }
-      }
-      return { kind: 'internal', detail };
-    }
+    case 'filesystem':
+      return (
+        isLandstripOperation(value.operation) &&
+        typeof value.path === 'string' &&
+        typeof value.query_id === 'string'
+      );
+    case 'network':
+      return (
+        typeof value.operation === 'string' &&
+        typeof value.target === 'string' &&
+        typeof value.query_id === 'string'
+      );
+    case 'launch':
+      return typeof value.program === 'string' && typeof value.message === 'string';
+    case 'usage':
+      return typeof value.message === 'string';
+    case 'internal':
+      return typeof value.code === 'string' && typeof value.message === 'string';
     default:
-      return null;
+      return false;
   }
 }
 
+export function decodeLandstripTrap(value: unknown): LandstripTrap | null {
+  return isLandstripTrap(value) ? value : null;
+}
+
 export function parseLandstripTraps(output: string): LandstripTrap[] {
   const traps: LandstripTrap[] = [];
 
@@ -507,10 +488,8 @@ export function formatLandstripTrap(trap: LandstripTrap): string {
     case 'usage':
       return `landstrip: usage error: ${trap.message}`;
     case 'internal': {
-      const detail = Object.entries(trap.detail)
-        .map(([key, val]) => `${key}: ${val}`)
-        .join(', ');
-      return `landstrip: internal error${detail ? ` (${detail})` : ''}`;
+      const mechanism = trap.mechanism ? ` [${trap.mechanism}]` : '';
+      return `landstrip: ${trap.code}${mechanism}: ${trap.message}`;
     }
   }
 }
@@ -519,6 +498,17 @@ export function formatLandstripTraps(traps: LandstripTrap[]): string {
   return traps.map(formatLandstripTrap).join('\n');
 }
 
+// The broker matches an answer to its query by the exact decimal `query_id`
+// string the trap carried. A numeric id fails its deserializer, the line is
+// dropped, and the child's syscall stays suspended.
+export function controlResponseLine(
+  queryId: string,
+  action: LandstripControlResponse['action'],
+): string {
+  const response: LandstripControlResponse = { query_id: queryId, action };
+  return JSON.stringify(response) + '\n';
+}
+
 // The TUI plugin runs the query-response socket server and publishes its port
 // to a per-directory discovery file; the server plugin reads it to inject the
 // fd-3 redirect. Namespacing by a hash of the realpath keeps concurrent

package/tui.ts

@@ -1,10 +1,11 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: Apache-2.0
 // Copyright (C) Jarkko Sakkinen 2026
 
 import type { TuiPlugin, TuiSlotContext, TuiSlotPlugin } from '@opencode-ai/plugin/tui';
 import { type AddressInfo, createServer, type Socket as NetSocket } from 'node:net';
 
 import {
+  controlResponseLine,
   getConfigPaths,
   loadConfig,
   normalizeOptions,
@@ -37,6 +38,10 @@ type PermissionChoice = 'once' | 'session' | 'project' | 'global' | 'reject';
 
 type QueryChoice = 'once' | 'session' | 'project' | 'global' | 'deny';
 
+// No project/global option: no landstrip policy field expresses "allow this
+// address:port" the way allowRead/allowWrite express a path.
+type NetworkQueryChoice = 'once' | 'session' | 'deny';
+
 // A landstrip filesystem query (read or write) held pending over the fd-3
 // socket. It shares the dialog stack with permission prompts so the two never
 // overlap, hence the common `id`/`kind` shape.
@@ -44,18 +49,31 @@ interface FsQueryEntry {
   kind: 'fs-query';
   id: string;
   socket: NetSocket;
-  queryId: number;
+  queryId: string;
   operation: 'read' | 'write';
   path: string;
 }
 
+// A landstrip network query (connect or bind) held pending over the same
+// fd-3 socket. The broker only knows `address:port`, so — unlike FsQueryEntry
+// — there is no project/global persistence option: no policy field can
+// express "allow this address:port".
+interface NetworkQueryEntry {
+  kind: 'net-query';
+  id: string;
+  socket: NetSocket;
+  queryId: string;
+  operation: string;
+  target: string;
+}
+
 interface PermissionEntry {
   kind: 'permission';
   id: string;
   permission: PendingPermission;
 }
 
-type QueueEntry = PermissionEntry | FsQueryEntry;
+type QueueEntry = PermissionEntry | FsQueryEntry | NetworkQueryEntry;
 
 function asRecord(permission: PendingPermission): Record<string, unknown> {
   return permission as unknown as Record<string, unknown>;
@@ -86,9 +104,13 @@ const tui: TuiPlugin = async (api, options, meta) => {
   const sessionAllowedWritePaths = new Set<string>();
   const sessionAllowedReadPaths = new Set<string>();
 
-  // Filesystem queries still awaiting a response, so cleanup can release held
-  // syscalls instead of letting the child hang.
-  const liveQueries = new Set<FsQueryEntry>();
+  // Targets the user approved "for session": address:port, since the broker
+  // knows nothing more specific than that at connect/bind time.
+  const sessionAllowedTargets = new Set<string>();
+
+  // Filesystem and network queries still awaiting a response, so cleanup can
+  // release held syscalls instead of letting the child hang.
+  const liveQueries = new Set<FsQueryEntry | NetworkQueryEntry>();
 
   function pump(): void {
     if (activeId !== undefined) return;
@@ -96,7 +118,8 @@ const tui: TuiPlugin = async (api, options, meta) => {
     while (next && resolved.has(next.id)) next = queue.shift();
     if (!next) return;
     if (next.kind === 'permission') showPermission(next.permission);
-    else showFsQuery(next);
+    else if (next.kind === 'fs-query') showFsQuery(next);
+    else showNetworkQuery(next);
   }
 
   function enqueueEntry(entry: QueueEntry): void {
@@ -232,8 +255,8 @@ const tui: TuiPlugin = async (api, options, meta) => {
     );
   }
 
-  function respondFsQuery(socket: NetSocket, queryId: number, action: 'allow' | 'deny'): void {
-    if (!socket.destroyed) socket.write(JSON.stringify({ query_id: queryId, action }) + '\n');
+  function respondQuery(socket: NetSocket, queryId: string, action: 'allow' | 'deny'): void {
+    if (!socket.destroyed) socket.write(controlResponseLine(queryId, action));
   }
 
   function resolveFsQuery(entry: FsQueryEntry, choice: QueryChoice): void {
@@ -262,7 +285,7 @@ const tui: TuiPlugin = async (api, options, meta) => {
         }
       }
 
-      respondFsQuery(entry.socket, entry.queryId, action);
+      respondQuery(entry.socket, entry.queryId, action);
       api.ui.toast({
         title: 'Sandbox',
         message:
@@ -273,7 +296,7 @@ const tui: TuiPlugin = async (api, options, meta) => {
       });
     } catch {
       // Persisting failed — still release the held syscall by denying it.
-      respondFsQuery(entry.socket, entry.queryId, 'deny');
+      respondQuery(entry.socket, entry.queryId, 'deny');
     } finally {
       liveQueries.delete(entry);
       finishActive(entry.id);
@@ -348,6 +371,77 @@ const tui: TuiPlugin = async (api, options, meta) => {
     );
   }
 
+  function resolveNetworkQuery(entry: NetworkQueryEntry, choice: NetworkQueryChoice): void {
+    if (resolved.has(entry.id)) return;
+    const action = choice === 'deny' ? 'deny' : 'allow';
+
+    try {
+      if (action === 'allow' && choice === 'session') sessionAllowedTargets.add(entry.target);
+
+      respondQuery(entry.socket, entry.queryId, action);
+      api.ui.toast({
+        title: 'Sandbox',
+        message:
+          action === 'deny'
+            ? `${entry.operation} denied: ${entry.target}`
+            : `${entry.operation} allowed (${choice}): ${entry.target}`,
+        variant: action === 'deny' ? 'warning' : 'success',
+      });
+    } finally {
+      liveQueries.delete(entry);
+      finishActive(entry.id);
+    }
+  }
+
+  function showNetworkQuery(entry: NetworkQueryEntry): void {
+    activeId = entry.id;
+
+    void api.attention.notify({
+      title: `Sandbox ${entry.operation} blocked`,
+      message: entry.target,
+      sound: { name: 'permission' },
+      notification: true,
+    });
+
+    // Same esc-denies-a-held-syscall reasoning as showFsQuery.
+    let selectionMade = false;
+
+    api.ui.dialog.replace(
+      () =>
+        api.ui.DialogSelect<NetworkQueryChoice>({
+          title: 'Sandbox Network Blocked',
+          placeholder: `${entry.operation} blocked: ${entry.target}`,
+          options: [
+            {
+              title: 'Allow once',
+              value: 'once',
+              category: `This ${entry.operation}`,
+              description: `Permit only this ${entry.operation}`,
+            },
+            {
+              title: 'Allow for session',
+              value: 'session',
+              category: `This ${entry.operation}`,
+              description: `Permit ${entry.target} for this session`,
+            },
+            {
+              title: 'Deny',
+              value: 'deny',
+              category: 'Deny',
+              description: `Block this ${entry.operation}`,
+            },
+          ],
+          onSelect: (option) => {
+            selectionMade = true;
+            resolveNetworkQuery(entry, option.value);
+          },
+        }),
+      () => {
+        if (!selectionMade) resolveNetworkQuery(entry, 'deny');
+      },
+    );
+  }
+
   const unsubscribeAsked = api.event.on('permission.asked', (event) => {
     const pending = event.properties as PendingPermission;
     enqueue(pending);
@@ -372,7 +466,7 @@ const tui: TuiPlugin = async (api, options, meta) => {
       sockets.add(socket);
       socket.setEncoding('utf-8');
       const socketId = ++socketSeq;
-      const seen = new Set<number>();
+      const seen = new Set<string>();
       let buffer = '';
 
       socket.on('data', (chunk: string | Buffer) => {
@@ -388,27 +482,46 @@ const tui: TuiPlugin = async (api, options, meta) => {
           buffer = buffer.slice(newline + 1);
 
           for (const trap of parseLandstripTraps(line)) {
-            if (trap.kind !== 'filesystem' || trap.state !== 'query') continue;
-            if (typeof trap.queryId !== 'number' || seen.has(trap.queryId)) continue;
-            seen.add(trap.queryId);
-
-            const sessionPaths =
-              trap.operation === 'read' ? sessionAllowedReadPaths : sessionAllowedWritePaths;
-            if (sessionAllows(sessionPaths, trap.path)) {
-              respondFsQuery(socket, trap.queryId, 'allow');
-              continue;
+            if (trap.kind !== 'filesystem' && trap.kind !== 'network') continue;
+            if (trap.state !== 'query') continue;
+            if (seen.has(trap.query_id)) continue;
+            seen.add(trap.query_id);
+
+            if (trap.kind === 'filesystem') {
+              const sessionPaths =
+                trap.operation === 'read' ? sessionAllowedReadPaths : sessionAllowedWritePaths;
+              if (sessionAllows(sessionPaths, trap.path)) {
+                respondQuery(socket, trap.query_id, 'allow');
+                continue;
+              }
+
+              const entry: FsQueryEntry = {
+                kind: 'fs-query',
+                id: `landstrip-${trap.operation}:${socketId}:${trap.query_id}`,
+                socket,
+                queryId: trap.query_id,
+                operation: trap.operation,
+                path: trap.path,
+              };
+              liveQueries.add(entry);
+              enqueueEntry(entry);
+            } else {
+              if (sessionAllowedTargets.has(trap.target)) {
+                respondQuery(socket, trap.query_id, 'allow');
+                continue;
+              }
+
+              const entry: NetworkQueryEntry = {
+                kind: 'net-query',
+                id: `landstrip-net:${socketId}:${trap.query_id}`,
+                socket,
+                queryId: trap.query_id,
+                operation: trap.operation,
+                target: trap.target,
+              };
+              liveQueries.add(entry);
+              enqueueEntry(entry);
             }
-
-            const entry: FsQueryEntry = {
-              kind: 'fs-query',
-              id: `landstrip-${trap.operation}:${socketId}:${trap.queryId}`,
-              socket,
-              queryId: trap.queryId,
-              operation: trap.operation,
-              path: trap.path,
-            };
-            liveQueries.add(entry);
-            enqueueEntry(entry);
           }
         }
       });
@@ -555,7 +668,7 @@ const tui: TuiPlugin = async (api, options, meta) => {
     // Deny any still-held queries so the sandboxed children don't hang, then
     // tear down the socket server and drop the discovery file.
     for (const entry of liveQueries) {
-      respondFsQuery(entry.socket, entry.queryId, 'deny');
+      respondQuery(entry.socket, entry.queryId, 'deny');
       liveQueries.delete(entry);
     }
     for (const socket of sockets) socket.destroy();

package/landstrip.d.ts

@@ -1,3 +0,0 @@
-declare module '@landstrip/landstrip' {
-  function binaryPath(): string;
-}