@xingular/harness 0.1.4 → 0.1.5

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { resolve as resolve9 } from "node:path";
+import { resolve as resolve10 } from "node:path";
 
 // src/core/bus.ts
 var Bus = class {
@@ -27,7 +27,7 @@ function log(...parts) {
 
 // src/harness.ts
 import { mkdirSync as mkdirSync14 } from "node:fs";
-import { join as join39 } from "node:path";
+import { join as join40 } from "node:path";
 
 // src/accounts/accounts.ts
 import { chmodSync as chmodSync3, rmSync as rmSync2 } from "node:fs";
@@ -200,7 +200,7 @@ var modified = (path3) => {
   }
 };
 function backUp(path3) {
-  const backup2 = join2(dirname2(path3), `${basename2(path3)}.agentx-backup-${Math.floor(Date.now() / 1e3)}`);
+  const backup2 = join2(dirname2(path3), `${basename2(path3)}.xagent-backup-${Math.floor(Date.now() / 1e3)}`);
   renameSync2(path3, backup2);
   return backup2;
 }
@@ -890,9 +890,9 @@ var Accounts = class {
     const interaction = {
       signal: controller.signal,
       notify: (notification) => event(notification),
-      prompt: (prompt2) => new Promise((resolve10, reject) => {
+      prompt: (prompt2) => new Promise((resolve11, reject) => {
         const promptId = randomUUID2();
-        login.prompts.set(promptId, { resolve: resolve10, reject });
+        login.prompts.set(promptId, { resolve: resolve11, reject });
         prompt2.signal?.addEventListener("abort", () => {
           login.prompts.delete(promptId);
           event({ type: "promptClosed", promptId });
@@ -2033,7 +2033,7 @@ function undoLast(wiki, blockId) {
 }
 function render(blocks, caller, cli) {
   if (!blocks.length) return "";
-  const how = cli ? "`agentx-wiki block append <label> <text>`, `block replace <label> --old <text> --new <text>`, or `block rethink <label> <text>`" : "memory_append, memory_replace, or memory_rethink";
+  const how = cli ? "`xagent-wiki block append <label> <text>`, `block replace <label> --old <text> --new <text>`, or `block rethink <label> <text>`" : "memory_append, memory_replace, or memory_rethink";
   return `## Memory blocks
 
 These blocks are your memory that is always in view, and they persist across conversations. When you learn something worth keeping, edit a block you may change with ${how}. Keep each block within its limit.
@@ -2627,6 +2627,12 @@ var contextSnapshotPayload = z.object({
   contextUpdateTruncated: z.boolean().optional(),
   toolsTruncated: z.boolean().optional()
 });
+var toolAttachmentRefSchema = z.object({
+  id: z.string().min(1).max(300),
+  name: z.string().min(1).max(500),
+  mimeType: z.string().min(1).max(100)
+}).strict();
+var toolAttachmentRefsSchema = z.array(toolAttachmentRefSchema).max(16);
 var toolPayload = z.object({
   toolCallId: z.string(),
   name: z.string(),
@@ -2638,7 +2644,9 @@ var toolPayload = z.object({
   ok: z.boolean().optional(),
   /** On `tool.completed`: how long the call ran, and the size of what it returned to the model. */
   durationMs: z.number().optional(),
-  resultChars: z.number().optional()
+  resultChars: z.number().optional(),
+  /** Opaque attachment references. Content stays outside the run event stream. */
+  attachments: toolAttachmentRefsSchema.optional()
 });
 var retryStartedPayload = z.object({ attempt: z.number(), maxAttempts: z.number(), delayMs: z.number(), error: z.string().max(1e3).optional() });
 var retryEndedPayload = z.object({ attempt: z.number(), success: z.boolean(), error: z.string().max(1e3).optional() });
@@ -3743,13 +3751,13 @@ function toolGroups(context, launch) {
       group: "Memory",
       tools: MEMORY_GROUP,
       order: GROUP_ORDER.Memory,
-      guidance: cli ? "Memory: `agentx-wiki block append <label> <text>`, `block replace <label> --old <text> --new <text>`, and `block rethink <label> <text>` edit your memory blocks. `agentx-wiki facts [query]` recalls saved facts. `agentx-wiki history <query>` searches earlier runs and `agentx-wiki history-read <run id>` returns one." : "Memory: memory_append, memory_replace, and memory_rethink edit your memory blocks; memory_facts recalls saved facts. history_search finds what was said and done in earlier conversations and runs, including a chat that was cleared; history_read returns one run."
+      guidance: cli ? "Memory: `xagent-wiki block append <label> <text>`, `block replace <label> --old <text> --new <text>`, and `block rethink <label> <text>` edit your memory blocks. `xagent-wiki facts [query]` recalls saved facts. `xagent-wiki history <query>` searches earlier runs and `xagent-wiki history-read <run id>` returns one." : "Memory: memory_append, memory_replace, and memory_rethink edit your memory blocks; memory_facts recalls saved facts. history_search finds what was said and done in earlier conversations and runs, including a chat that was cleared; history_read returns one run."
     },
     {
       group: "Knowledge",
       tools: KNOWLEDGE_GROUP,
       order: GROUP_ORDER.Knowledge,
-      guidance: cli ? "Knowledge: `agentx-wiki search <query>`, `read <id or path>`, `list [namespace]`, `skill [name]`, and `propose <json>` to record durable knowledge. Cite what you use as [id@revision]." : "Knowledge: wiki_search, wiki_read, and wiki_list read the Wiki; skill_load loads a skill's steps; wiki_propose records durable knowledge, quoting its evidence (the Wiki validates it and may send it to the Inbox). Cite what you use as [id@revision]."
+      guidance: cli ? "Knowledge: `xagent-wiki search <query>`, `read <id or path>`, `list [namespace]`, `skill [name]`, and `propose <json>` to record durable knowledge. Cite what you use as [id@revision]." : "Knowledge: wiki_search, wiki_read, and wiki_list read the Wiki; skill_load loads a skill's steps; wiki_propose records durable knowledge, quoting its evidence (the Wiki validates it and may send it to the Inbox). Cite what you use as [id@revision]."
     },
     {
       group: "Native",
@@ -4320,7 +4328,7 @@ var WIKI_TOOLS = [
     name: "wiki_read",
     call: "wiki.read",
     label: "Read Wiki entry",
-    description: "Read one Wiki page, fact, skill, rule, or prompt in full, with its sources, links, and backlinks. Pass an id (arch, skills/review) or a Wiki path (/projects/agent-x/arch).",
+    description: "Read one Wiki page, fact, skill, rule, or prompt in full, with its sources, links, and backlinks. Pass an id (arch, skills/review) or a Wiki path (/projects/xagent/arch).",
     parameters: { type: "object", properties: { id: text4("Entry id or Wiki path"), revision: text4("Optional pinned revision selected for this reply"), offset: { type: "integer", minimum: 0, description: "Character offset when reading a pinned revision; use nextOffset to continue." } }, required: ["id"] }
   },
   {
@@ -4625,14 +4633,14 @@ var piResolver = async ({ cwd, agentDir, install: install3, packages }) => {
   const settings = pi.SettingsManager.create(cwd, agentDir);
   const shared = new Set((settings.getGlobalSettings().packages ?? []).map((entry) => typeof entry === "string" ? entry : entry.source));
   const manager2 = () => new pi.DefaultPackageManager({ cwd, agentDir, settingsManager: settings, builtinExtensions: [...PI_BUILTINS] });
-  const resolve10 = (installing) => manager2().resolve(async (source2) => installing && shared.has(source2) ? "install" : "skip");
+  const resolve11 = (installing) => manager2().resolve(async (source2) => installing && shared.has(source2) ? "install" : "skip");
   let resolved2;
   try {
-    resolved2 = install3 ? await withoutInstallScripts(() => resolve10(true)) : await resolve10(false);
+    resolved2 = install3 ? await withoutInstallScripts(() => resolve11(true)) : await resolve11(false);
   } catch (error) {
     if (!install3) throw error;
     log("a plugin package could not be installed", error instanceof Error ? error.message : String(error));
-    resolved2 = await resolve10(false);
+    resolved2 = await resolve11(false);
   }
   const found = [];
   const add = (paths) => {
@@ -5173,36 +5181,63 @@ import { isAbsolute as isAbsolute3, join as join27 } from "node:path";
 import { execFileSync } from "node:child_process";
 import { accessSync, constants, statSync as statSync5 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { delimiter, isAbsolute as isAbsolute2, join as join25 } from "node:path";
+import { delimiter, extname, isAbsolute as isAbsolute2, join as join25 } from "node:path";
 var resolved = null;
 function searchPath() {
-  if (resolved !== null) return resolved;
+  const platform = process.platform;
+  const pathKey = pathVariableName(process.env);
+  const inherited = process.env[pathKey] ?? "";
+  if (resolved?.platform === platform && resolved.inherited === inherited) return resolved.path;
+  const separator = pathSeparator(platform);
   const entries2 = [];
-  try {
-    const output = execFileSync(process.env.SHELL || "/bin/zsh", ["-ilc", 'printf %s "$PATH"'], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] });
-    entries2.push(...(output.split("\n").filter(Boolean).at(-1) ?? "").split(delimiter));
-  } catch {
+  if (platform !== "win32") {
+    try {
+      const output = execFileSync(process.env.SHELL || "/bin/zsh", ["-ilc", 'printf %s "$PATH"'], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] });
+      entries2.push(...(output.split("\n").filter(Boolean).at(-1) ?? "").split(separator));
+    } catch {
+    }
+  }
+  entries2.push(...inherited.split(separator));
+  if (platform !== "win32") {
+    const home = homedir3();
+    if (home) entries2.push(...[".local/bin", ".bun/bin", ".npm-global/bin", ".cargo/bin"].map((folder) => join25(home, folder)));
+    entries2.push("/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin");
   }
-  entries2.push(...(process.env.PATH ?? "").split(delimiter));
-  const home = homedir3();
-  if (home) entries2.push(...[".local/bin", ".bun/bin", ".npm-global/bin", ".cargo/bin"].map((folder) => join25(home, folder)));
-  entries2.push("/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin");
-  resolved = [...new Set(entries2.filter(Boolean))].join(delimiter);
-  return resolved;
+  const path3 = [...new Set(entries2.filter(Boolean))].join(separator);
+  resolved = { platform, inherited, path: path3 };
+  return path3;
+}
+function pathVariableName(environment) {
+  return Object.keys(environment).find((name) => name.toLowerCase() === "path") ?? "PATH";
+}
+function prependSearchPath(directory, existing, environment = process.env, platform = process.platform) {
+  const values2 = [directory, existing].filter(Boolean);
+  return { [pathVariableName(environment)]: values2.join(pathSeparator(platform)) };
+}
+function pathSeparator(platform) {
+  return platform === "win32" ? ";" : delimiter;
 }
 function isExecutable(path3) {
   try {
-    accessSync(path3, constants.X_OK);
+    accessSync(path3, process.platform === "win32" ? constants.F_OK : constants.X_OK);
     return statSync5(path3).isFile();
   } catch {
     return false;
   }
 }
 function findBinary(name) {
-  if (isAbsolute2(name)) return isExecutable(name) ? name : null;
-  for (const directory of searchPath().split(delimiter)) {
-    const candidate = join25(directory, name);
-    if (isExecutable(candidate)) return candidate;
+  const platform = process.platform;
+  const suffixes = platform === "win32" && !extname(name) ? (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean) : [];
+  const names = [name, ...suffixes.map((suffix) => `${name}${suffix}`)];
+  if (isAbsolute2(name)) {
+    for (const candidate of names) if (isExecutable(candidate)) return candidate;
+    return null;
+  }
+  for (const directory of searchPath().split(pathSeparator(platform))) {
+    for (const candidateName of names) {
+      const candidate = join25(directory, candidateName);
+      if (isExecutable(candidate)) return candidate;
+    }
   }
   return null;
 }
@@ -5772,7 +5807,7 @@ var Connections = class {
     }
     let command = findBinary(connection.command) ?? (isAbsolute3(connection.command) ? connection.command : null);
     if (!command) throw new HarnessError("mcp_unavailable", "MCP executable was not found. Select its absolute path.");
-    const env = { PATH: searchPath() };
+    const env = { [pathVariableName(process.env)]: searchPath() };
     for (const key of ["HOME", "TMPDIR", "LANG"]) if (process.env[key]) env[key] = process.env[key];
     for (const key of connection.envKeys) {
       const value = await this.secret(connection.id, key);
@@ -6252,8 +6287,8 @@ var cancelActive = null;
 function listenForCallback(expectedState, clientName) {
   return new Promise((ready, failed) => {
     let settle;
-    const result = new Promise((resolve10, reject) => {
-      settle = { resolve: resolve10, reject };
+    const result = new Promise((resolve11, reject) => {
+      settle = { resolve: resolve11, reject };
     });
     result.catch(() => void 0);
     const server = createServer((request2, response3) => {
@@ -6277,7 +6312,7 @@ function listenForCallback(expectedState, clientName) {
       clearTimeout(timer);
       failed(new HarnessError("invalid_request", error.code === "EADDRINUSE" ? `Port ${MCP_OAUTH_PORT} is in use. Finish or cancel the other sign-in, or quit the program using that port, then try again.` : "The sign-in listener could not start."));
     });
-    const closed = new Promise((resolve10) => server.once("close", resolve10));
+    const closed = new Promise((resolve11) => server.once("close", resolve11));
     const close = () => {
       clearTimeout(timer);
       if (cancelActive === cancel) cancelActive = null;
@@ -6359,7 +6394,7 @@ var McpManager = class {
     }
   }
   async connectStdio(config) {
-    const client = new Client({ name: "agent-x", version: "0.1.0" });
+    const client = new Client({ name: "xagent", version: "0.1.0" });
     const transport = new StdioClientTransport({ command: config.command, args: config.args, cwd: config.cwd ?? void 0, env: config.env, stderr: "pipe" });
     try {
       await client.connect(transport, { timeout: 3e4 });
@@ -6375,7 +6410,7 @@ var McpManager = class {
     if (authProvider && !await authProvider.tokens()) throw signInRequired(config);
     const options2 = { authProvider, requestInit: { headers: config.headers } };
     for (const Transport of [StreamableHTTPClientTransport, SSEClientTransport]) {
-      const client = new Client({ name: "agent-x", version: "0.1.0" });
+      const client = new Client({ name: "xagent", version: "0.1.0" });
       const transport = new Transport(new URL(config.url), options2);
       try {
         await client.connect(transport, { timeout: 3e4 });
@@ -8482,7 +8517,7 @@ var RunRegistry = class {
         }
         emit("approval.requested", { approvalId, ...payload });
         emit("status.changed", { status: "waiting_for_approval" });
-        return new Promise((resolve10) => {
+        return new Promise((resolve11) => {
           const timer = timeoutMs ? setTimeout(() => this.approvals.get(approvalId)?.resolve("denied"), timeoutMs) : null;
           this.approvals.set(approvalId, {
             runId,
@@ -8491,7 +8526,7 @@ var RunRegistry = class {
               this.approvals.delete(approvalId);
               emit("approval.resolved", { approvalId, decision });
               emit("status.changed", { status: waitingStatus() });
-              resolve10(decision);
+              resolve11(decision);
             }
           });
         });
@@ -8502,7 +8537,7 @@ var RunRegistry = class {
         if (finished || this.nativeCleared.delete(questionId)) return Promise.resolve({ selected: [] });
         emit("question.requested", { questionId, ...payload });
         emit("status.changed", { status: "waiting_for_input" });
-        return new Promise((resolve10) => {
+        return new Promise((resolve11) => {
           this.questions.set(questionId, {
             runId,
             input,
@@ -8510,7 +8545,7 @@ var RunRegistry = class {
               this.questions.delete(questionId);
               emit("question.answered", { questionId, ...answer });
               emit("status.changed", { status: waitingStatus() });
-              resolve10(answer);
+              resolve11(answer);
             }
           });
         });
@@ -8589,7 +8624,7 @@ var RunRegistry = class {
   }
   /** Interrupts every live run, giving each a moment to stop cleanly. */
   async interruptAll(timeoutMs = 3e3) {
-    await Promise.race([Promise.allSettled(this.activeRunIds().map((id) => this.interrupt(id))), new Promise((resolve10) => setTimeout(resolve10, timeoutMs))]);
+    await Promise.race([Promise.allSettled(this.activeRunIds().map((id) => this.interrupt(id))), new Promise((resolve11) => setTimeout(resolve11, timeoutMs))]);
   }
   resolveApproval(runId, approvalId, decision) {
     if (decision !== "approved" && decision !== "denied" && decision !== "native") throw new HarnessError("invalid_request", "Unknown decision.");
@@ -8789,7 +8824,7 @@ ${text6}`);
 async function waitForChildren(root, runId, signal) {
   while (!signal?.aborted) {
     if (settled(root, runId)) return true;
-    await new Promise((resolve10) => setTimeout(resolve10, 250));
+    await new Promise((resolve11) => setTimeout(resolve11, 250));
   }
   return false;
 }
@@ -8870,11 +8905,11 @@ var MAX_TEXT = 4e3;
 var clip2 = (text6) => text6.length > MAX_TEXT ? `${text6.slice(0, MAX_TEXT)}\u2026` : text6;
 function dismissable(answer, fallback, options2) {
   if (!options2?.signal && !options2?.timeout) return answer;
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     let timer;
     const done = (value) => {
       if (timer) clearTimeout(timer);
-      resolve10(value);
+      resolve11(value);
     };
     if (options2.signal?.aborted) return done(fallback);
     options2.signal?.addEventListener("abort", () => done(fallback), { once: true });
@@ -8995,6 +9030,12 @@ function evidenceText2(value) {
     return String(value);
   }
 }
+function toolAttachmentRefs(result) {
+  const details = result?.details;
+  const refs = details && typeof details === "object" ? details.attachments : void 0;
+  const parsed2 = toolAttachmentRefsSchema.safeParse(refs);
+  return parsed2.success && parsed2.data.length ? parsed2.data : void 0;
+}
 function boundedSchema(value, budget, depth = 0) {
   if (budget.remaining <= 0 || depth > 12) return { value: "[truncated]", truncated: true };
   if (typeof value === "string") {
@@ -9177,12 +9218,14 @@ async function runTurn(run3, session, params) {
         const resultChars = resultSize(tool.result);
         const output = evidenceText2(tool.result);
         const boundedOutput = output === null ? null : limitedText(output);
+        const attachments = toolAttachmentRefs(tool.result);
         run3.emit("tool.completed", {
           toolCallId: tool.toolCallId,
           name: tool.toolName,
           ok: !tool.isError,
           ...started === void 0 ? {} : { durationMs: Date.now() - started },
           ...resultChars === null ? {} : { resultChars },
+          ...attachments ? { attachments } : {},
           ...boundedOutput ? { output: boundedOutput.text, ...boundedOutput.truncated ? { outputTruncated: true } : {} } : {}
         });
         break;
@@ -9259,7 +9302,7 @@ async function loadResources(pi, params, gate, automaticSettings) {
     agentDir: params.account.configDir,
     // Inline extensions load after the ones on disk, and the gate after all of them, so it sees
     // what every plugin made of a call.
-    extensionFactories: [...(params.inline ?? []).map((extension) => ({ name: extension.name, factory: extension.factory, hidden: true })), { name: "agent-x-approvals", factory: gate, hidden: true }],
+    extensionFactories: [...(params.inline ?? []).map((extension) => ({ name: extension.name, factory: extension.factory, hidden: true })), { name: "xagent-approvals", factory: gate, hidden: true }],
     additionalSkillPaths: [...params.resources?.skillPaths ?? [], ...loading?.skillPaths ?? []],
     additionalPromptTemplatePaths: [...params.resources?.promptPaths ?? [], ...loading?.promptPaths ?? []],
     // The compiler writes one prompt; nothing else is appended here.
@@ -9313,7 +9356,10 @@ var piSessionFactory = async ({ params, allow, gate, tools: tools3, runtime: loa
         const result = await spec.execute(input);
         const output = typeof result === "string" ? { text: result } : result;
         if (output.image && !supportsImageInput) throw new HarnessError("image_input_unsupported", "This model cannot inspect images. Choose a model that supports image input.");
-        return { content: [{ type: "text", text: output.text }, ...output.image ? [{ type: "image", data: output.image.data, mimeType: output.image.mimeType }] : []], details: {} };
+        return {
+          content: [{ type: "text", text: output.text }, ...output.image ? [{ type: "image", data: output.image.data, mimeType: output.image.mimeType }] : []],
+          details: output.attachments?.length ? { attachments: output.attachments } : {}
+        };
       }
     })
   );
@@ -9546,8 +9592,8 @@ var Sessions = class {
 };
 
 // src/terminal/terminals.ts
-import { chmodSync as chmodSync11, existsSync as existsSync14, mkdirSync as mkdirSync13, readFileSync as readFileSync19, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname13, join as join38 } from "node:path";
+import { chmodSync as chmodSync11, existsSync as existsSync15, lstatSync as lstatSync4, mkdirSync as mkdirSync13, readFileSync as readFileSync20, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
+import { dirname as dirname13, join as join39 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/terminal/client.ts
@@ -9567,7 +9613,7 @@ function connectionFromEnv(env = process.env) {
   return { socket, token };
 }
 function request(connection, body2, what, timeoutMs) {
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve11, reject) => {
     const stream = createConnection(connection.socket);
     let buffer = "";
     let settled2 = false;
@@ -9593,7 +9639,7 @@ function request(connection, body2, what, timeoutMs) {
         if (reply.error) {
           const error = typeof reply.error === "string" ? { message: reply.error } : reply.error;
           finish(() => reject(new SocketError(error.code ?? "error", error.message ?? `${what} failed.`)));
-        } else finish(() => resolve10(reply.result));
+        } else finish(() => resolve11(reply.result));
       } catch {
         finish(() => reject(new SocketError("invalid_reply", "The harness sent an unreadable reply.")));
       }
@@ -9607,8 +9653,8 @@ function socketCall(connection, call, params = {}, timeoutMs = 12e4, control) {
 }
 
 // src/terminal/cli.ts
-var WIKI_COMMAND = "agentx-wiki";
-var APPS_COMMAND = "agentx-mcp";
+var WIKI_COMMAND = "xagent-wiki";
+var APPS_COMMAND = "xagent-mcp";
 var USAGE = `Usage: ${WIKI_COMMAND} <command> [arguments]
 
   entrypoint                         Your context pack: memory blocks, rules, skills, project map
@@ -9797,15 +9843,15 @@ var TerminalController = class {
     if (this.disposed) throw new HarnessError("terminal_not_ready", "Reopen the terminal before sending instructions.");
     if (this.activeRun || this.delivery) throw new HarnessError("session_busy", "This terminal has an active task or delivery.");
     const deadline = Date.now() + READY_TIMEOUT_MS;
-    while (!this.ready && !this.startupError && !this.disposed && Date.now() < deadline) await new Promise((resolve10) => setTimeout(resolve10, 50));
+    while (!this.ready && !this.startupError && !this.disposed && Date.now() < deadline) await new Promise((resolve11) => setTimeout(resolve11, 50));
     if (this.disposed) throw new HarnessError("terminal_not_ready", "The terminal stopped during initialization.");
     if (this.startupError) throw new HarnessError("terminal_not_ready", this.startupError);
     if (!this.ready) throw new HarnessError("terminal_not_ready", `The native telemetry handshake is missing (${this.startupPhase}). Inspect the terminal sign-in or trust screen.`);
     if (this.dirty) throw new HarnessError("terminal_has_draft", "The terminal contains user input. Submit or clear it before handing back control.");
     let timer;
-    const ack = new Promise((resolve10, reject) => {
+    const ack = new Promise((resolve11, reject) => {
       timer = setTimeout(() => reject(new HarnessError("delivery_uncertain", "The native prompt acknowledgement was not received. Inspect the terminal; this instruction will not be resent.")), ACK_TIMEOUT_MS);
-      this.delivery = { runId, text: text6, resolve: resolve10, reject };
+      this.delivery = { runId, text: text6, resolve: resolve11, reject };
     });
     void ack.catch(() => {
     });
@@ -9920,19 +9966,86 @@ var TerminalController = class {
   }
 };
 
+// src/terminal/launch.ts
+import { existsSync as existsSync14, readFileSync as readFileSync19 } from "node:fs";
+import { createRequire } from "node:module";
+import { join as join37, resolve as resolve6 } from "node:path";
+var PI_PACKAGE = "@earendil-works/pi-coding-agent";
+function bundledPiCli() {
+  const require2 = createRequire(import.meta.url);
+  for (const nodeModules of require2.resolve.paths(PI_PACKAGE) ?? []) {
+    const directory = join37(nodeModules, ...PI_PACKAGE.split("/"));
+    const manifestPath = join37(directory, "package.json");
+    if (!existsSync14(manifestPath)) continue;
+    try {
+      const manifest = JSON.parse(readFileSync19(manifestPath, "utf8"));
+      if (manifest.name === PI_PACKAGE) {
+        const executable = typeof manifest.bin === "string" ? manifest.bin : manifest.bin && typeof manifest.bin === "object" && typeof manifest.bin.pi === "string" ? manifest.bin.pi : null;
+        if (!executable) throw new Error("the package does not declare its pi command");
+        const cli = resolve6(directory, executable);
+        if (!existsSync14(cli)) throw new Error(`the declared command does not exist at ${cli}`);
+        return cli;
+      }
+    } catch {
+      continue;
+    }
+  }
+  throw new HarnessError("harness_unavailable", `The bundled ${PI_PACKAGE} package does not expose a usable pi command. Reinstall the Harness package and try again.`);
+}
+function resolvePiCommand(options2) {
+  if (options2.programOverride) {
+    const program2 = options2.programOverride();
+    if (!program2) throw new HarnessError("harness_unavailable", "The Pi CLI was not found on PATH.");
+    return { program: program2, argsPrefix: [] };
+  }
+  if (options2.platform === "win32") return { program: options2.node, argsPrefix: [bundledPiCli()] };
+  const program = findBinary("pi");
+  if (!program) throw new HarnessError("harness_unavailable", "The Pi CLI was not found on PATH.");
+  return { program, argsPrefix: [] };
+}
+function bashPath(path3) {
+  const drive = /^([a-z]):[\\/](.*)$/i.exec(path3);
+  if (drive) return `/${drive[1].toLowerCase()}/${drive[2].replaceAll("\\", "/")}`;
+  if (path3.startsWith("\\\\")) return `//${path3.slice(2).replaceAll("\\", "/")}`;
+  return path3;
+}
+function shellQuote(value) {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
+function terminalCommandFiles(platform, node, cli, name, mode) {
+  const shellNode = platform === "win32" ? bashPath(node) : node;
+  const shellCli = platform === "win32" ? bashPath(cli) : cli;
+  const files = [{
+    name,
+    content: `#!/bin/sh
+exec ${shellQuote(shellNode)} ${shellQuote(shellCli)} ${mode} "$@"
+`
+  }];
+  if (platform === "win32") {
+    files.push({
+      name: `${name}.cmd`,
+      content: `@echo off\r
+"%XINGULAR_HARNESS_NODE%" "%XINGULAR_HARNESS_CLI%" ${mode} %*\r
+exit /b %ERRORLEVEL%\r
+`
+    });
+  }
+  return files;
+}
+
 // src/terminal/socket.ts
 import { createHash as createHash7, randomBytes } from "node:crypto";
 import { chmodSync as chmodSync10, mkdirSync as mkdirSync12, rmSync as rmSync8, statSync as statSync6 } from "node:fs";
 import { createServer as createServer2 } from "node:net";
 import { tmpdir } from "node:os";
-import { dirname as dirname12, join as join37 } from "node:path";
+import { dirname as dirname12, join as join38 } from "node:path";
 var MAX_REQUEST_BYTES = 1024 * 1024;
 var MAX_SOCKET_PATH = 100;
 function socketPath(stateDir) {
   if (process.platform === "win32") return `\\\\.\\pipe\\xingular-harness-${randomBytes(12).toString("hex")}`;
-  const path3 = join37(stateDir, "run", "harness.sock");
+  const path3 = join38(stateDir, "run", "harness.sock");
   if (Buffer.byteLength(path3) <= MAX_SOCKET_PATH) return path3;
-  return join37(tmpdir(), `xh-${createHash7("sha256").update(path3).digest("hex").slice(0, 16)}.sock`);
+  return join38(tmpdir(), `xh-${createHash7("sha256").update(path3).digest("hex").slice(0, 16)}.sock`);
 }
 var isPipePath = (path3) => path3.startsWith("\\\\.\\pipe\\");
 function refusedBind(path3, error) {
@@ -10054,7 +10167,7 @@ var SessionSocket = class {
   }
   /** Binds the socket once; later calls wait for the same bind. */
   listen() {
-    this.listening ??= new Promise((resolve10, reject) => {
+    this.listening ??= new Promise((resolve11, reject) => {
       if (!isPipePath(this.path)) {
         mkdirSync12(dirname12(this.path), { recursive: true, mode: 448 });
         rmSync8(this.path, { force: true });
@@ -10073,7 +10186,7 @@ var SessionSocket = class {
           }
         }
         this.server = server;
-        resolve10();
+        resolve11();
       });
     });
     return this.listening;
@@ -10084,7 +10197,7 @@ var SessionSocket = class {
     this.server = null;
     this.listening = null;
     for (const client of this.clients) client.destroy();
-    if (server) await new Promise((resolve10) => server.close(() => resolve10()));
+    if (server) await new Promise((resolve11) => server.close(() => resolve11()));
     if (!isPipePath(this.path)) rmSync8(this.path, { force: true });
   }
 };
@@ -10092,8 +10205,8 @@ var SessionSocket = class {
 // src/terminal/terminals.ts
 function defaultAssets() {
   const here = dirname13(fileURLToPath(import.meta.url));
-  const dist = [here, join38(here, "..", "..", "dist"), join38(here, "..", "dist")].find((folder) => existsSync14(join38(folder, "terminal-pi.js"))) ?? here;
-  return { node: process.execPath, cli: join38(dist, "cli.js"), piExtension: join38(dist, "terminal-pi.js") };
+  const dist = [here, join39(here, "..", "..", "dist"), join39(here, "..", "dist")].find((folder) => existsSync15(join39(folder, "terminal-pi.js"))) ?? here;
+  return { node: process.execPath, cli: join39(dist, "cli.js"), piExtension: join39(dist, "terminal-pi.js") };
 }
 var READ_ONLY_TOOLS = /* @__PURE__ */ new Set(["read", "grep", "find", "ls"]);
 var Terminals = class {
@@ -10111,23 +10224,28 @@ var Terminals = class {
   assets;
   /** The commands a terminal session finds on PATH. Rewritten only when they change. */
   ensureCommands() {
-    const bin = join38(this.options.stateDir, "run", "bin");
+    const bin = join39(this.options.stateDir, "run", "bin");
     mkdirSync13(bin, { recursive: true });
-    const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
-    for (const [name, mode] of [[WIKI_COMMAND, "wiki"], [APPS_COMMAND, "mcp"]]) {
-      const wrapper = join38(bin, name);
-      const text6 = `#!/bin/sh
-exec ${quote(this.assets.node)} ${quote(this.assets.cli)} ${mode} "$@"
-`;
-      let current = null;
+    for (const name of ["agentx-wiki", "agentx-mcp", "agentx-wiki.cmd", "agentx-mcp.cmd"]) {
+      const path3 = join39(bin, name);
       try {
-        current = readFileSync19(wrapper, "utf8");
+        if (lstatSync4(path3).isFile()) unlinkSync4(path3);
       } catch {
-        current = null;
       }
-      if (current !== text6) {
-        writeFileSync3(wrapper, text6);
-        chmodSync11(wrapper, 493);
+    }
+    for (const [name, mode] of [[WIKI_COMMAND, "wiki"], [APPS_COMMAND, "mcp"]]) {
+      for (const file of terminalCommandFiles(process.platform, this.assets.node, this.assets.cli, name, mode)) {
+        const path3 = join39(bin, file.name);
+        let current = null;
+        try {
+          current = readFileSync20(path3, "utf8");
+        } catch {
+          current = null;
+        }
+        if (current !== file.content) {
+          writeFileSync3(path3, file.content);
+          chmodSync11(path3, 493);
+        }
       }
     }
     return bin;
@@ -10194,7 +10312,7 @@ exec ${quote(this.assets.node)} ${quote(this.assets.cli)} ${mode} "$@"
     return live;
   }
   historyDir(input) {
-    return join38(input.sessionFolder, "pi");
+    return join39(input.sessionFolder, "pi");
   }
   runRecord(live, runId, text6) {
     const { input } = live;
@@ -10269,8 +10387,7 @@ exec ${quote(this.assets.node)} ${quote(this.assets.cli)} ${mode} "$@"
     const { root } = env;
     if (!input?.sessionId || !input.cwd || !input.sessionFolder) throw invalid("A terminal session needs an id, a working folder, and its own folder.");
     await this.dispose(input.sessionId);
-    const program = this.options.program ? this.options.program() : findBinary("pi");
-    if (!program) throw new HarnessError("harness_unavailable", "The Pi CLI was not found on PATH.");
+    const command = resolvePiCommand({ platform: process.platform, node: this.assets.node, programOverride: this.options.program });
     const account = input.accountId ? accounts.find(input.accountId) : accounts.resolve(null, null);
     const launch = launchEnv(accounts.dir, account);
     const loading = await this.options.plugins?.loading({ cwd: input.cwd, agentDir: configDir(accounts.dir, account), install: true, caller: { projectId: input.projectId ?? null } }) ?? null;
@@ -10308,7 +10425,7 @@ exec ${quote(this.assets.node)} ${quote(this.assets.cli)} ${mode} "$@"
       });
       live.token = token;
       this.sessions.set(sessionId, live);
-      const args = ["--append-system-prompt", render2(env, pack)];
+      const args = [...command.argsPrefix, "--append-system-prompt", render2(env, pack)];
       if (input.model) args.push("--model", input.model);
       if (loading) {
         args.push("--no-extensions", "--no-skills", "--no-prompt-templates", "--no-themes");
@@ -10321,9 +10438,15 @@ exec ${quote(this.assets.node)} ${quote(this.assets.cli)} ${mode} "$@"
       args.push("--extension", this.assets.piExtension, "--session-dir", this.historyDir(input));
       if (input.nativeSessionId) args.push("--session", input.nativeSessionId);
       return {
-        program,
+        program: command.program,
         args,
-        env: { ...launch, PATH: `${this.ensureCommands()}:${searchPath()}`, [SOCKET_ENV]: this.socket.path, [TOKEN_ENV]: token },
+        env: {
+          ...launch,
+          ...process.platform === "win32" ? { XINGULAR_HARNESS_NODE: this.assets.node, XINGULAR_HARNESS_CLI: this.assets.cli } : {},
+          ...prependSearchPath(this.ensureCommands(), searchPath()),
+          [SOCKET_ENV]: this.socket.path,
+          [TOKEN_ENV]: token
+        },
         accountId: account.id,
         nativeSessionId: input.nativeSessionId ?? null
       };
@@ -10426,12 +10549,12 @@ var Harness = class {
   constructor(options2) {
     this.stateDir = options2.stateDir;
     mkdirSync14(this.stateDir, { recursive: true });
-    isolateProcess(join39(this.stateDir, "accounts"));
+    isolateProcess(join40(this.stateDir, "accounts"));
     this.env = new Env(options2.dataRoot || null, options2.directory ?? EMPTY_DIRECTORY, options2.productName ?? DEFAULT_PRODUCT_NAME, this.bus);
     this.policy = options2.policy ?? {};
     configureBuiltins(options2.builtins ?? []);
-    const secrets = options2.secrets ?? fileSecretStore(join39(this.stateDir, "secrets.json"));
-    this.accounts = new Accounts({ dir: join39(this.stateDir, "accounts"), secrets, bus: this.bus });
+    const secrets = options2.secrets ?? fileSecretStore(join40(this.stateDir, "secrets.json"));
+    this.accounts = new Accounts({ dir: join40(this.stateDir, "accounts"), secrets, bus: this.bus });
     this.approvals = new Approvals(this.stateDir, this.bus);
     this.runs = new RunRegistry({
       root: () => this.env.root,
@@ -10443,7 +10566,7 @@ var Harness = class {
       ended: (runId, sessionId) => this.apps.revokeRun(runId, sessionId)
     });
     this.apps = new ConnectedApps({ env: this.env, stateDir: this.stateDir, secrets, bus: this.bus, runs: this.runs, policy: this.policy });
-    this.plugins = new Plugins({ stateDir: this.stateDir, bus: this.bus, resolver: options2.resolver, attachments: () => this.env.dataRoot ? load2(this.env.dataRoot) : null, packagesDir: () => this.env.dataRoot ? join39(this.env.dataRoot, "plugins") : null });
+    this.plugins = new Plugins({ stateDir: this.stateDir, bus: this.bus, resolver: options2.resolver, attachments: () => this.env.dataRoot ? load2(this.env.dataRoot) : null, packagesDir: () => this.env.dataRoot ? join40(this.env.dataRoot, "plugins") : null });
     this.hooks = new Hooks({
       stateDir: this.stateDir,
       bus: this.bus,
@@ -10451,9 +10574,9 @@ var Harness = class {
       // The shared folder stands in for an account: packages are the same for all of them.
       wanted: async () => {
         if (!this.env.dataRoot) return [];
-        const shared = ensureSharedDir(join39(this.stateDir, "accounts"));
-        const named2 = readJsonOr(join39(shared, "settings.json"), {}).packages;
-        if (!packageFolders(join39(this.env.dataRoot, "plugins")).length && !(Array.isArray(named2) && named2.length)) return [];
+        const shared = ensureSharedDir(join40(this.stateDir, "accounts"));
+        const named2 = readJsonOr(join40(shared, "settings.json"), {}).packages;
+        if (!packageFolders(join40(this.env.dataRoot, "plugins")).length && !(Array.isArray(named2) && named2.length)) return [];
         return (await this.plugins.loading({ cwd: this.stateDir, agentDir: shared, caller: {} })).hooks;
       },
       call: (connection, tool, args) => this.apps.callUnattended(connection, tool, args ?? {}),
@@ -10512,7 +10635,7 @@ var Harness = class {
     const root = dataRoot;
     this.hooks.watch(wikiDir(root));
     void this.hooks.reload();
-    for (const folder of ["registry/skills", "registry/prompts", "registry/rules", "config", "runs"]) mkdirSync14(join39(root, folder), { recursive: true });
+    for (const folder of ["registry/skills", "registry/prompts", "registry/rules", "config", "runs"]) mkdirSync14(join40(root, folder), { recursive: true });
     let migrationError = null;
     let wikiMigrationError = null;
     try {
@@ -10587,18 +10710,18 @@ function createHarness(options2) {
 
 // src/plugins/cli.ts
 import { homedir as homedir5 } from "node:os";
-import { join as join41, resolve as resolve7 } from "node:path";
+import { join as join42, resolve as resolve8 } from "node:path";
 import { createInterface } from "node:readline/promises";
 
 // src/plugins/install.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync15, renameSync as renameSync8, statSync as statSync7 } from "node:fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync15, renameSync as renameSync8, statSync as statSync7 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { basename as basename8, isAbsolute as isAbsolute5, join as join40, resolve as resolve6 } from "node:path";
+import { basename as basename8, isAbsolute as isAbsolute5, join as join41, resolve as resolve7 } from "node:path";
 function normalizeSource(input) {
   const source2 = input.trim();
   if (!source2) throw invalid("Name a package: a folder, an npm name, or a git address.");
-  if (source2.startsWith("~/")) return join40(process.env.HOME || homedir4(), source2.slice(2));
-  if (isAbsolute5(source2)) return resolve6(source2);
+  if (source2.startsWith("~/")) return join41(process.env.HOME || homedir4(), source2.slice(2));
+  if (isAbsolute5(source2)) return resolve7(source2);
   if (source2.startsWith("./") || source2.startsWith("../")) throw invalid("Give the whole path of the folder.");
   return /^(npm:|git:|https?:\/\/|ssh:\/\/|git@)/.test(source2) ? source2 : `npm:${source2}`;
 }
@@ -10611,7 +10734,7 @@ async function manager(harness) {
 var changed = (harness) => harness.bus.emit({ type: "plugins.changed" });
 async function install2(harness, params) {
   const source2 = normalizeSource(params.source);
-  if (isAbsolute5(source2) && !(existsSync15(source2) && statSync7(source2).isDirectory())) throw invalid("That folder does not exist.");
+  if (isAbsolute5(source2) && !(existsSync16(source2) && statSync7(source2).isDirectory())) throw invalid("That folder does not exist.");
   await ensureAdopted(harness);
   const before = new Set((await list2(harness, params)).map((plugin) => plugin.id));
   const { settings, packages } = await manager(harness);
@@ -10641,9 +10764,9 @@ function installed(plugins, pluginId) {
 async function remove(harness, params) {
   const plugin = installed(await list2(harness, params), params.pluginId);
   if (plugin.install.kind === "folder") {
-    const trash = join40(harness.env.root, "trash", "plugins");
+    const trash = join41(harness.env.root, "trash", "plugins");
     mkdirSync15(trash, { recursive: true });
-    renameSync8(plugin.install.source, join40(trash, `${basename8(plugin.install.source)}-${now().replace(/[:.]/g, "-")}`));
+    renameSync8(plugin.install.source, join41(trash, `${basename8(plugin.install.source)}-${now().replace(/[:.]/g, "-")}`));
   } else {
     await (await manager(harness)).packages.removeAndPersist(plugin.install.source);
   }
@@ -10732,10 +10855,10 @@ async function runPluginsCli(argv, dependencies = {}) {
     return command ? 0 : 2;
   }
   const base = dependencies.cwd ?? process.cwd();
-  const root = join41(dependencies.home ?? homedir5(), ".xingular-harness");
-  const options2 = { dataRoot: parsed2.values.data ? resolve7(base, parsed2.values.data) : join41(root, "data"), stateDir: parsed2.values.state ? resolve7(base, parsed2.values.state) : join41(root, "state"), productName: "Xingular Harness" };
+  const root = join42(dependencies.home ?? homedir5(), ".xingular-harness");
+  const options2 = { dataRoot: parsed2.values.data ? resolve8(base, parsed2.values.data) : join42(root, "data"), stateDir: parsed2.values.state ? resolve8(base, parsed2.values.state) : join42(root, "state"), productName: "Xingular Harness" };
   const harness = dependencies.createHarness ? dependencies.createHarness(options2) : new Harness(options2);
-  const scope = { cwd: parsed2.values.cwd ? resolve7(base, parsed2.values.cwd) : null };
+  const scope = { cwd: parsed2.values.cwd ? resolve8(base, parsed2.values.cwd) : null };
   const need = (what) => {
     if (!target) throw new Error(`${command} needs ${what}.`);
     return target;
@@ -10921,7 +11044,7 @@ var RpcPeer = class {
   /** Asks the host to perform a named operation. */
   callHost(call, params, timeoutMs = 3e4) {
     const id = `s${++this.nextCallId}`;
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve11, reject) => {
       const timer = setTimeout(() => {
         this.pendingCalls.delete(id);
         reject(new HarnessError("host_timeout", `The host did not answer ${call}.`));
@@ -10929,7 +11052,7 @@ var RpcPeer = class {
       this.pendingCalls.set(id, {
         resolve: (value) => {
           clearTimeout(timer);
-          resolve10(value);
+          resolve11(value);
         },
         reject: (error) => {
           clearTimeout(timer);
@@ -10980,7 +11103,7 @@ var RpcPeer = class {
 };
 
 // src/server/methods.ts
-import { readFileSync as readFileSync20, statSync as statSync8 } from "node:fs";
+import { readFileSync as readFileSync21, statSync as statSync8 } from "node:fs";
 import { basename as basename9 } from "node:path";
 
 // src/memory/graph.ts
@@ -11195,7 +11318,7 @@ function methods(harness) {
     "wiki.ingest": (params) => {
       const path3 = text5(params, "path");
       if (statSync8(path3).size > MAX_SOURCE_BYTES) throw invalid("Sources larger than 50 MB are not imported.");
-      const source2 = maintenance.ingest(optional2(params, "name") ?? basename9(path3), readFileSync20(path3), optional2(params, "namespace") ?? LIBRARY_NAMESPACE);
+      const source2 = maintenance.ingest(optional2(params, "name") ?? basename9(path3), readFileSync21(path3), optional2(params, "namespace") ?? LIBRARY_NAMESPACE);
       harness.bus.emit({ type: "wiki.changed" });
       return source2;
     },
@@ -11360,17 +11483,17 @@ function attach3(harness, peer) {
 import { spawn as nodeSpawn } from "node:child_process";
 import { createHash as createHash8, randomUUID as randomUUID8 } from "node:crypto";
 import { homedir as homedir6 } from "node:os";
-import { isAbsolute as isAbsolute6, join as join42, resolve as resolve8 } from "node:path";
+import { isAbsolute as isAbsolute6, join as join43, resolve as resolve9 } from "node:path";
 function standaloneArguments(argv) {
   const command = argv[0];
   if (!command || command.startsWith("--") || command === "-h") return argv;
   return command === "terminal" ? argv.slice(1) : null;
 }
 function parseStandaloneOptions(argv, home = homedir6(), cwd = process.cwd()) {
-  const root = join42(home, ".xingular-harness");
+  const root = join43(home, ".xingular-harness");
   const paths = {
-    dataRoot: join42(root, "data"),
-    stateDir: join42(root, "state")
+    dataRoot: join43(root, "data"),
+    stateDir: join43(root, "state")
   };
   const given = /* @__PURE__ */ new Set();
   for (let index = 0; index < argv.length; index += 1) {
@@ -11378,7 +11501,7 @@ function parseStandaloneOptions(argv, home = homedir6(), cwd = process.cwd()) {
     if (argument !== "--data" && argument !== "--state") throw new Error(`Unknown standalone option: ${argument}`);
     const value = argv[index + 1];
     if (!value || value.startsWith("--")) throw new Error(`${argument} needs a directory path.`);
-    paths[argument === "--data" ? "dataRoot" : "stateDir"] = resolve8(cwd, value);
+    paths[argument === "--data" ? "dataRoot" : "stateDir"] = resolve9(cwd, value);
     given.add(argument);
     index += 1;
   }
@@ -11402,6 +11525,15 @@ function exitCode(code, signal) {
   if (signal === "SIGHUP") return 129;
   return 1;
 }
+function spawnError(error, launch) {
+  const code = error.code;
+  if (code !== "ENOENT" && code !== "EACCES" && code !== "EPERM") return error;
+  if (launch.program === process.execPath || launch.env.XINGULAR_HARNESS_NODE === launch.program) {
+    return new Error(`Could not start the Pi terminal because Node could not run "${launch.args[0] ?? "the bundled Pi CLI"}" (${code}). Verify Node and the bundled Pi package are installed.`, { cause: error });
+  }
+  const problem = code === "ENOENT" ? "was not found" : `could not start (${code})`;
+  return new Error(`Could not start Pi terminal. Pi executable "${launch.program}" ${problem}; verify it is installed and executable or check the configured terminal executable.`, { cause: error });
+}
 function spawnPi(launch, cwd, spawn = nodeSpawn) {
   return new Promise((resolveExit, reject) => {
     const child = spawn(launch.program, launch.args, {
@@ -11429,7 +11561,7 @@ function spawnPi(launch, cwd, spawn = nodeSpawn) {
     process.on("SIGINT", onInterrupt);
     process.on("SIGTERM", onTerminate);
     process.on("SIGHUP", onHangup);
-    child.once("error", (error) => finish(() => reject(error)));
+    child.once("error", (error) => finish(() => reject(spawnError(error, launch))));
     child.once("exit", (code, signal) => finish(() => resolveExit(exitCode(code, signal))));
   });
 }
@@ -11437,7 +11569,7 @@ async function runStandaloneTerminal(argv, dependencies = {}) {
   if (!(dependencies.stdinIsTTY ?? process.stdin.isTTY) || !(dependencies.stdoutIsTTY ?? process.stdout.isTTY)) {
     throw new Error("The interactive Harness terminal needs a TTY. Run it from a terminal, or use `xingular-harness serve` for a host process.");
   }
-  const cwd = resolve8(dependencies.cwd ?? process.cwd());
+  const cwd = resolve9(dependencies.cwd ?? process.cwd());
   const paths = parseStandaloneOptions(argv, dependencies.home, cwd);
   const makeHarness = dependencies.createHarness ?? createHarness;
   const harness = makeHarness({ dataRoot: paths.dataRoot, stateDir: paths.stateDir, productName: "Xingular Harness" });
@@ -11446,7 +11578,7 @@ async function runStandaloneTerminal(argv, dependencies = {}) {
     await harness.ready;
     if (harness.accounts.overview().accounts.length === 0) harness.accounts.create("Default", "subscription");
     const cwdHash = createHash8("sha256").update(cwd).digest("hex");
-    const sessionFolder = join42(paths.dataRoot, "sessions", "terminal", cwdHash);
+    const sessionFolder = join43(paths.dataRoot, "sessions", "terminal", cwdHash);
     const launch = await harness.terminals.prepare({ sessionId, cwd, sessionFolder });
     return await spawnPi(launch, cwd, dependencies.spawn);
   } finally {
@@ -11494,11 +11626,11 @@ function serveCommand(argv) {
     process.stderr.write("serve needs --state <dir>.\n");
     return Promise.resolve(2);
   }
-  const stateDir = resolve9(stateArgument);
+  const stateDir = resolve10(stateArgument);
   const peer = new RpcPeer(stdioTransport());
   const options2 = {
     stateDir,
-    dataRoot: values2.data?.[0] ? resolve9(values2.data[0]) : null,
+    dataRoot: values2.data?.[0] ? resolve10(values2.data[0]) : null,
     productName: values2.name?.[0],
     builtins: values2.builtins,
     ...switches.has("host-secrets") ? { secrets: remoteSecrets(peer) } : {},
@@ -11508,12 +11640,12 @@ function serveCommand(argv) {
   const harness = createHarness(options2);
   if (switches.has("host-tools")) harness.sessions.provide(remoteTools(peer));
   attach3(harness, peer);
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     let closing = false;
     const shutdown = () => {
       if (closing) return;
       closing = true;
-      void Promise.race([harness.close(), new Promise((done) => setTimeout(done, 5e3))]).then(() => resolve10(0));
+      void Promise.race([harness.close(), new Promise((done) => setTimeout(done, 5e3))]).then(() => resolve11(0));
     };
     peer.handle("harness.shutdown", () => void setImmediate(shutdown));
     process.stdin.on("end", shutdown);