@demicodes/host-local 0.10.3 → 0.11.0

package/dist/index.d.mts

@@ -1,14 +1,14 @@
 import { AgentHarness, AgentServer, AgentServerSessionOptions } from "@demicodes/agent";
+import { resolveDemiHome } from "@demicodes/provider/credentials-pool";
 import { BashEnvironmentOptions, Host, HostFileSystem, HostProcess, HostStore } from "@demicodes/shell";
 import { Provider } from "@demicodes/provider";
-
 //#region src/command-bridge.d.ts
 /**
  * Dispatch script shared by every generated command-name symlink.
  * Reads the invoked name from the symlink path, applies the stdin grace
  * contract from docs/command-bridge.md, and POSTs /run on the UDS socket.
  */
-declare const COMMAND_BRIDGE_SHIM_SOURCE = "#!/usr/bin/env node\nconst { request } = require('node:http')\nconst { basename } = require('node:path')\n\n// Stdin policy (docs/command-bridge.md): if no byte arrives within the grace\n// window, proceed with empty stdin. Once any byte arrives, clear the timer\n// and read until EOF with no time cap. Late data after empty-stdin dispatch\n// is reported on stderr and not pretended to have been delivered.\nconst STDIN_GRACE_MS = 300\n\nfunction readStdin() {\n  if (process.stdin.isTTY) return Promise.resolve('')\n  return new Promise((resolve, reject) => {\n    const chunks = []\n    let resolved = false\n    let timedOut = false\n    let timer\n    const cleanup = () => {\n      clearTimeout(timer)\n      process.stdin.removeListener('data', onData)\n      process.stdin.removeListener('end', onEnd)\n      process.stdin.removeListener('error', onError)\n    }\n    const onData = (chunk) => {\n      if (timedOut) {\n        process.stderr.write(\n          'command bridge: ' + chunk.length + ' byte(s) of stdin arrived after the ' + STDIN_GRACE_MS +\n            'ms grace period elapsed; the command already ran with empty stdin\\n',\n        )\n        cleanup()\n        return\n      }\n      clearTimeout(timer)\n      chunks.push(chunk)\n    }\n    const onEnd = () => {\n      if (timedOut) {\n        cleanup()\n        return\n      }\n      resolved = true\n      cleanup()\n      resolve(Buffer.concat(chunks).toString('utf8'))\n    }\n    const onError = (error) => {\n      if (resolved || timedOut) return\n      resolved = true\n      cleanup()\n      reject(error)\n    }\n    timer = setTimeout(() => {\n      timedOut = true\n      resolved = true\n      resolve('')\n    }, STDIN_GRACE_MS)\n    process.stdin.on('data', onData)\n    process.stdin.on('end', onEnd)\n    process.stdin.on('error', onError)\n  })\n}\n\nfunction postRun(socketPath, body) {\n  return new Promise((resolve, reject) => {\n    const req = request(\n      { socketPath, path: '/run', method: 'POST', headers: { 'content-type': 'application/json' } },\n      (res) => {\n        const chunks = []\n        res.on('data', (chunk) => chunks.push(chunk))\n        res.on('end', () => resolve({ statusCode: res.statusCode || 0, body: Buffer.concat(chunks).toString('utf8') }))\n      },\n    )\n    req.on('error', reject)\n    req.end(body)\n  })\n}\n\nasync function main() {\n  const socketPath = process.env.DEMI_COMMAND_BRIDGE_SOCK\n  // Shell sessions export DEMI_SESSION_ID as the agent session id (command scope).\n  const commandScopeId = process.env.DEMI_AGENT_SESSION_ID || process.env.DEMI_SESSION_ID\n  if (!socketPath || !commandScopeId) {\n    process.stderr.write('command bridge: DEMI_COMMAND_BRIDGE_SOCK / session id not set in this shell\\n')\n    process.exit(1)\n  }\n  const name = basename(process.argv[1] || '')\n  const args = process.argv.slice(2)\n  const stdin = await readStdin()\n  const body = JSON.stringify({ commandScopeId, name, args, cwd: process.cwd(), stdin })\n\n  const response = await postRun(socketPath, body)\n  if (response.statusCode !== 200) {\n    let message = response.body\n    try {\n      message = JSON.parse(response.body).error || message\n    } catch {}\n    process.stderr.write('command bridge: ' + message + '\\n')\n    process.exit(1)\n  }\n  const result = JSON.parse(response.body)\n  if (result.stdout) process.stdout.write(result.stdout)\n  if (result.stderr) process.stderr.write(result.stderr)\n  process.exit(result.exitCode)\n}\n\nmain().catch((error) => {\n  process.stderr.write('command bridge: ' + (error && error.message ? error.message : String(error)) + '\\n')\n  process.exit(1)\n})\n";
+declare const COMMAND_BRIDGE_SHIM_SOURCE = "#!/usr/bin/env node\nconst { request } = require('node:http')\nconst { basename } = require('node:path')\n\n// Stdin policy (docs/command-bridge.md): if no byte arrives within the grace\n// window, proceed with empty stdin. Once any byte arrives, clear the timer\n// and read until EOF with no time cap. Late data after empty-stdin dispatch\n// is reported on stderr and not pretended to have been delivered.\nconst STDIN_GRACE_MS = 300\n\nfunction readStdin() {\n  if (process.stdin.isTTY) return Promise.resolve('')\n  return new Promise((resolve, reject) => {\n    const chunks = []\n    let resolved = false\n    let timedOut = false\n    let timer\n    const cleanup = () => {\n      clearTimeout(timer)\n      process.stdin.removeListener('data', onData)\n      process.stdin.removeListener('end', onEnd)\n      process.stdin.removeListener('error', onError)\n    }\n    const onData = (chunk) => {\n      if (timedOut) {\n        process.stderr.write(\n          'command bridge: ' + chunk.length + ' byte(s) of stdin arrived after the ' + STDIN_GRACE_MS +\n            'ms grace period elapsed; the command already ran with empty stdin\\n',\n        )\n        cleanup()\n        return\n      }\n      clearTimeout(timer)\n      chunks.push(chunk)\n    }\n    const onEnd = () => {\n      if (timedOut) {\n        cleanup()\n        return\n      }\n      resolved = true\n      cleanup()\n      resolve(Buffer.concat(chunks).toString('utf8'))\n    }\n    const onError = (error) => {\n      if (resolved || timedOut) return\n      resolved = true\n      cleanup()\n      reject(error)\n    }\n    timer = setTimeout(() => {\n      timedOut = true\n      resolved = true\n      resolve('')\n    }, STDIN_GRACE_MS)\n    process.stdin.on('data', onData)\n    process.stdin.on('end', onEnd)\n    process.stdin.on('error', onError)\n  })\n}\n\nfunction postRun(socketPath, body) {\n  return new Promise((resolve, reject) => {\n    const req = request(\n      { socketPath, path: '/run', method: 'POST', headers: { 'content-type': 'application/json' } },\n      (res) => {\n        const chunks = []\n        res.on('data', (chunk) => chunks.push(chunk))\n        res.on('end', () => resolve({ statusCode: res.statusCode || 0, body: Buffer.concat(chunks).toString('utf8') }))\n      },\n    )\n    req.on('error', reject)\n    req.end(body)\n  })\n}\n\nasync function main() {\n  const socketPath = process.env.DEMI_COMMAND_BRIDGE_SOCK\n  const shellId = process.env.DEMI_SHELL_ID\n  if (!socketPath || !shellId) {\n    process.stderr.write('command bridge: DEMI_COMMAND_BRIDGE_SOCK / shell id not set in this shell\\n')\n    process.exit(1)\n  }\n  const name = basename(process.argv[1] || '')\n  const args = process.argv.slice(2)\n  const stdin = await readStdin()\n  const body = JSON.stringify({ shellId, name, args, cwd: process.cwd(), stdin })\n\n  const response = await postRun(socketPath, body)\n  if (response.statusCode !== 200) {\n    let message = response.body\n    try {\n      message = JSON.parse(response.body).error || message\n    } catch {}\n    process.stderr.write('command bridge: ' + message + '\\n')\n    process.exit(1)\n  }\n  const result = JSON.parse(response.body)\n  if (result.stdout) {\n    // Binary final streams arrive base64-encoded; write raw bytes so external\n    // pipes (demi read a.png | ffmpeg -i - ...) stay byte-clean.\n    process.stdout.write(result.stdoutEncoding === 'base64' ? Buffer.from(result.stdout, 'base64') : result.stdout)\n  }\n  if (result.stderr) process.stderr.write(result.stderr)\n  process.exit(result.exitCode)\n}\n\nmain().catch((error) => {\n  process.stderr.write('command bridge: ' + (error && error.message ? error.message : String(error)) + '\\n')\n  process.exit(1)\n})\n";
 interface CommandBridgeOptions {
   socketPath: string;
 }
