@demicodes/shell 0.3.3 → 0.6.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { a as HostProcess, c as HostSpawnHandle, i as HostFileSystem, l as HostSpawnParams, n as HostDirent, o as HostProcessOutputChunk, r as HostFileStat, s as HostSpawnExit, t as Host, u as HostStore } from "./host-DIg4RxcL.mjs";
 import { HostBackedFileSystem, VirtualFileSystemNode, VirtualFileSystemProvider, virtualDirectory, virtualFile } from "./host-fs.mjs";
-import { _ as runRegisteredCommand, a as CommandIO, c as CommandRegistry, d as CommandStdin, f as CommandStorage, g as renderCommandHelp, h as parseCommandInput, i as CommandExecutionContext, l as CommandRunContext, m as emptyStdin, n as COMMAND_HELP_DEFAULTS, o as CommandInputSpec, p as ParsedCommandInput, r as Command, s as CommandOutputSpec, t as AgentSessionCommandStorage, u as CommandRunResult } from "./storage-MeB35Df6.mjs";
+import { _ as runRegisteredCommand, a as CommandIO, c as CommandRegistry, d as CommandStdin, f as CommandStorage, g as renderCommandHelp, h as parseCommandInput, i as CommandExecutionContext, l as CommandRunContext, m as emptyStdin, n as COMMAND_HELP_DEFAULTS, o as CommandInputSpec, p as ParsedCommandInput, r as Command, s as CommandOutputSpec, t as AgentSessionCommandStorage, u as CommandRunResult } from "./storage-DB9hjZ2G.mjs";
 import { CommandName } from "@demicodes/just-bash/commands";
 import { Interpreter, InterpreterState } from "@demicodes/just-bash/interpreter";
 import { CommandRegistry as CommandRegistry$1, ExecResult } from "@demicodes/just-bash/types";
