office-core 0.1.3 → 0.1.4

package/.runtime-dist/scripts/home-agent-host.js

@@ -187,6 +187,7 @@ async function processRoomMessages(runtime) {
         hooks.onRoomMessage?.(message, runtime);
         if (message.author_type === "system") {
             runtime.roomCursorSeq = Math.max(runtime.roomCursorSeq, message.seq);
+            await persistRoomCursor(runtime);
             continue;
         }
         const runnableSessions = Array.from(sessions.values()).filter((session) => session.status === "running");

package/.runtime-dist/scripts/install-host.js

@@ -7,14 +7,14 @@ import { getHostConfigPath, getStartupLauncherPath, upsertHostConfig, } from "./
 const args = parseArgs(process.argv.slice(2));
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 void main().catch((error) => {
-    console.error(error);
+    console.error(error instanceof Error ? error.message : String(error));
     process.exitCode = 1;
 });
 async function main() {
-    const baseUrl = (args.baseUrl ?? "http://127.0.0.1:8787").replace(/\/$/, "");
-    const projectId = args.project ?? "prj_local";
+    const baseUrl = normalizeBaseUrlArg(args.baseUrl);
+    const projectId = normalizeStringArg(args.project, "--project", "prj_local");
     const requestedHostId = args.hostId;
-    const displayName = args.displayName ?? `${os.hostname()} host`;
+    const displayName = normalizeStringArg(args.displayName, "--displayName", `${os.hostname()} host`);
     const machineName = os.hostname();
     const enrollSecret = args.enrollSecret ??
         process.env.OFFICE_HOST_ENROLL_SECRET ??
@@ -37,7 +37,7 @@ async function main() {
         host_id: registration.host_id,
         base_url: baseUrl,
         project_id: registration.project_id,
-        workdir: args.workdir,
+        workdir: normalizeOptionalPathArg(args.workdir, "--workdir"),
         display_name: displayName,
         token: registration.host_token,
         room_cursor_seq: Number(registration.room_cursor_seq ?? 0),
@@ -55,14 +55,21 @@ async function main() {
     console.log(`Auto-start: ${config.auto_start ? "enabled" : "disabled"}`);
 }
 async function registerHost(baseUrl, projectId, body, enrollSecret) {
-    const response = await fetch(`${baseUrl}/api/projects/${projectId}/local-host/register`, {
-        method: "POST",
-        headers: {
-            "content-type": "application/json",
-            "x-enroll-secret": enrollSecret,
-        },
-        body: JSON.stringify(body),
-    });
+    let response;
+    try {
+        response = await fetch(`${baseUrl}/api/projects/${projectId}/local-host/register`, {
+            method: "POST",
+            headers: {
+                "content-type": "application/json",
+                "x-enroll-secret": enrollSecret,
+            },
+            body: JSON.stringify(body),
+        });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Host registration failed: could not reach ${baseUrl} (${message})`);
+    }
     if (!response.ok) {
         throw new Error(`Host registration failed: ${response.status} ${await response.text()}`);
     }
@@ -106,3 +113,42 @@ function parseArgs(argv) {
 function escapeBatch(value) {
     return value.replace(/"/g, '""');
 }
+function normalizeBaseUrlArg(value) {
+    if (value === "true") {
+        throw new Error("Missing value for --baseUrl");
+    }
+    const raw = (value ?? "http://127.0.0.1:8787").trim().replace(/\/$/, "");
+    try {
+        const url = new URL(raw);
+        if (!/^https?:$/.test(url.protocol)) {
+            throw new Error("protocol");
+        }
+    }
+    catch {
+        throw new Error(`Invalid --baseUrl: ${raw}`);
+    }
+    return raw;
+}
+function normalizeStringArg(value, flagName, fallback) {
+    if (value === "true") {
+        throw new Error(`Missing value for ${flagName}`);
+    }
+    const normalized = String(value ?? fallback).trim();
+    if (!normalized) {
+        throw new Error(`Missing value for ${flagName}`);
+    }
+    return normalized;
+}
+function normalizeOptionalPathArg(value, flagName) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === "true") {
+        throw new Error(`Missing value for ${flagName}`);
+    }
+    const normalized = value.trim();
+    if (!normalized) {
+        throw new Error(`Missing value for ${flagName}`);
+    }
+    return normalized;
+}

package/.runtime-dist/scripts/lib/host-config.js

@@ -1,5 +1,5 @@
 import { existsSync } from "node:fs";
-import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 const HOST_CONFIG_VERSION = 1;
@@ -28,8 +28,14 @@ export async function loadHostConfig() {
     if (!filePath) {
         return null;
     }
-    const raw = await readFile(filePath, "utf8");
-    const parsed = parseLooseJson(raw);
+    let parsed;
+    try {
+        const raw = await readFile(filePath, "utf8");
+        parsed = parseLooseJson(raw);
+    }
+    catch {
+        return null;
+    }
     if (!parsed || parsed.version !== HOST_CONFIG_VERSION) {
         return null;
     }
@@ -163,8 +169,19 @@ function parseLooseJson(raw) {
 }
 async function writeAtomicJson(filePath, value) {
     const tempPath = `${filePath}.tmp`;
-    await writeFile(tempPath, JSON.stringify(value, null, 2), "utf8");
-    await rename(tempPath, filePath);
+    try {
+        await writeFile(tempPath, JSON.stringify(value, null, 2), "utf8");
+        await rename(tempPath, filePath);
+    }
+    catch (error) {
+        await rm(tempPath, { force: true }).catch(() => undefined);
+        const code = error && typeof error === "object" && "code" in error ? String(error.code ?? "") : "";
+        if (code === "EPERM" || code === "EACCES" || code === "EBUSY") {
+            const fileLabel = path.basename(filePath);
+            throw new Error(`Unable to write ${fileLabel} at ${filePath}. Remove read-only protection or close any program using that file.`);
+        }
+        throw error;
+    }
 }
 function baseAppDataDir() {
     return process.env.APPDATA ?? path.join(process.env.USERPROFILE ?? os.homedir(), "AppData", "Roaming");

package/.runtime-dist/scripts/office-cli.js

@@ -7,20 +7,39 @@ import { loadHostConfig, upsertHostConfig, getHostConfigPath } from "./lib/host-
 import { probeRunnerAvailability, resolveRunnerCommand } from "./lib/local-runner.js";
 import { sessions, hooks, buildRuntimeConfig, startDaemonLoop, stopDaemonLoop, stopSession, buildSpawnContext, spawnInteractiveSession, persistSessions, postRoomMessageUpsert, postJson, getJson, resolveProjectWorkdir, } from "./home-agent-host.js";
 // ─── ANSI Codes ─────────────────────────────────────────────────────────────
-const R = "\x1b[0m";
-const BOLD = "\x1b[1m";
-const DIM = "\x1b[2m";
-const BMAG = "\x1b[95m";
-const MAG = "\x1b[35m";
-const BBLU = "\x1b[94m";
-const BLU = "\x1b[34m";
-const BCYN = "\x1b[96m";
-const CYN = "\x1b[36m";
-const GRN = "\x1b[32m";
-const YEL = "\x1b[33m";
-const RED = "\x1b[31m";
-const WHT = "\x1b[97m";
-const GRY = "\x1b[90m";
+let R = "\x1b[0m";
+let BOLD = "\x1b[1m";
+let DIM = "\x1b[2m";
+let BMAG = "\x1b[95m";
+let MAG = "\x1b[35m";
+let BBLU = "\x1b[94m";
+let BLU = "\x1b[34m";
+let BCYN = "\x1b[96m";
+let CYN = "\x1b[36m";
+let GRN = "\x1b[32m";
+let YEL = "\x1b[33m";
+let RED = "\x1b[31m";
+let WHT = "\x1b[97m";
+let GRY = "\x1b[90m";
+let USE_UNICODE = true;
+function configureOutputMode(isInteractiveTerminal) {
+    const styled = isInteractiveTerminal && !("NO_COLOR" in process.env) && process.env.TERM !== "dumb";
+    USE_UNICODE = isInteractiveTerminal && process.env.OFFICE_CORE_ASCII !== "1";
+    R = styled ? "\x1b[0m" : "";
+    BOLD = styled ? "\x1b[1m" : "";
+    DIM = styled ? "\x1b[2m" : "";
+    BMAG = styled ? "\x1b[95m" : "";
+    MAG = styled ? "\x1b[35m" : "";
+    BBLU = styled ? "\x1b[94m" : "";
+    BLU = styled ? "\x1b[34m" : "";
+    BCYN = styled ? "\x1b[96m" : "";
+    CYN = styled ? "\x1b[36m" : "";
+    GRN = styled ? "\x1b[32m" : "";
+    YEL = styled ? "\x1b[33m" : "";
+    RED = styled ? "\x1b[31m" : "";
+    WHT = styled ? "\x1b[97m" : "";
+    GRY = styled ? "\x1b[90m" : "";
+}
 // ─── ASCII Banner ───────────────────────────────────────────────────────────
 const BANNER = [
     ["  ██████  ███████ ███████ ██  ██████ ███████ ", BMAG],
@@ -78,9 +97,15 @@ function drawAgentBox(label, text, maxW = 74) {
     const lines = wordWrap(text.trim(), maxW - 4);
     const inner = Math.max(label.length + 2, ...lines.map((l) => l.length), 20);
     const w = Math.min(inner, maxW - 4);
-    const top = `${CYN}┌─ ${R}${BOLD}${BCYN}${label}${R}${CYN} ${"─".repeat(Math.max(0, w - label.length - 1))}┐${R}`;
-    const bot = `${CYN}└${"─".repeat(w + 2)}┘${R}`;
-    const body = lines.map((l) => `${CYN}│${R} ${WHT}${l.padEnd(w)}${R} ${CYN}│${R}`);
+    const tl = USE_UNICODE ? "┌" : "+";
+    const tr = USE_UNICODE ? "┐" : "+";
+    const bl = USE_UNICODE ? "└" : "+";
+    const br = USE_UNICODE ? "┘" : "+";
+    const h = USE_UNICODE ? "─" : "-";
+    const v = USE_UNICODE ? "│" : "|";
+    const top = `${CYN}${tl}${h} ${R}${BOLD}${BCYN}${label}${R}${CYN} ${h.repeat(Math.max(0, w - label.length - 1))}${tr}${R}`;
+    const bot = `${CYN}${bl}${h.repeat(w + 2)}${br}${R}`;
+    const body = lines.map((l) => `${CYN}${v}${R} ${WHT}${l.padEnd(w)}${R} ${CYN}${v}${R}`);
     return [top, ...body, bot].join("\n");
 }
 // ─── Timestamp ──────────────────────────────────────────────────────────────
@@ -232,6 +257,26 @@ function completer(line) {
 function ask(rl, prompt) {
     return new Promise((resolve) => rl.question(prompt, (a) => resolve(a?.trim() ?? "")));
 }
+async function readAllStdin(stream) {
+    let buffer = "";
+    stream.setEncoding?.("utf8");
+    for await (const chunk of stream) {
+        buffer += String(chunk);
+    }
+    return buffer;
+}
+function createNonInteractiveReadline() {
+    const noop = () => undefined;
+    return {
+        close: noop,
+        question: (_query, callback) => {
+            callback("");
+            return undefined;
+        },
+        prompt: noop,
+        setPrompt: noop,
+    };
+}
 function safePrompt(ctx, preserveCursor = false) {
     if (!ctx.running || !ctx.isInteractiveTerminal) {
         return;
@@ -243,23 +288,11 @@ function safePrompt(ctx, preserveCursor = false) {
         // Ignore prompt attempts after readline closes during shutdown/tests.
     }
 }
-function replaceInputLine(rl, value) {
-    const internal = rl;
-    internal.line = value;
-    internal.cursor = value.length;
-    internal._refreshLine?.();
-}
-function startDaemonInBackground(ctx) {
+async function startDaemon(ctx) {
     if (!ctx.runtime) {
         return;
     }
-    void startDaemonLoop(ctx.runtime).catch((error) => {
-        if (!ctx.running) {
-            return;
-        }
-        console.log(`${RED}Daemon failed: ${error instanceof Error ? error.message : String(error)}${R}`);
-        safePrompt(ctx);
-    });
+    await startDaemonLoop(ctx.runtime);
 }
 function fmtAge(ms) {
     if (ms < 60_000)
@@ -509,7 +542,7 @@ async function cmdSetup(_a, ctx) {
         // Connect immediately
         stopDaemonLoop();
         ctx.runtime = await buildRuntimeConfig();
-        startDaemonInBackground(ctx);
+        await startDaemon(ctx);
         console.log(`\n  ${GRN}Host online.${R}\n`);
     }
     catch (e) {
@@ -578,9 +611,10 @@ async function cmdClear(_a, _ctx) {
     printBanner();
 }
 async function cmdHelp(_a, _ctx) {
+    const rule = (USE_UNICODE ? "─" : "-").repeat(56);
     console.log("");
     console.log(`  ${BOLD}${WHT}Commands${R}`);
-    console.log(`  ${"─".repeat(56)}`);
+    console.log(`  ${rule}`);
     for (const c of CMDS) {
         const a = c.args ? ` ${CYN}${c.args}${R}` : "";
         const al = c.alias ? ` ${GRY}(${c.alias.map((x) => `/${x}`).join(", ")})${R}` : "";
@@ -591,80 +625,81 @@ async function cmdHelp(_a, _ctx) {
     console.log(`  ${DIM}Tab to autocomplete slash commands${R}\n`);
 }
 async function cmdQuit(_a, ctx) {
-    ctx.running = false;
-    stopDaemonLoop();
     ctx.rl.close();
 }
 // ─── Main ───────────────────────────────────────────────────────────────────
 void main().catch((err) => {
-    console.error(err);
+    console.error(err instanceof Error ? err.message : String(err));
     process.exitCode = 1;
 });
 async function main() {
-    console.clear();
-    printBanner();
     const isInteractiveTerminal = Boolean(process.stdin.isTTY && process.stdout.isTTY);
-    const rl = createInterface({
-        input: process.stdin,
-        output: process.stdout,
-        terminal: isInteractiveTerminal,
-        historySize: 0,
-    });
+    configureOutputMode(isInteractiveTerminal);
+    const pipedInputPromise = !isInteractiveTerminal ? readAllStdin(process.stdin) : Promise.resolve("");
+    if (isInteractiveTerminal) {
+        console.clear();
+        printBanner();
+    }
+    const rl = isInteractiveTerminal
+        ? createInterface({
+            input: process.stdin,
+            output: process.stdout,
+            terminal: true,
+            historySize: 0,
+            completer,
+        })
+        : createNonInteractiveReadline();
     const ctx = { runtime: null, rl, running: true, isInteractiveTerminal };
     const sentIds = new Set();
+    const startupMessages = [];
+    let startupComplete = false;
+    let pendingInputs = 0;
+    let closeRequested = false;
+    let closeFinalized = false;
     let finishStartup;
     const startupReady = new Promise((resolve) => {
         finishStartup = resolve;
     });
-    // ── REPL ──
-    if (ctx.isInteractiveTerminal) {
-        rl.setPrompt(`${BMAG}>${R} `);
-        safePrompt(ctx);
-    }
-    else {
-        try {
-            rl.resume();
+    const flushStartupMessages = () => {
+        if (!startupMessages.length) {
+            return;
         }
-        catch {
-            // stdin may already be closed in redirected test harnesses
+        for (const message of startupMessages.splice(0)) {
+            process.stdout.write(`\r\x1b[K`);
+            displayMessage(message);
         }
-    }
-    // Live slash menu on keypress
-    if (ctx.isInteractiveTerminal) {
-        emitKeypressEvents(process.stdin, rl);
-        process.stdin.setRawMode?.(true);
-        process.stdin.on("keypress", (_chunk, key) => {
-            if (!ctx.running)
-                return;
-            const line = rl.line ?? "";
-            if (line.startsWith("/") && line.length >= 1) {
-                const hits = getSlashMatches(line.slice(1));
-                if (hits.length > 0 && (key?.name === "up" || key?.name === "down")) {
-                    _menuSelection =
-                        key.name === "up"
-                            ? (_menuSelection + hits.length - 1) % hits.length
-                            : (_menuSelection + 1) % hits.length;
-                    scheduleSlashMenuRefresh(rl, true);
-                    return;
+    };
+    const finalizeClose = () => {
+        if (closeFinalized) {
+            return;
+        }
+        closeFinalized = true;
+        ctx.running = false;
+        stopDaemonLoop();
+        if (ctx.isInteractiveTerminal) {
+            process.stdin.setRawMode?.(false);
+        }
+        if (ctx.isInteractiveTerminal) {
+            const internalRl = rl;
+            if (!internalRl.closed) {
+                try {
+                    rl.close();
                 }
-                if (hits.length > 0 && key?.name === "tab") {
-                    const selected = hits[_menuSelection] ?? hits[0];
-                    replaceInputLine(rl, `/${selected.name} `);
-                    scheduleSlashMenuRefresh(rl, false);
-                    return;
+                catch {
+                    // Ignore close races during shutdown.
                 }
-                scheduleSlashMenuRefresh(rl, false);
             }
-            else {
-                clearSlashMenu();
-            }
-        });
-    }
-    rl.on("line", async (raw) => {
+        }
+        console.log(`\n${DIM}Goodbye.${R}`);
+        process.exitCode = 0;
+    };
+    const handleInput = async (raw) => {
         clearSlashMenu();
         const input = raw.trim();
         if (!input) {
-            safePrompt(ctx);
+            if (startupComplete) {
+                safePrompt(ctx);
+            }
             return;
         }
         await startupReady;
@@ -693,44 +728,103 @@ async function main() {
                 }
             }
         }
+        else if (!ctx.runtime) {
+            console.log(`${RED}Not connected. Run /setup${R}`);
+        }
         else {
-            // Send room message
-            if (!ctx.runtime) {
-                console.log(`${RED}Not connected. Run /setup${R}`);
+            const messageId = `msg_${crypto.randomUUID()}`;
+            sentIds.add(messageId);
+            console.log(`${GRN}[${ts()}]${R} ${BOLD}You${R}: ${input}`);
+            try {
+                const result = await postRoomMessageUpsert(ctx.runtime, {
+                    message_id: messageId,
+                    author_type: "user",
+                    author_id: ctx.runtime.hostId,
+                    author_label: "You",
+                    text: input,
+                });
+                if (result?.message_id && result.message_id !== messageId) {
+                    sentIds.add(String(result.message_id));
+                }
+            }
+            catch (e) {
+                sentIds.delete(messageId);
+                console.log(`${RED}Send failed: ${e instanceof Error ? e.message : String(e)}${R}`);
+            }
+        }
+        safePrompt(ctx);
+    };
+    // ── REPL ──
+    if (ctx.isInteractiveTerminal) {
+        rl.setPrompt(`${BMAG}>${R} `);
+    }
+    // Live slash menu on keypress
+    if (ctx.isInteractiveTerminal) {
+        emitKeypressEvents(process.stdin, rl);
+        process.stdin.setRawMode?.(true);
+        process.stdin.on("keypress", (chunk, key) => {
+            if (!ctx.running || !startupComplete)
+                return;
+            const line = rl.line ?? "";
+            if (line.startsWith("/") && line.length >= 1) {
+                const hits = getSlashMatches(line.slice(1));
+                const isTab = key?.name === "tab" || chunk === "\t";
+                if (hits.length > 0 && (key?.name === "up" || key?.name === "down")) {
+                    _menuSelection =
+                        key.name === "up"
+                            ? (_menuSelection + hits.length - 1) % hits.length
+                            : (_menuSelection + 1) % hits.length;
+                    scheduleSlashMenuRefresh(rl, true);
+                    return;
+                }
+                if (!isTab) {
+                    scheduleSlashMenuRefresh(rl, false);
+                }
             }
             else {
-                const messageId = `msg_${crypto.randomUUID()}`;
-                sentIds.add(messageId);
-                console.log(`${GRN}[${ts()}]${R} ${BOLD}You${R}: ${input}`);
+                clearSlashMenu();
+            }
+        });
+    }
+    if (ctx.isInteractiveTerminal) {
+        rl.on("line", async (raw) => {
+            pendingInputs += 1;
+            try {
+                await handleInput(raw);
+            }
+            finally {
+                pendingInputs = Math.max(0, pendingInputs - 1);
+                if (closeRequested && pendingInputs === 0) {
+                    finalizeClose();
+                }
+            }
+        });
+        rl.on("close", () => {
+            closeRequested = true;
+            if (pendingInputs === 0) {
+                finalizeClose();
+            }
+        });
+    }
+    if (!ctx.isInteractiveTerminal) {
+        void (async () => {
+            const pipedInput = await pipedInputPromise;
+            const lines = pipedInput.split(/\r?\n/).filter((line) => line.trim().length > 0);
+            for (const line of lines) {
+                pendingInputs += 1;
                 try {
-                    const result = await postRoomMessageUpsert(ctx.runtime, {
-                        message_id: messageId,
-                        author_type: "user",
-                        author_id: ctx.runtime.hostId,
-                        author_label: "You",
-                        text: input,
-                    });
-                    if (result?.message_id && result.message_id !== messageId) {
-                        sentIds.add(String(result.message_id));
-                    }
+                    await handleInput(line);
                 }
-                catch (e) {
-                    sentIds.delete(messageId);
-                    console.log(`${RED}Send failed: ${e instanceof Error ? e.message : String(e)}${R}`);
+                finally {
+                    pendingInputs = Math.max(0, pendingInputs - 1);
                 }
             }
-        }
-        safePrompt(ctx);
-    });
-    rl.on("close", () => {
-        ctx.running = false;
-        stopDaemonLoop();
-        if (ctx.isInteractiveTerminal) {
-            process.stdin.setRawMode?.(false);
-        }
-        console.log(`\n${DIM}Goodbye.${R}`);
-        process.exit(0);
-    });
+            closeRequested = true;
+            if (pendingInputs === 0) {
+                finalizeClose();
+            }
+        })();
+    }
     // ── Try to connect ──
     const cfg = await loadHostConfig();
     if (cfg) {
@@ -748,6 +842,10 @@ async function main() {
                     sentIds.delete(msg.message_id);
                     return;
                 }
+                if (!startupComplete) {
+                    startupMessages.push(msg);
+                    return;
+                }
                 process.stdout.write(`\r\x1b[K`);
                 displayMessage(msg);
                 safePrompt(ctx, true);
@@ -755,16 +853,17 @@ async function main() {
             hooks.onSessionChange = () => {
                 // Session list changed - could update status bar
             };
-            startDaemonInBackground(ctx);
+            await startDaemon(ctx);
             console.log(`  ${GRN}Host online.${R} Type ${GRN}/help${R} for commands.\n`);
-            safePrompt(ctx);
+            flushStartupMessages();
         }
         catch (e) {
             console.log(`  ${RED}Connection failed: ${e instanceof Error ? e.message : String(e)}${R}`);
             console.log(`  ${DIM}Run /setup to configure or /doctor to diagnose.${R}\n`);
-            safePrompt(ctx);
         }
         finally {
+            startupComplete = true;
+            safePrompt(ctx);
             finishStartup();
         }
     }
@@ -772,6 +871,7 @@ async function main() {
         printHeader(os.hostname());
         console.log(`  ${YEL}No host config found.${R}`);
         console.log(`  ${DIM}Run /setup to get started or /doctor to check prerequisites.${R}\n`);
+        startupComplete = true;
         safePrompt(ctx);
         finishStartup();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "office-core",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Installable CLI and local host runtime for Office Core",
   "type": "module",
   "bin": {