@@ -42,11 +42,6 @@ declare function bridgeBinDirFor(stateDir: string): string;
 declare function materializeCommandBridgeShims(options: MaterializeCommandBridgeShimsOptions): Promise<string>;
 //#endregion
 //#region src/demi-home.d.ts
-/**
- * Demi local state root (not the workspace cwd).
- * Override with `DEMI_HOME` or `createLocalAgentServer({ stateDir })`, else `~/.demi`.
- */
-declare function resolveDemiHome(explicit?: string): string;
 /** Fixed layout: `<stateDir>/bridges/<id>.sock` (short id for macOS AF_UNIX limits). */
 declare function defaultBridgeSocketPath(stateDir: string, serverId?: string): string;
 //#endregion
@@ -97,7 +92,7 @@ interface LocalAgentServerHandle {
  * bridge **on by default**.
  *
  * Owns the Node-only bridge transport (UDS + PATH shims under `stateDir`).
- * AgentServer only receives a generic `prepareSessionShell` hook and exposes
+ * AgentServer only receives a generic `prepareShell` hook and exposes
  * `runCommandLine` — it never sees bin dirs or sockets.
  *
  * Default layout under `stateDir` (`~/.demi` or `$DEMI_HOME`):

package/dist/index.mjs

@@ -1,11 +1,12 @@
 import { existsSync, mkdirSync, unlinkSync } from "node:fs";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { createServer } from "node:http";
-import { AgentServer, RunCommandLineSessionNotFoundError, RunCommandLineTimeoutError } from "@demicodes/agent";
+import { AgentServer, RunCommandLineCommandNotRegisteredError, RunCommandLineShellNotFoundError, RunCommandLineTimeoutError } from "@demicodes/agent";
 import { encodeUtf8, errorMessage, isFileNotFoundError, parsePortableJson, stringifyPortableJson } from "@demicodes/utils";
 import { createHash, randomUUID } from "node:crypto";
-import { homedir } from "node:os";
+import { resolveDemiHome } from "@demicodes/provider/credentials-pool";
 import { spawn } from "node:child_process";
+import { homedir } from "node:os";
 import { appendFile, chmod, cp, link, lstat, mkdir, readFile, readdir, readlink, realpath, rename, rm, stat, symlink, utimes, writeFile } from "node:fs/promises";
 //#region src/command-bridge.ts
 /**
@@ -91,16 +92,15 @@ function postRun(socketPath, body) {
 
 async function main() {
   const socketPath = process.env.DEMI_COMMAND_BRIDGE_SOCK
-  // Shell sessions export DEMI_SESSION_ID as the agent session id (command scope).
-  const commandScopeId = process.env.DEMI_AGENT_SESSION_ID || process.env.DEMI_SESSION_ID
-  if (!socketPath || !commandScopeId) {
-    process.stderr.write('command bridge: DEMI_COMMAND_BRIDGE_SOCK / session id not set in this shell\\n')
+  const shellId = process.env.DEMI_SHELL_ID
+  if (!socketPath || !shellId) {
+    process.stderr.write('command bridge: DEMI_COMMAND_BRIDGE_SOCK / shell id not set in this shell\\n')
     process.exit(1)
   }
   const name = basename(process.argv[1] || '')
   const args = process.argv.slice(2)
   const stdin = await readStdin()
-  const body = JSON.stringify({ commandScopeId, name, args, cwd: process.cwd(), stdin })
+  const body = JSON.stringify({ shellId, name, args, cwd: process.cwd(), stdin })
 
   const response = await postRun(socketPath, body)
   if (response.statusCode !== 200) {
@@ -112,7 +112,11 @@ async function main() {
     process.exit(1)
   }
   const result = JSON.parse(response.body)
-  if (result.stdout) process.stdout.write(result.stdout)
+  if (result.stdout) {
+    // Binary final streams arrive base64-encoded; write raw bytes so external
+    // pipes (demi read a.png | ffmpeg -i - ...) stay byte-clean.
+    process.stdout.write(result.stdoutEncoding === 'base64' ? Buffer.from(result.stdout, 'base64') : result.stdout)
+  }
   if (result.stderr) process.stderr.write(result.stderr)
   process.exit(result.exitCode)
 }
@@ -148,7 +152,7 @@ async function handleRun(server, req, res) {
 		return;
 	}
 	if (!isRunRequestBody(body)) {
-		sendJson(res, 400, { error: "bad request: expected { commandScopeId, name, args, cwd, stdin }" });
+		sendJson(res, 400, { error: "bad request: expected { shellId, name, args, cwd, stdin }" });
 		return;
 	}
 	const controller = new AbortController();
@@ -158,7 +162,7 @@ async function handleRun(server, req, res) {
 	};
 	req.on("close", onClosedEarly);
 	try {
-		const result = await server.runCommandLine(body.commandScopeId, body.name, body.args, {
+		const result = await server.runCommandLine(body.shellId, body.name, body.args, {
 			cwd: body.cwd,
 			stdin: body.stdin,
 			signal: controller.signal
@@ -173,14 +177,15 @@ async function handleRun(server, req, res) {
 	}
 }
 function statusForError(error) {
-	if (error instanceof RunCommandLineSessionNotFoundError) return 404;
+	if (error instanceof RunCommandLineShellNotFoundError) return 404;
+	if (error instanceof RunCommandLineCommandNotRegisteredError) return 404;
 	if (error instanceof RunCommandLineTimeoutError) return 504;
 	return 500;
 }
 function isRunRequestBody(value) {
 	if (value === null || typeof value !== "object") return false;
 	const record = value;
-	return typeof record.commandScopeId === "string" && typeof record.name === "string" && Array.isArray(record.args) && record.args.every((arg) => typeof arg === "string") && typeof record.cwd === "string" && typeof record.stdin === "string";
+	return typeof record.shellId === "string" && typeof record.name === "string" && Array.isArray(record.args) && record.args.every((arg) => typeof arg === "string") && typeof record.cwd === "string" && typeof record.stdin === "string";
 }
 function readJsonBody(req) {
 	return new Promise((resolve, reject) => {
@@ -222,7 +227,7 @@ const DISPATCH_PACKAGE_JSON = "{\"type\":\"commonjs\"}\n";
 * component under Host.fs, so it is validated here rather than trusted.
 */
 function assertPathSafeSessionId(agentSessionId) {
-	if (agentSessionId.length === 0 || agentSessionId.includes("/") || agentSessionId.includes("\\") || agentSessionId === "..") throw new Error(`Command bridge: agentSessionId "${agentSessionId}" is not safe to use as a path segment`);
+	if (agentSessionId.length === 0 || agentSessionId.includes("\0") || agentSessionId.includes("/") || agentSessionId.includes("\\") || agentSessionId === "." || agentSessionId === "..") throw new Error(`Command bridge: agentSessionId "${agentSessionId}" is not safe to use as a path segment`);
 }
 /** Fixed relative layout under stateDir. */
 function bridgeBinDirFor(stateDir) {
@@ -256,16 +261,6 @@ async function materializeCommandBridgeShims(options) {
 }
 //#endregion
 //#region src/demi-home.ts
-/**
-* Demi local state root (not the workspace cwd).
-* Override with `DEMI_HOME` or `createLocalAgentServer({ stateDir })`, else `~/.demi`.
-*/
-function resolveDemiHome(explicit) {
-	if (explicit && explicit.trim()) return resolve(explicit.trim());
-	const fromEnv = process.env.DEMI_HOME;
-	if (fromEnv && fromEnv.trim()) return resolve(fromEnv.trim());
-	return join(homedir(), ".demi");
-}
 /** Fixed layout: `<stateDir>/bridges/<id>.sock` (short id for macOS AF_UNIX limits). */
 function defaultBridgeSocketPath(stateDir, serverId = randomUUID().replace(/-/g, "").slice(0, 12)) {
 	return join(stateDir, "bridges", `${serverId}.sock`);
@@ -279,7 +274,8 @@ var LocalHostStore = class {
 	}
 	async readJson(key) {
 		try {
-			return parsePortableJson(await readFile(this.pathForKey(key), "utf8"));
+			const content = await readFile(this.pathForKey(key), "utf8");
+			return parsePortableJson(content);
 		} catch (error) {
 			if (isFileNotFoundError(error)) return null;
 			throw error;
@@ -501,16 +497,16 @@ var LocalHostFileSystem = class {
 		return readdir(target);
 	}
 	async mkdir(path, options) {
-		await mkdir(this.resolvePath(path, options?.cwd), { recursive: options?.recursive });
+		await mkdir(this.resolvePath(path, options?.cwd), { recursive: options?.recursive === true });
 	}
 	async rm(path, options) {
 		await rm(this.resolvePath(path, options?.cwd), {
-			recursive: options?.recursive,
-			force: options?.force
+			recursive: options?.recursive === true,
+			force: options?.force === true
 		});
 	}
 	async cp(path, destination, options) {
-		await cp(this.resolvePath(path, options?.cwd), this.resolvePath(destination, options?.cwd), { recursive: options?.recursive });
+		await cp(this.resolvePath(path, options?.cwd), this.resolvePath(destination, options?.cwd), { recursive: options?.recursive === true });
 	}
 	async mv(path, destination, options) {
 		await rename(this.resolvePath(path, options?.cwd), this.resolvePath(destination, options?.cwd));
@@ -582,7 +578,7 @@ async function* streamBytes(stream) {
 * bridge **on by default**.
 *
 * Owns the Node-only bridge transport (UDS + PATH shims under `stateDir`).
-* AgentServer only receives a generic `prepareSessionShell` hook and exposes
+* AgentServer only receives a generic `prepareShell` hook and exposes
 * `runCommandLine` — it never sees bin dirs or sockets.
 *
 * Default layout under `stateDir` (`~/.demi` or `$DEMI_HOME`):
@@ -615,7 +611,7 @@ function createLocalAgentServer(options) {
 	if (bridgeEnabled && socketPath && stateDir) {
 		const bridgeStateDir = stateDir;
 		const bridgeSocketPath = socketPath;
-		serverOptions.prepareSessionShell = async ({ host, agentSessionId, commandNames, shell }) => {
+		serverOptions.prepareShell = async ({ host, agentSessionId, commandNames, shell }) => {
 			const shimDir = await materializeCommandBridgeShims({
 				host,
 				agentSessionId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@demicodes/host-local",
   "description": "Node LocalHost and open-box local AgentServer assembly (command bridge on by default).",
-  "version": "0.10.3",
+  "version": "0.11.0",
   "private": false,
   "type": "module",
   "exports": {
@@ -11,10 +11,10 @@
     }
   },
   "dependencies": {
-    "@demicodes/agent": "^0.10.3",
-    "@demicodes/provider": "^0.10.3",
-    "@demicodes/shell": "^0.10.3",
-    "@demicodes/utils": "^0.10.3"
+    "@demicodes/agent": "^0.11.0",
+    "@demicodes/provider": "^0.11.0",
+    "@demicodes/shell": "^0.11.0",
+    "@demicodes/utils": "^0.11.0"
   },
   "license": "Apache-2.0",
   "main": "./dist/index.mjs",