windows-development-sandbox 1.4.0 → 1.4.3

package/dist/host/agent-commands/commands.js

@@ -0,0 +1,33 @@
+// (Beta) Agent commands: with agentCommands.enabled, typing an agent's own command on this PC (claude, codex, ...) starts
+// it in a hidden sandbox for the folder you are in and attaches that terminal. Small forwarding files in
+// <storage>\agent-commands go first on YOUR PATH (so they win over npm's and the installers' copies); turning it off
+// removes the files and that one PATH entry. SANDBOX_AGENT_DIRECT=1 runs the real agent on this PC instead.
+import path from 'node:path';
+import { fileExists } from '../../core/util/index.js';
+export const commandsDir = (storageRoot) => path.join(storageRoot, 'agent-commands');
+const EXTENSIONS = ['.exe', '.cmd', '.bat'];
+/** cmd.exe expands % and ^ even inside quotes: such paths cannot go into a forwarding file safely. */
+export const cmdSafe = (p) => !/[%"^\r\n]/.test(p);
+/** The agent's own executable on this PC, skipping this tool's forwarding files. */
+export const realAgent = (command, skipDir, pathValue = process.env.PATH ?? process.env.Path ?? '') => {
+    const skip = path.resolve(skipDir).toLowerCase();
+    const dirs = pathValue.split(path.delimiter).filter((d) => d && path.resolve(d).toLowerCase() !== skip);
+    for (const dir of dirs)
+        for (const ext of EXTENSIONS) {
+            const candidate = path.join(dir, command + ext);
+            if (fileExists(candidate))
+                return candidate;
+        }
+    return null;
+};
+/** The agents that get a forwarding command: installed on this PC, and listed (or "auto" = all of them). */
+export const agentCommands = (config, storageRoot, pathValue) => {
+    const wanted = config.agentCommands.agents;
+    return Object.entries(config.harnesses).flatMap(([harness, h]) => {
+        if (wanted !== 'auto' && !wanted.includes(harness))
+            return [];
+        const command = h.npmBin ?? (h.hostExecutable ? path.parse(h.hostExecutable).name : harness);
+        const real = /^[A-Za-z0-9._-]+$/.test(command) ? realAgent(command, commandsDir(storageRoot), pathValue) : null;
+        return real && cmdSafe(real) ? [{ harness, command, real }] : [];
+    });
+};

package/dist/host/agent-commands/forwarders.d.ts

@@ -0,0 +1,7 @@
+import type { AgentCommand } from './commands.js';
+/** Marks files this tool wrote, so only those are ever replaced or removed. */
+export declare const MARKER = "windows-development-sandbox agent command";
+/** The .cmd file for one agent (cmd, PowerShell and Windows Terminal all run it). */
+export declare const forwardingCmd: (a: AgentCommand, node: string, entry: string) => string;
+/** The same for Git Bash, which looks for a file without an extension. */
+export declare const forwardingSh: (a: AgentCommand, node: string, entry: string) => string;

package/dist/host/agent-commands/forwarders.js

@@ -0,0 +1,31 @@
+/** Marks files this tool wrote, so only those are ever replaced or removed. */
+export const MARKER = 'windows-development-sandbox agent command';
+/** The .cmd file for one agent (cmd, PowerShell and Windows Terminal all run it). */
+export const forwardingCmd = (a, node, entry) => [
+    '@echo off',
+    'rem ' + MARKER + ' (Beta). Turn off: sandbox agent-commands off. Run the real one: set SANDBOX_AGENT_DIRECT=1',
+    'if "%SANDBOX_AGENT_DIRECT%"=="1" goto direct',
+    '"' + node + '" "' + entry + '" launch --harness ' + a.harness + ' --headless --terminal -- %*',
+    'exit /b %errorlevel%',
+    ':direct',
+    'call "' + a.real + '" %*',
+    '',
+].join('\r\n');
+/** The same for Git Bash, which looks for a file without an extension. */
+export const forwardingSh = (a, node, entry) => {
+    const posix = (p) => p.replace(/^([A-Za-z]):/, (_m, d) => '/' + d.toLowerCase()).replace(/\\/g, '/');
+    const q = (s) => "'" + s.replace(/'/g, "'\\''") + "'";
+    return [
+        '#!/bin/sh',
+        '# ' + MARKER + ' (Beta). Turn off: sandbox agent-commands off. Run the real one: SANDBOX_AGENT_DIRECT=1',
+        'if [ "$SANDBOX_AGENT_DIRECT" = "1" ]; then exec ' + q(posix(a.real)) + ' "$@"; fi',
+        'exec ' +
+            q(posix(node)) +
+            ' ' +
+            q(posix(entry)) +
+            ' launch --harness ' +
+            a.harness +
+            ' --headless --terminal -- "$@"',
+        '',
+    ].join('\n');
+};

package/dist/host/agent-commands/index.d.ts

@@ -0,0 +1,4 @@
+export * from './commands.js';
+export * from './forwarders.js';
+export * from './user-path.js';
+export * from './reconcile.js';

package/dist/host/agent-commands/index.js

@@ -0,0 +1,4 @@
+export * from './commands.js';
+export * from './forwarders.js';
+export * from './user-path.js';
+export * from './reconcile.js';

package/dist/host/agent-commands/reconcile.d.ts

@@ -0,0 +1,12 @@
+import type { Config } from '../../core/types.js';
+import { type AgentCommand } from './commands.js';
+export interface Reconciled {
+    on: boolean;
+    commands: AgentCommand[];
+    changed: boolean;
+}
+/**
+ * Makes this PC match agentCommands: on = a forwarding file per installed agent and the folder first on your PATH;
+ * off = no files, no PATH entry. Only touches files it wrote and its own PATH entry; does nothing when already right.
+ */
+export declare const reconcileAgentCommands: (config: Config, storageRoot: string, node: string, entry: string) => Reconciled;

package/dist/host/agent-commands/reconcile.js

@@ -0,0 +1,69 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { ensureDir, fileExists } from '../../core/util/index.js';
+import { writeFileAtomic } from '../../shared/io/index.js';
+import { safeRemove } from '../../shared/io/index.js';
+import { MARKER, forwardingCmd, forwardingSh } from './forwarders.js';
+import { commandsDir, cmdSafe, agentCommands } from './commands.js';
+import { editUserPath } from './user-path.js';
+const ownFiles = (dir) => fs.existsSync(dir)
+    ? fs
+        .readdirSync(dir)
+        .map((f) => path.join(dir, f))
+        .filter((f) => {
+        try {
+            return fs.lstatSync(f).isFile() && fs.readFileSync(f, 'utf8').includes(MARKER);
+        }
+        catch {
+            return false;
+        }
+    })
+    : [];
+/**
+ * Makes this PC match agentCommands: on = a forwarding file per installed agent and the folder first on your PATH;
+ * off = no files, no PATH entry. Only touches files it wrote and its own PATH entry; does nothing when already right.
+ */
+export const reconcileAgentCommands = (config, storageRoot, node, entry) => {
+    const dir = commandsDir(storageRoot);
+    if (!config.agentCommands.enabled) {
+        if (!fs.existsSync(dir))
+            return { on: false, commands: [], changed: false };
+        for (const f of ownFiles(dir))
+            fs.rmSync(f, { force: true });
+        editUserPath(dir, false);
+        if (fs.readdirSync(dir).length === 0)
+            safeRemove(dir, storageRoot);
+        return { on: false, commands: [], changed: true };
+    }
+    if (!cmdSafe(node) || !cmdSafe(entry))
+        throw new Error('This tool is installed in a folder whose path has % " or ^, which cannot go into a command file safely.');
+    const commands = agentCommands(config, storageRoot);
+    ensureDir(dir);
+    const wanted = new Map();
+    for (const a of commands) {
+        wanted.set(path.join(dir, a.command + '.cmd'), forwardingCmd(a, node, entry));
+        wanted.set(path.join(dir, a.command), forwardingSh(a, node, entry));
+    }
+    let changed = false;
+    for (const f of ownFiles(dir))
+        if (!wanted.has(f)) {
+            fs.rmSync(f, { force: true });
+            changed = true;
+        }
+    for (const [file, text] of wanted) {
+        const current = fileExists(file) ? fs.readFileSync(file, 'utf8') : null;
+        // A file of the same name that this tool did not write is never replaced.
+        if (current !== null && !current.includes(MARKER))
+            continue;
+        if (current !== text) {
+            writeFileAtomic(file, text);
+            changed = true;
+        }
+    }
+    const onPath = (process.env.PATH ?? '')
+        .split(path.delimiter)
+        .some((d) => path.resolve(d).toLowerCase() === path.resolve(dir).toLowerCase());
+    if (changed || !onPath)
+        editUserPath(dir, true);
+    return { on: true, commands, changed: changed || !onPath };
+};

package/dist/host/agent-commands/user-path.d.ts

@@ -0,0 +1,2 @@
+/** Runs a PowerShell script that edits YOUR PATH (HKCU\Environment) unexpanded, then tells Windows it changed. */
+export declare const editUserPath: (dir: string, add: boolean) => void;

package/dist/host/agent-commands/user-path.js

@@ -0,0 +1,33 @@
+import { spawnSync } from 'node:child_process';
+import { SYSTEM } from '../../shared/system.js';
+import { refuseInSelfTest } from '../test-guard.js';
+/** Runs a PowerShell script that edits YOUR PATH (HKCU\Environment) unexpanded, then tells Windows it changed. */
+export const editUserPath = (dir, add) => {
+    refuseInSelfTest('change your PATH');
+    const quoted = "'" + dir.replace(/'/g, "''") + "'";
+    const script = [
+        '$dir = ' + quoted,
+        "$key = [Microsoft.Win32.Registry]::CurrentUser.CreateSubKey('Environment')",
+        'try {',
+        "  $raw = [string]$key.GetValue('Path', '', [Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames)",
+        "  $rest = @($raw -split ';' | Where-Object { $_ -and $_.TrimEnd('\\') -ine $dir.TrimEnd('\\') })",
+        // First, so these commands win over the agents' own folders (also on YOUR PATH).
+        add ? "  $new = (@($dir) + $rest) -join ';'" : "  $new = $rest -join ';'",
+        "  if ($new -eq $raw.TrimEnd(';')) { exit 0 }",
+        "  if ($new.Length -gt 32000) { Write-Error 'PATH too long'; exit 3 }",
+        "  $kind = if ($key.GetValueNames() -contains 'Path') { $key.GetValueKind('Path') } else { [Microsoft.Win32.RegistryValueKind]::ExpandString }",
+        "  $key.SetValue('Path', $new, $kind)",
+        '} finally { $key.Close() }',
+        'Add-Type -Namespace WdsAgents -Name Native -MemberDefinition \'[System.Runtime.InteropServices.DllImport("user32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)] public static extern System.IntPtr SendMessageTimeout(System.IntPtr hWnd, uint msg, System.UIntPtr wParam, string lParam, uint flags, uint timeout, out System.UIntPtr result);\'',
+        '$ignored = [UIntPtr]::Zero',
+        "[void][WdsAgents.Native]::SendMessageTimeout([IntPtr]0xffff, 0x1A, [UIntPtr]::Zero, 'Environment', 2, 5000, [ref]$ignored)",
+    ].join('\n');
+    const result = spawnSync(SYSTEM.powershell(), ['-NoProfile', '-NonInteractive', '-OutputFormat', 'Text', '-Command', script], { encoding: 'utf8', windowsHide: true });
+    if (result.status === 3)
+        throw new Error('Your PATH is too long to add ' + dir + '.');
+    if (result.status !== 0)
+        throw new Error('Could not ' +
+            (add ? 'add ' + dir + ' to' : 'remove ' + dir + ' from') +
+            ' your PATH: ' +
+            (result.stderr || result.error?.message || 'exit ' + result.status).trim());
+};

package/dist/host/audit/collect.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-declare const AuditSettings: z.ZodObject<{
+declare const AuditSettingsSchema: z.ZodObject<{
     enabled: z.ZodBoolean;
     days: z.ZodNumber;
     maxMb: z.ZodNumber;
@@ -7,7 +7,7 @@ declare const AuditSettings: z.ZodObject<{
     files: z.ZodBoolean;
     projects: z.ZodArray<z.ZodString>;
 }, z.core.$strip>;
-export type AuditSettings = z.output<typeof AuditSettings>;
+export type AuditSettings = z.output<typeof AuditSettingsSchema>;
 /** Host-only: the audit settings of the running sandbox (written at launch, read by the watcher). */
 export declare const saveAuditSettings: (storageRoot: string, dataPath: string, settings: AuditSettings) => void;
 export declare const readAuditSettings: (storageRoot: string, dataPath: string) => AuditSettings | null;

package/dist/host/audit/collect.js

@@ -6,21 +6,27 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { z } from 'zod';
-import { assertNoLinks } from '../../core/util.js';
-import { listSessions, readValid, runPaths, writeJsonAtomic } from '../../shared/rundir.js';
-import { AuditEvent, AuditLog, fold } from './log.js';
+import { assertNoLinks } from '../../core/util/index.js';
+import { RunDir } from '../../shared/channel/index.js';
+import { JsonFile } from '../../shared/io/index.js';
+import { hostStateFile } from '../storage/index.js';
+import { AuditEventSchema, AuditLog, fold } from './log.js';
 const MAX_FILES_PER_PASS = 200;
 const MAX_FILE_BYTES = 8 * 1024 * 1024;
 /** Paths in a project not worth a line each (git's own bookkeeping, dependency folders). */
 const QUIET = /(^|[\\/])(\.git[\\/](objects|logs|refs|index\.lock|FETCH_HEAD|ORIG_HEAD)|node_modules[\\/]|target[\\/]|\.venv[\\/]|__pycache__[\\/])/i;
-const AuditSettings = z.object({
-    enabled: z.boolean(), days: z.number().int().min(1).max(365), maxMb: z.number().int().min(5).max(5000), processes: z.boolean(), files: z.boolean(),
+const AuditSettingsSchema = z.object({
+    enabled: z.boolean(),
+    days: z.number().int().min(1).max(365),
+    maxMb: z.number().int().min(5).max(5000),
+    processes: z.boolean(),
+    files: z.boolean(),
     projects: z.array(z.string().max(1024)).max(64),
 });
-const settingsFile = (storageRoot, dataPath) => path.join(storageRoot, 'sync', path.basename(dataPath) + '-audit.json');
+const settingsFile = (storageRoot, dataPath) => new JsonFile(AuditSettingsSchema, hostStateFile(storageRoot, dataPath, '-audit.json'));
 /** Host-only: the audit settings of the running sandbox (written at launch, read by the watcher). */
-export const saveAuditSettings = (storageRoot, dataPath, settings) => writeJsonAtomic(settingsFile(storageRoot, dataPath), settings);
-export const readAuditSettings = (storageRoot, dataPath) => readValid(AuditSettings, settingsFile(storageRoot, dataPath));
+export const saveAuditSettings = (storageRoot, dataPath, settings) => settingsFile(storageRoot, dataPath).write(settings);
+export const readAuditSettings = (storageRoot, dataPath) => settingsFile(storageRoot, dataPath).read();
 export class AuditCollector {
     dataPath;
     settings;
@@ -33,10 +39,16 @@ export class AuditCollector {
         this.settings = settings;
         this.log = new AuditLog(AuditLog.dirFor(storageRoot, dataPath), settings);
     }
-    add(e) { this.pending.push({ t: new Date().toISOString(), ...e }); }
+    add(e) {
+        this.pending.push({ t: new Date().toISOString(), ...e });
+    }
     /** Starts watching the projects' files (when audit.files). */
     start() {
-        this.add({ k: 'note', p: 'sandbox started; audit: ' + [this.settings.processes && 'programs', this.settings.files && 'files', 'sessions'].filter(Boolean).join(', ') });
+        this.add({
+            k: 'note',
+            p: 'sandbox started; audit: ' +
+                [this.settings.processes && 'programs', this.settings.files && 'files', 'sessions'].filter(Boolean).join(', '),
+        });
         if (!this.settings.files)
             return;
         for (const project of this.settings.projects) {
@@ -45,21 +57,32 @@ export class AuditCollector {
                     const rel = file ? String(file) : '';
                     if (!rel || QUIET.test(rel))
                         return;
-                    this.add({ k: 'file', a: event === 'rename' ? 'rename' : 'change', p: rel.replace(/\\/g, '/').slice(0, 1024), w: project });
+                    this.add({
+                        k: 'file',
+                        a: event === 'rename' ? 'rename' : 'change',
+                        p: rel.replace(/\\/g, '/').slice(0, 1024),
+                        w: project,
+                    });
                 }));
             }
-            catch { /* a project that is gone */ }
+            catch {
+                /* a project that is gone */
+            }
         }
     }
     /** Programs the sandbox reported: taken in (checked) and deleted. */
     takeGuestReports() {
         if (!this.settings.processes)
             return;
-        const dir = runPaths(this.dataPath).audit;
+        const dir = new RunDir(this.dataPath).auditDir;
         assertNoLinks(this.dataPath, dir);
         let names = [];
         try {
-            names = fs.readdirSync(dir).filter((n) => /^[\w-]+\.jsonl$/.test(n)).sort().slice(0, MAX_FILES_PER_PASS);
+            names = fs
+                .readdirSync(dir)
+                .filter((n) => /^[\w-]+\.jsonl$/.test(n))
+                .sort()
+                .slice(0, MAX_FILES_PER_PASS);
         }
         catch {
             return;
@@ -79,7 +102,7 @@ export class AuditCollector {
                         catch {
                             continue;
                         }
-                        const e = AuditEvent.safeParse(raw);
+                        const e = AuditEventSchema.safeParse(raw);
                         if (e.success)
                             this.pending.push({ ...e.data, k: 'proc', w: undefined, a: undefined });
                     }
@@ -91,27 +114,39 @@ export class AuditCollector {
         }
     }
     trackSessions() {
-        const now = new Map(listSessions(this.dataPath).map((s) => [s.id, s.phase]));
-        for (const s of listSessions(this.dataPath)) {
+        const now = new Map(new RunDir(this.dataPath).listSessions().map((s) => [s.id, s.phase]));
+        for (const s of new RunDir(this.dataPath).listSessions()) {
             const before = this.sessions.get(s.id);
             if (!before && s.phase === 'running')
                 this.add({ k: 'session', a: 'start', p: s.harness, w: s.cwd, c: s.id });
             if (before === 'running' && (s.phase === 'exited' || s.phase === 'failed'))
-                this.add({ k: 'session', a: 'end', p: s.harness, w: s.cwd, c: s.id + (s.exitCode !== undefined ? ' exit ' + s.exitCode : '') });
+                this.add({
+                    k: 'session',
+                    a: 'end',
+                    p: s.harness,
+                    w: s.cwd,
+                    c: s.id + (s.exitCode !== undefined ? ' exit ' + s.exitCode : ''),
+                });
         }
         this.sessions = now;
     }
-    guard(detail) { this.add({ k: 'guard', p: detail.slice(0, 1024) }); }
+    guard(detail) {
+        this.add({ k: 'guard', p: detail.slice(0, 1024) });
+    }
     /** Writes what came in since the last call (repeats folded); call every few seconds. */
     flush() {
         try {
             this.takeGuestReports();
         }
-        catch { /* next pass */ }
+        catch {
+            /* next pass */
+        }
         try {
             this.trackSessions();
         }
-        catch { /* next pass */ }
+        catch {
+            /* next pass */
+        }
         const events = this.pending.sort((a, b) => a.t.localeCompare(b.t));
         this.pending = [];
         this.log.append(fold(events));
@@ -122,5 +157,7 @@ export class AuditCollector {
         this.flush();
         this.log.maintain();
     }
-    maintain() { this.log.maintain(); }
+    maintain() {
+        this.log.maintain();
+    }
 }

package/dist/host/audit/log.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 /** One event. k: proc (a program started), file (changed in a project), session, guard (repo guard), note. */
-export declare const AuditEvent: z.ZodObject<{
+export declare const AuditEventSchema: z.ZodObject<{
     t: z.ZodString;
     k: z.ZodEnum<{
         file: "file";
@@ -16,7 +16,7 @@ export declare const AuditEvent: z.ZodObject<{
     w: z.ZodOptional<z.ZodString>;
     n: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
-export type AuditEvent = z.output<typeof AuditEvent>;
+export type AuditEvent = z.output<typeof AuditEventSchema>;
 export declare class AuditLog {
     readonly dir: string;
     private readonly limits;

package/dist/host/audit/log.js

@@ -6,7 +6,7 @@ import path from 'node:path';
 import zlib from 'node:zlib';
 import { z } from 'zod';
 /** One event. k: proc (a program started), file (changed in a project), session, guard (repo guard), note. */
-export const AuditEvent = z.object({
+export const AuditEventSchema = z.object({
     /** ISO time. */
     t: z.string().max(40),
     k: z.enum(['proc', 'file', 'session', 'guard', 'note']),
@@ -32,8 +32,12 @@ export class AuditLog {
         this.limits = limits;
     }
     /** <storage>\audit\<data set name>. */
-    static dirFor(storageRoot, dataPath) { return path.join(storageRoot, 'audit', path.basename(dataPath)); }
-    dayFile(day, gz = false) { return path.join(this.dir, day + '.jsonl' + (gz ? '.gz' : '')); }
+    static dirFor(storageRoot, dataPath) {
+        return path.join(storageRoot, 'audit', path.basename(dataPath));
+    }
+    dayFile(day, gz = false) {
+        return path.join(this.dir, day + '.jsonl' + (gz ? '.gz' : ''));
+    }
     append(events) {
         if (!events.length)
             return;
@@ -61,10 +65,16 @@ export class AuditLog {
             fs.rmSync(file);
         }
         const oldest = new Date(Date.parse(today) - (this.limits.days - 1) * 86400000).toISOString().slice(0, 10);
-        const files = fs.readdirSync(this.dir).filter((n) => DAY_FILE.test(n)).sort();
+        const files = fs
+            .readdirSync(this.dir)
+            .filter((n) => DAY_FILE.test(n))
+            .sort();
         for (const name of files.filter((n) => DAY_FILE.exec(n)[1] < oldest))
             fs.rmSync(path.join(this.dir, name), { force: true });
-        let left = fs.readdirSync(this.dir).filter((n) => DAY_FILE.test(n)).sort();
+        let left = fs
+            .readdirSync(this.dir)
+            .filter((n) => DAY_FILE.test(n))
+            .sort();
         const size = () => left.reduce((sum, n) => sum + fs.statSync(path.join(this.dir, n)).size, 0);
         while (left.length > 1 && size() > this.limits.maxMb * 1024 * 1024) {
             fs.rmSync(path.join(this.dir, left[0]), { force: true });
@@ -78,7 +88,10 @@ export class AuditLog {
         const since = new Date(Date.now() - ((o.days ?? 1) - 1) * 86400000).toISOString().slice(0, 10);
         const needle = o.grep?.toLowerCase();
         const events = [];
-        for (const name of fs.readdirSync(this.dir).filter((n) => DAY_FILE.test(n) && DAY_FILE.exec(n)[1] >= since).sort()) {
+        for (const name of fs
+            .readdirSync(this.dir)
+            .filter((n) => DAY_FILE.test(n) && DAY_FILE.exec(n)[1] >= since)
+            .sort()) {
             const raw = fs.readFileSync(path.join(this.dir, name));
             const text = name.endsWith('.gz') ? zlib.gunzipSync(raw).toString('utf8') : raw.toString('utf8');
             for (const line of text.split('\n')) {
@@ -91,7 +104,7 @@ export class AuditLog {
                 catch {
                     continue;
                 }
-                const e = AuditEvent.safeParse(parsed);
+                const e = AuditEventSchema.safeParse(parsed);
                 if (!e.success)
                     continue;
                 if (o.kinds?.length && !o.kinds.includes(e.data.k))
@@ -107,7 +120,10 @@ export class AuditLog {
     bytes() {
         if (!fs.existsSync(this.dir))
             return 0;
-        return fs.readdirSync(this.dir).filter((n) => DAY_FILE.test(n)).reduce((sum, n) => sum + fs.statSync(path.join(this.dir, n)).size, 0);
+        return fs
+            .readdirSync(this.dir)
+            .filter((n) => DAY_FILE.test(n))
+            .reduce((sum, n) => sum + fs.statSync(path.join(this.dir, n)).size, 0);
     }
 }
 /**

package/dist/host/{attach.d.ts → channel/attach.d.ts}

@@ -1,6 +1,6 @@
 import os from 'node:os';
-import type { SessionStatus } from '../core/types.js';
-import { type Viewers } from '../shared/pty-client.js';
+import type { SessionStatus } from '../../core/types.js';
+import { type Viewers } from '../../shared/pty/index.js';
 /**
  * True only for IPv4 addresses inside the subnet of one of this PC's Hyper-V adapters ("vEthernet ..."), which is
  * where Windows Sandbox lives. Stops a compromised sandbox from pointing the host (and your keystrokes) anywhere else.

package/dist/host/{attach.js → channel/attach.js}

@@ -2,10 +2,10 @@
 // trusted, and everything the sandbox reports is printed through safeText.
 import net from 'node:net';
 import os from 'node:os';
-import { fail, safeText, sleep } from '../core/util.js';
-import { connect, DETACH_KEY, queryViewers, runTerminalClient } from '../shared/pty-client.js';
-import { currentSessions } from './channel.js';
-import { insideSandbox } from './platform.js';
+import { fail, safeText, sleep } from '../../core/util/index.js';
+import { connect, DETACH_KEY, queryViewers, runTerminalClient, } from '../../shared/pty/index.js';
+import { SandboxChannel } from './channel.js';
+import { insideSandbox } from '../sandbox/index.js';
 const ipToInt = (ip) => ip.split('.').reduce((n, part) => n * 256 + Number(part), 0);
 /**
  * True only for IPv4 addresses inside the subnet of one of this PC's Hyper-V adapters ("vEthernet ..."), which is
@@ -15,17 +15,21 @@ export const isSandboxAddress = (ip, interfaces = os.networkInterfaces()) => {
     if (!net.isIPv4(ip))
         return false;
     // WSL's adapter is a Hyper-V adapter too, but no sandbox lives there: keystrokes must never go to a WSL VM.
-    return Object.entries(interfaces).some(([name, list]) => /^vEthernet/i.test(name) && !/WSL/i.test(name) && (list ?? []).some((i) => {
-        if (i.family !== 'IPv4' || i.internal)
-            return false;
-        const mask = ipToInt(i.netmask);
-        return mask !== 0 && (ipToInt(i.address) & mask) === (ipToInt(ip) & mask) && i.address !== ip;
-    }));
+    return Object.entries(interfaces).some(([name, list]) => /^vEthernet/i.test(name) &&
+        !/WSL/i.test(name) &&
+        (list ?? []).some((i) => {
+            if (i.family !== 'IPv4' || i.internal)
+                return false;
+            const mask = ipToInt(i.netmask);
+            return mask !== 0 && (ipToInt(i.address) & mask) === (ipToInt(ip) & mask) && i.address !== ip;
+        }));
 };
 /** Where this PC may connect for a session: only addresses on its own Hyper-V network (null if there are none). */
 const hostEndpoint = (session) => {
     // Inside the sandbox every session is on loopback; on the PC only addresses on its Hyper-V network are trusted.
-    const addresses = insideSandbox() ? ['127.0.0.1'] : session.attach?.addresses.filter((a) => isSandboxAddress(a)) ?? [];
+    const addresses = insideSandbox()
+        ? ['127.0.0.1']
+        : (session.attach?.addresses.filter((a) => isSandboxAddress(a)) ?? []);
     return session.attach && addresses.length ? { ...session.attach, addresses } : null;
 };
 /** Who is watching a session right now (closed terminals do not count); null when it cannot be asked. */
@@ -38,7 +42,11 @@ export const sessionViewers = (session) => {
  * sandbox claude -t picks it back up instead of starting another. A session that cannot answer is never reused.
  */
 export const findUnwatchedSession = async (dataPath, harness, cwd) => {
-    const candidates = currentSessions(dataPath).filter((s) => s.harness === harness && s.cwd.toLowerCase() === cwd.toLowerCase()).reverse().slice(0, 8);
+    const candidates = new SandboxChannel(dataPath)
+        .currentSessions()
+        .filter((s) => s.harness === harness && s.cwd.toLowerCase() === cwd.toLowerCase())
+        .reverse()
+        .slice(0, 8);
     for (const session of candidates)
         if ((await sessionViewers(session))?.remote === 0)
             return session;
@@ -50,9 +58,18 @@ export const attachTerminal = async (session) => {
         fail('--terminal / attach needs an interactive terminal.', 'Run it directly in Windows Terminal or PowerShell, not through a pipe or script.');
     if (!session.attach)
         fail('This session cannot be attached to: networking or attach is disabled for this sandbox.', 'Set sandbox.networking and attach.enabled to true, then start a new sandbox.');
-    const endpoint = hostEndpoint(session) ?? fail('Refusing to connect: the sandbox reported no address on this PC\'s Hyper-V (vEthernet) network (' + session.attach.addresses.join(', ') + ').', 'Use the sandbox window instead (sbx-show); if this keeps happening, run sandbox doctor.');
+    const endpoint = hostEndpoint(session) ??
+        fail("Refusing to connect: the sandbox reported no address on this PC's Hyper-V (vEthernet) network (" +
+            session.attach.addresses.join(', ') +
+            ').', 'Use the sandbox window instead (sbx-show); if this keeps happening, run sandbox doctor.');
     const socket = await connect(endpoint);
-    console.log('Attaching to ' + safeText(session.harness) + ' session ' + session.id + ' (' + safeText(session.cwd) + '). Detach any time with Ctrl+]');
+    console.log('Attaching to ' +
+        safeText(session.harness) +
+        ' session ' +
+        session.id +
+        ' (' +
+        safeText(session.cwd) +
+        '). Detach any time with Ctrl+]');
     await sleep(400);
     const result = await runTerminalClient(socket, session.attach.token, { detachKey: DETACH_KEY });
     switch (result.reason) {
@@ -62,7 +79,8 @@ export const attachTerminal = async (session) => {
         case 'exit':
             console.log(safeText(session.harness) + ' exited with code ' + result.exitCode + '.');
             return result.exitCode;
-        case 'error': fail('The sandbox refused the connection: ' + result.message, 'Try sandbox attach again; the session may have restarted.');
+        case 'error':
+            return fail('The sandbox refused the connection: ' + result.message, 'Try sandbox attach again; the session may have restarted.');
         default:
             console.log('Connection to the sandbox closed.');
             return 1;

package/dist/host/channel/channel.d.ts

@@ -0,0 +1,51 @@
+import type { GuestRequest, GuestResponse, Harness, SandboxStatus, SessionStatus } from '../../core/types.js';
+import type { ProjectSpec } from '../../shared/channel/index.js';
+/** Most sessions the host will ever contact for one listing: a sandbox can write as many session files as it likes. */
+export declare const MAX_QUERIED_SESSIONS = 32;
+/** Where progress lines go: printed by default; a spinner passes its own. Text from the sandbox, made safe first. */
+export type Progress = (line: string) => void;
+/** Sessions in this guest folder or below (one project's) first, each group newest first. */
+export declare function sessionsFirstIn(sessions: SessionStatus[], guestDir: string | null): SessionStatus[];
+/** The channel to the sandbox of one data folder: requests go into its run folder, answers are polled from it. */
+export declare class SandboxChannel {
+    private readonly dataPath;
+    private readonly isAlive;
+    private readonly run;
+    constructor(dataPath: string, isAlive?: () => boolean);
+    private until;
+    /** Deletes an answer once read; a planted link means the answer is read and nothing is deleted. */
+    private dropResponse;
+    /** Waits until the sandbox finished provisioning, reporting each boot step (onStatus: every status read, validated). */
+    waitForReady(launchId: string | null, progress?: Progress, onStatus?: (status: SandboxStatus) => void): Promise<SandboxStatus>;
+    send(request: GuestRequest): void;
+    waitForResponse(requestId: string, timeoutMs: number): Promise<GuestResponse>;
+    /**
+     * project: a project registered after boot (provisioned first). harnessSpec: the agent's definition, for an agent the
+     * sandbox did not boot with.
+     */
+    requestSession(harness: string, args: string[], cwd: string, extra?: {
+        project?: ProjectSpec;
+        harnessSpec?: Harness;
+    }): string;
+    /**
+     * Provisions a registered project without starting an agent and waits for it, printing its progress (the guest's
+     * run\projects\<name>.json) as it goes. Throws when it failed.
+     */
+    prepareProject(project: ProjectSpec, progress?: Progress): Promise<GuestResponse>;
+    waitForSession(sessionId: string, timeoutMs?: number, progress?: Progress): Promise<SessionStatus>;
+    /** Runs a command inside the sandbox (in the workspace or a folder below it) and returns its output. */
+    exec(command: string[], cwd: string, timeoutSeconds: number): Promise<GuestResponse>;
+    /** Restarts running sessions in place (they resume via the harness's resumeArguments, e.g. claude --continue). */
+    restart(harness: string | null, cwd?: string): Promise<GuestResponse>;
+    ping(): Promise<GuestResponse>;
+    runningSessions(): SessionStatus[];
+    /** Running sessions of the sandbox that is running now (its launch id), newest last, capped. */
+    currentSessions(): SessionStatus[];
+    /**
+     * The session with this id (or id prefix), else the most recently started running one: in `guestDir` (the project
+     * you are in) when it has one, else any.
+     */
+    pickSession(sessionId?: string, guestDir?: string | null): SessionStatus;
+    /** Forgets status from a previous sandbox run so nothing stale is picked up. */
+    reset(): void;
+}