@@ -13,7 +13,8 @@ interface ExecAccumulator {
 }
 interface ShellSession {
   id: string;
-  commandScopeId: string;
+  agentSessionId: string | null;
+  commandStorageId: string;
   state: InterpreterState;
   fs: HostBackedFileSystem;
   interpreter: Interpreter;
@@ -90,14 +91,6 @@ interface BashEnvironmentOptions {
   shellIdFactory?: () => string;
   commandIdFactory?: () => string;
   initialEnv?: Record<string, string>;
-  /**
-   * Per-exec env injection for agent-owned shells. Evaluated on every exec with
-   * the owning agent session id; returned vars are set and exported, so both
-   * registered commands (ctx.env) and spawned external processes observe them.
-   * Lets a product harness expose session-scoped context (identity, routing)
-   * that changes between execs, which static initialEnv cannot express.
-   */
-  execEnv?: (agentSessionId: string) => Record<string, string>;
   maxOutputBytes?: number;
 }
 interface ShellExecInput {
@@ -235,7 +228,6 @@ declare class BashEnvironment {
   private readonly shellIdFactory;
   private readonly commandIdFactory;
   private readonly initialEnv;
-  private readonly execEnv?;
   private readonly defaultOutputLimitBytes;
   private readonly shells;
   private readonly defaultShellByAgentSessionId;
@@ -243,6 +235,7 @@ declare class BashEnvironment {
   private readonly artifacts;
   constructor(options: BashEnvironmentOptions);
   getShell(shellId: string): ShellSession | null;
+  hasCommand(commandId: string): boolean;
   registerCommand(command: Command): void;
   registeredCommands(): Command[];
   exec(input: ShellExecInput): Promise<ShellCommandStatus>;

package/dist/index.mjs

@@ -249,7 +249,8 @@ async function runRegisteredCommand(root, ctx) {
 		env: ctx.env,
 		cwd: ctx.cwd,
 		io: parsed.json ? capture : ctx.io,
-		storage: ctx.storage
+		storage: ctx.storage,
+		host: ctx.host
 	});
 	if (parsed.json && result.exitCode === 0) {
 		const raw = capture.stdoutText();
@@ -620,47 +621,47 @@ function appendVisibleChunk(foreground, targetFd, text, byteLength) {
 //#endregion
 //#region src/command-artifact-store.ts
 /**
-* Owns persistence of shell command artifacts: a per-scope storage cache plus the
+* Owns persistence of shell command artifacts: a per-storage-id cache plus the
 * set of released (tombstoned) commands. `BashEnvironment` delegates the storage
 * and release-tracking side of the `/@` virtual filesystem here, keeping only the
 * in-memory record lookups that need live command state.
 */
 var CommandArtifactStore = class {
 	store;
-	storageByScope = /* @__PURE__ */ new Map();
+	storageById = /* @__PURE__ */ new Map();
 	released = /* @__PURE__ */ new Set();
 	constructor(store) {
 		this.store = store;
 	}
-	/** The artifact storage for a command scope, created (and cached) on first use. */
-	storageFor(scopeId) {
-		const existing = this.storageByScope.get(scopeId);
+	/** The artifact storage for one agent session or anonymous shell. */
+	storageFor(commandStorageId) {
+		const existing = this.storageById.get(commandStorageId);
 		if (existing) return existing;
-		const storage = new AgentSessionCommandStorage(this.store, scopeId);
-		this.storageByScope.set(scopeId, storage);
+		const storage = new AgentSessionCommandStorage(this.store, commandStorageId);
+		this.storageById.set(commandStorageId, storage);
 		return storage;
 	}
 	/** Whether a command's artifact has been released (tombstoned). */
-	isReleased(scopeId, commandId) {
-		return this.released.has(this.key(scopeId, commandId));
+	isReleased(commandStorageId, commandId) {
+		return this.released.has(this.key(commandStorageId, commandId));
 	}
 	/** Persists an artifact unless its command has already been released. */
-	persist(scopeId, commandId, artifact) {
-		if (this.isReleased(scopeId, commandId)) return;
-		this.storageFor(scopeId).writeJson(`commands/${commandId}/artifact.json`, artifact).catch(() => {});
+	persist(commandStorageId, commandId, artifact) {
+		if (this.isReleased(commandStorageId, commandId)) return;
+		this.storageFor(commandStorageId).writeJson(`commands/${commandId}/artifact.json`, artifact).catch(() => {});
 	}
 	/** Tombstones a command and removes its persisted artifact. */
-	async release(scopeId, commandId) {
-		this.released.add(this.key(scopeId, commandId));
-		await this.storageFor(scopeId).delete(`commands/${commandId}/artifact.json`).catch(() => {});
+	async release(commandStorageId, commandId) {
+		this.released.add(this.key(commandStorageId, commandId));
+		await this.storageFor(commandStorageId).delete(`commands/${commandId}/artifact.json`).catch(() => {});
 	}
-	key(scopeId, commandId) {
-		return `${scopeId}\0${commandId}`;
+	key(commandStorageId, commandId) {
+		return `${commandStorageId}\0${commandId}`;
 	}
 };
 //#endregion
 //#region src/registered-command-adapter.ts
-function commandToForkCommand(session, command, storage) {
+function commandToForkCommand(session, command, storage, host) {
 	return {
 		name: command.name,
 		consumesStdin: treeConsumesStdin(command),
@@ -675,7 +676,8 @@ function commandToForkCommand(session, command, storage) {
 					env: mapToRecord(ctx.env),
 					cwd: ctx.cwd,
 					io,
-					storage
+					storage,
+					host
 				});
 				session.accumulator.audit.push({
 					kind: "registered-command",
@@ -790,7 +792,6 @@ var BashEnvironment = class {
 	shellIdFactory;
 	commandIdFactory;
 	initialEnv;
-	execEnv;
 	defaultOutputLimitBytes;
 	shells = /* @__PURE__ */ new Map();
 	defaultShellByAgentSessionId = /* @__PURE__ */ new Map();
@@ -803,12 +804,14 @@ var BashEnvironment = class {
 		this.shellIdFactory = options.shellIdFactory ?? (() => globalThis.crypto.randomUUID());
 		this.commandIdFactory = options.commandIdFactory ?? (() => globalThis.crypto.randomUUID());
 		this.initialEnv = options.initialEnv ?? {};
-		this.execEnv = options.execEnv;
 		this.defaultOutputLimitBytes = options.maxOutputBytes ?? DEFAULT_OUTPUT_LIMIT_BYTES;
 	}
 	getShell(shellId) {
 		return this.shells.get(shellId) ?? null;
 	}
+	hasCommand(commandId) {
+		return this.commandsById.has(commandId);
+	}
 	registerCommand(command) {
 		if (this.commands.get(command.name)) return;
 		this.commands.register(command);
@@ -825,17 +828,6 @@ var BashEnvironment = class {
 		}
 		const session = input.shellId ? this.requireShell(input.shellId) : input.ephemeral ? this.createShell(input.agentSessionId, input.cwd) : this.availableDefaultShell(input.agentSessionId);
 		if (session.exited) throw new Error(`Shell session "${session.id}" has exited`);
-		if (input.agentSessionId) {
-			const extraEnv = this.execEnv?.(input.agentSessionId);
-			if (extraEnv) {
-				const exported = session.state.exportedVars ?? /* @__PURE__ */ new Set();
-				session.state.exportedVars = exported;
-				for (const [key, value] of Object.entries(extraEnv)) {
-					session.state.env.set(key, value);
-					exported.add(key);
-				}
-			}
-		}
 		if (session.pendingExec || session.foreground) {
 			const commandId = session.activeCommandId ?? session.foreground?.commandId ?? "unknown";
 			throw new Error(`Shell session "${session.id}" is already running command "${commandId}"`);
@@ -873,7 +865,7 @@ var BashEnvironment = class {
 		const record = this.commandsById.get(commandId);
 		if (!record || record.status === "running") return false;
 		this.commandsById.delete(commandId);
-		await this.artifacts.release(record.commandScopeId, commandId);
+		await this.artifacts.release(record.commandStorageId, commandId);
 		return true;
 	}
 	async disposeShell(shellId) {
@@ -941,23 +933,20 @@ var BashEnvironment = class {
 	}
 	createShell(agentSessionId, initialCwd) {
 		const id = this.shellIdFactory();
-		const commandScopeId = agentSessionId ?? id;
+		const commandStorageId = agentSessionId ?? id;
 		const cwd = initialCwd ?? this.host.defaultCwd;
-		const fs = new HostBackedFileSystem(this.host, { lookup: (path) => this.lookupVirtualArtifact(commandScopeId, path) });
+		const fs = new HostBackedFileSystem(this.host, { lookup: (path) => this.lookupVirtualArtifact(commandStorageId, path) });
 		const env = /* @__PURE__ */ new Map();
 		for (const [key, value] of Object.entries(this.initialEnv)) env.set(key, value);
 		env.set("PWD", cwd);
-		env.set("DEMI_SESSION_ID", commandScopeId);
+		if (agentSessionId) env.set("DEMI_SESSION_ID", agentSessionId);
 		env.set("DEMI_SHELL_ID", id);
 		if (!env.has("IFS")) env.set("IFS", " 	\n");
 		if (!env.has("PS1")) env.set("PS1", "");
 		if (!env.has("PS2")) env.set("PS2", "> ");
 		if (!env.has("SHLVL")) env.set("SHLVL", "1");
-		const exportedVars = /* @__PURE__ */ new Set([
-			"PWD",
-			"DEMI_SESSION_ID",
-			"DEMI_SHELL_ID"
-		]);
+		const exportedVars = /* @__PURE__ */ new Set(["PWD", "DEMI_SHELL_ID"]);
+		if (agentSessionId) exportedVars.add("DEMI_SESSION_ID");
 		for (const key of env.keys()) if (key !== key.toLowerCase()) exportedVars.add(key);
 		for (const key of Object.keys(this.initialEnv)) exportedVars.add(key);
 		const state = {
@@ -1018,7 +1007,8 @@ var BashEnvironment = class {
 		const forkCommands = /* @__PURE__ */ new Map();
 		const session = {
 			id,
-			commandScopeId,
+			agentSessionId: agentSessionId ?? null,
+			commandStorageId,
 			state,
 			fs,
 			interpreter: void 0,
@@ -1035,8 +1025,8 @@ var BashEnvironment = class {
 			exited: false
 		};
 		for (const command of createPortableCommands(session)) forkCommands.set(command.name, command);
-		const storage = new AgentSessionCommandStorage(this.host.store, commandScopeId);
-		for (const command of this.commands.list()) forkCommands.set(command.name, commandToForkCommand(session, command, storage));
+		const storage = new AgentSessionCommandStorage(this.host.store, commandStorageId);
+		for (const command of this.commands.list()) forkCommands.set(command.name, commandToForkCommand(session, command, storage, this.host));
 		session.abortController = new AbortController();
 		session.interpreter = new Interpreter({
 			fs,
@@ -1109,7 +1099,7 @@ var BashEnvironment = class {
 		const record = {
 			id,
 			shellId: session.id,
-			commandScopeId: session.commandScopeId,
+			commandStorageId: session.commandStorageId,
 			script,
 			startedAt: now,
 			lastOutputAt: now,
@@ -1550,12 +1540,12 @@ var BashEnvironment = class {
 			status: "running"
 		};
 	}
-	async lookupVirtualArtifact(scopeId, path) {
+	async lookupVirtualArtifact(commandStorageId, path) {
 		const parts = path.split("/").filter(Boolean);
 		if (parts.length === 1 && parts[0] === "@") return virtualDirectory(["commands"]);
-		if (parts.length === 2 && parts[0] === "@" && parts[1] === "commands") return virtualDirectory(await this.commandArtifactIds(scopeId));
+		if (parts.length === 2 && parts[0] === "@" && parts[1] === "commands") return virtualDirectory(await this.commandArtifactIds(commandStorageId));
 		if (parts.length === 3 && parts[0] === "@" && parts[1] === "commands") {
-			const artifact = await this.commandArtifact(scopeId, parts[2]);
+			const artifact = await this.commandArtifact(commandStorageId, parts[2]);
 			if (!artifact) return null;
 			const entries = [
 				"meta.json",
@@ -1566,7 +1556,7 @@ var BashEnvironment = class {
 			return virtualDirectory(entries);
 		}
 		if (parts.length !== 4 || parts[0] !== "@" || parts[1] !== "commands") return null;
-		const artifact = await this.commandArtifact(scopeId, parts[2]);
+		const artifact = await this.commandArtifact(commandStorageId, parts[2]);
 		if (!artifact) return null;
 		const fileName = parts[3];
 		if (fileName === "stdout.txt") return virtualFile(encodeUtf8(artifact.stdout));
@@ -1575,31 +1565,31 @@ var BashEnvironment = class {
 		if (fileName === "meta.json") return virtualFile(encodeUtf8(`${JSON.stringify(commandArtifactMeta(artifact), null, 2)}\n`));
 		return null;
 	}
-	async commandArtifactIds(scopeId) {
+	async commandArtifactIds(commandStorageId) {
 		const ids = /* @__PURE__ */ new Set();
-		for (const record of this.commandsById.values()) if (record.commandScopeId === scopeId && !this.artifacts.isReleased(scopeId, record.id)) ids.add(record.id);
-		const keys = await this.artifacts.storageFor(scopeId).list("commands").catch(() => []);
+		for (const record of this.commandsById.values()) if (record.commandStorageId === commandStorageId && !this.artifacts.isReleased(commandStorageId, record.id)) ids.add(record.id);
+		const keys = await this.artifacts.storageFor(commandStorageId).list("commands").catch(() => []);
 		for (const key of keys) {
 			const match = /^commands\/([^/]+)\/artifact\.json$/.exec(key);
-			if (match && !this.artifacts.isReleased(scopeId, match[1])) ids.add(match[1]);
+			if (match && !this.artifacts.isReleased(commandStorageId, match[1])) ids.add(match[1]);
 		}
 		return [...ids];
 	}
-	async commandArtifact(scopeId, commandId) {
-		if (this.artifacts.isReleased(scopeId, commandId)) return null;
+	async commandArtifact(commandStorageId, commandId) {
+		if (this.artifacts.isReleased(commandStorageId, commandId)) return null;
 		const record = this.commandsById.get(commandId);
-		if (record?.commandScopeId === scopeId) {
+		if (record?.commandStorageId === commandStorageId) {
 			this.syncRunningRecord(record);
 			return commandArtifactFromRecord(record);
 		}
-		const value = await this.artifacts.storageFor(scopeId).readJson(`commands/${commandId}/artifact.json`).catch(() => null);
+		const value = await this.artifacts.storageFor(commandStorageId).readJson(`commands/${commandId}/artifact.json`).catch(() => null);
 		return isCommandArtifact(value) ? value : null;
 	}
 	persistCommandArtifact(record) {
 		const fingerprint = `${record.status}:${record.exitCode ?? ""}:${record.stdout.length}:${record.stderr.length}:${record.binaryStdout?.totalBytes ?? ""}`;
 		if (record.persistedFingerprint === fingerprint) return;
 		record.persistedFingerprint = fingerprint;
-		this.artifacts.persist(record.commandScopeId, record.id, commandArtifactFromRecord(record));
+		this.artifacts.persist(record.commandStorageId, record.id, commandArtifactFromRecord(record));
 	}
 	syncRunningRecord(record) {
 		const foreground = this.shells.get(record.shellId)?.foreground;

package/dist/{storage-MeB35Df6.d.mts → storage-DB9hjZ2G.d.mts}

@@ -1,4 +1,4 @@
-import { u as HostStore } from "./host-DIg4RxcL.mjs";
+import { t as Host, u as HostStore } from "./host-DIg4RxcL.mjs";
 import { z } from "zod";
 //#region src/command.d.ts
 type CommandInputSpec = Record<string, z.ZodType>;
@@ -48,6 +48,8 @@ interface CommandRunContext {
   cwd: string;
   io: CommandIO;
   storage: CommandStorage;
+  /** Host of the BashEnvironment executing this command. */
+  host: Host;
 }
 interface CommandRunResult {
   exitCode: number;
@@ -77,6 +79,7 @@ interface CommandExecutionContext {
   cwd: string;
   io: CommandIO;
   storage: CommandStorage;
+  host: Host;
 }
 declare class CommandRegistry {
   private readonly commands;

package/dist/storage.d.mts

@@ -1,2 +1,2 @@
-import { t as AgentSessionCommandStorage } from "./storage-MeB35Df6.mjs";
+import { t as AgentSessionCommandStorage } from "./storage-DB9hjZ2G.mjs";
 export { AgentSessionCommandStorage };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@demicodes/shell",
   "description": "Sandboxable bash engine and Host contract for Demi.",
-  "version": "0.3.3",
+  "version": "0.6.0",
   "private": false,
   "type": "module",
   "exports": {
@@ -19,7 +19,7 @@
     }
   },
   "dependencies": {
-    "@demicodes/utils": "^0.4.0",
+    "@demicodes/utils": "^0.6.0",
     "@demicodes/just-bash": "^3.0.1-demi.5",
     "zod": "^4.0.0"
   },