p-spore 0.1.4 → 0.1.43

package/dist/cli/main.js

@@ -1,20 +1,25 @@
 #!/usr/bin/env node
 import { execFile, spawn } from "node:child_process";
 import { realpathSync } from "node:fs";
-import { access, readFile } from "node:fs/promises";
+import { access, readFile, stat } from "node:fs/promises";
 import { createRequire } from "node:module";
-import { basename } from "node:path";
+import { basename, isAbsolute, normalize, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 import { PsporeDaemon } from "../daemon/daemon.js";
-import { DaemonSupervisor } from "../daemon/supervisor.js";
+import { parseConfig } from "../config/config.js";
 import { ProtocolClient } from "../protocol/client.js";
 import { readResourceTrustSummary } from "../plugins/extension-manager.js";
 import { resolvePsporeHome } from "../config/config.js";
 import { ShellService } from "../shell/shell-service.js";
+import { stopLegacyDaemon } from "../service/legacy-daemon.js";
+import { serviceLaunchSpec } from "../service/service-launch.js";
+import { SystemServiceManager } from "../service/system-service.js";
 import { LlmSettingsService } from "../settings/llm-settings-service.js";
-import { defaultModelFor, MODEL_APIS, PROVIDER_OPTIONS, THINKING_LEVELS, } from "../settings/llm-settings.js";
+import {} from "../config/config.js";
+import { defaultModelFor, MODEL_APIS, PERMISSION_MODES, permissionModeSummary, PROVIDER_OPTIONS, THINKING_LEVELS, } from "../settings/llm-settings.js";
+import { atomicWriteJson } from "../storage/atomic.js";
 import { initializePsporeHome, loadConfig, psporePaths } from "../storage/home.js";
 import { acceptsModelSetupOffer, PsporeTuiApp } from "../ui/tui/tui-app.js";
 import { PI_VERSION, PSPORE_VERSION } from "../version.js";
@@ -55,6 +60,8 @@ export async function runCli(argv = process.argv.slice(2)) {
         case "daemon":
             requireNoArgs(args, "daemon");
             return runDaemon(home);
+        case "service":
+            return runServiceCommand(home, args);
         case "status":
             requireNoArgs(args, "status");
             return printStatus(home);
@@ -81,6 +88,11 @@ export async function runCli(argv = process.argv.slice(2)) {
         case "agents":
             requireNoArgs(args, "agents");
             return printProtocolList(home, "agents.list");
+        case "sessions":
+            requireNoArgs(args, "sessions");
+            return printSessions(home);
+        case "session":
+            return runSessionCommand(home, args);
         case "agent":
             return runAgentCommand(home, args);
         case "mcp":
@@ -90,7 +102,7 @@ export async function runCli(argv = process.argv.slice(2)) {
             return printResourceList(home, "resources.list");
         case "skills":
             requireNoArgs(args, "skills");
-            return printResourceList(home, "skills.list");
+            return printResourceList(home, "skills.catalog");
         case "plugins":
             requireNoArgs(args, "plugins");
             return printResourceList(home, "plugins.list");
@@ -109,16 +121,14 @@ export async function runCli(argv = process.argv.slice(2)) {
                 throw new CliError("cancel requires exactly one run ID");
             return cancelRun(home, args[0]);
         case "prompt":
-            if (args.length === 0 || !args.join(" ").trim())
-                throw new CliError("prompt requires text");
-            return runPrompt(home, args.join(" "));
+            return runPromptCommand(home, args);
         default:
             throw new CliError(`Unknown command: ${command}\n\n${helpText()}`);
     }
 }
 async function runDaemon(home) {
     const daemon = await PsporeDaemon.start({ home });
-    process.stdout.write(`pSpore daemon ${daemon.kernel.snapshot().daemon.phase} (PID ${process.pid})\nSocket: ${daemon.paths.socket}\n`);
+    process.stdout.write(`pSpore service process ${daemon.kernel.snapshot().daemon.phase} (PID ${process.pid})\nSocket: ${daemon.paths.socket}\n`);
     let stopping = false;
     const stop = () => {
         if (stopping)
@@ -126,6 +136,13 @@ async function runDaemon(home) {
         stopping = true;
         void daemon.stop().catch(() => undefined);
     };
+    // The service holds every live session. Ending the process over a stray
+    // rejection loses them all and, once systemd's start limit is reached, leaves
+    // clients unable to reconnect at all; a journal entry is the better trade.
+    const reportRejection = (reason) => {
+        process.stderr.write(`pSpore daemon: unhandled rejection: ${describeUnknownError(reason)}\n`);
+    };
+    process.on("unhandledRejection", reportRejection);
     process.once("SIGINT", stop);
     process.once("SIGTERM", stop);
     try {
@@ -133,10 +150,16 @@ async function runDaemon(home) {
         return 0;
     }
     finally {
+        process.off("unhandledRejection", reportRejection);
         process.off("SIGINT", stop);
         process.off("SIGTERM", stop);
     }
 }
+function describeUnknownError(reason) {
+    if (reason instanceof Error)
+        return reason.stack ?? reason.message;
+    return String(reason);
+}
 async function printStatus(home) {
     const client = await connectFromEndpoint(home, "status");
     try {
@@ -218,31 +241,89 @@ async function runTui(home) {
         throw new CliError(`tui requires an interactive TTY; use \`${resolveInvokedName(process.argv[1])} status\` for a non-interactive check`);
     }
     const { paths } = await initializePsporeHome(home);
-    const supervisor = new DaemonSupervisor({ home });
-    await supervisor.start();
+    const service = await cliSystemService(home, paths.workspace);
+    const ensured = await service.manager.ensureRunning(service.spec);
+    if (ensured.lingerWarning)
+        process.stderr.write(`pSpore service warning: ${ensured.lingerWarning}\n`);
+    if (ensured.recoveredFromFailure) {
+        process.stderr.write("pSpore service: cleared a failed unit state before starting the daemon\n");
+    }
     const settings = new LlmSettingsService(home, paths);
-    try {
-        await new PsporeTuiApp({
-            socketPath: paths.socket,
-            settings,
-            onSettingsSaved: async () => {
-                if (supervisor.ownership !== "owned") {
-                    return {
-                        applied: false,
-                        restartRequired: true,
-                        message: "Settings saved; restart the external daemon to apply them",
-                    };
-                }
-                await supervisor.stop();
-                await supervisor.start();
-                return { applied: true, restartRequired: false, message: "Settings saved; the TUI daemon is restarting" };
-            },
-        }).run();
+    await new PsporeTuiApp({
+        socketPath: paths.socket,
+        settings,
+        onSettingsSaved: async () => {
+            await service.manager.restart();
+            return { applied: true, restartRequired: false, message: "Settings saved; the system service is restarting" };
+        },
+    }).run();
+    return 0;
+}
+async function runServiceCommand(home, args) {
+    const action = args[0] ?? "status";
+    const { paths } = await initializePsporeHome(home);
+    const service = await cliSystemService(home, paths.workspace);
+    if (action === "install" || action === "start") {
+        requireNoArgs(args.slice(1), `service ${action}`);
+        const status = await service.manager.ensureRunning(service.spec);
+        process.stdout.write(serviceStatusText(status));
+        if (status.lingerWarning)
+            process.stderr.write(`Warning: ${status.lingerWarning}\n`);
         return 0;
     }
-    finally {
-        await supervisor.stop();
+    if (action === "restart") {
+        requireNoArgs(args.slice(1), "service restart");
+        if (!(await service.manager.status()).installed)
+            await service.manager.ensureRunning(service.spec);
+        else
+            await service.manager.restart();
+        process.stdout.write(serviceStatusText(await service.manager.status()));
+        return 0;
+    }
+    if (action === "stop") {
+        requireNoArgs(args.slice(1), "service stop");
+        await service.manager.stop();
+        process.stdout.write(serviceStatusText(await service.manager.status()));
+        return 0;
     }
+    if (action === "uninstall") {
+        requireNoArgs(args.slice(1), "service uninstall");
+        await service.manager.uninstall();
+        process.stdout.write(`Removed ${service.manager.unitName}\n`);
+        return 0;
+    }
+    if (action === "logs") {
+        if (args.length > 2)
+            throw new CliError("service logs accepts an optional line count");
+        const lines = args[1] === undefined ? 100 : Number(args[1]);
+        process.stdout.write(await service.manager.logs(lines));
+        return 0;
+    }
+    if (action === "status") {
+        requireNoArgs(args.slice(1), "service status");
+        process.stdout.write(serviceStatusText(await service.manager.status()));
+        return 0;
+    }
+    throw new CliError("service usage: service install|start|restart|stop|status|logs [LINES]|uninstall");
+}
+async function cliSystemService(home, workspace) {
+    const manager = new SystemServiceManager({ home, beforeStart: async () => stopLegacyDaemon(home) });
+    const spec = await serviceLaunchSpec(home, workspace, {
+        execPath: process.execPath,
+        ...(process.argv[1] === undefined ? {} : { argvEntry: process.argv[1] }),
+        moduleUrl: import.meta.url,
+    });
+    return { manager, spec };
+}
+function serviceStatusText(status) {
+    return [
+        `Service: ${status.unitName}`,
+        `Unit: ${status.unitPath}`,
+        `Installed: ${status.installed ? "yes" : "no"}`,
+        `Enabled: ${status.enabled ? "yes" : "no"}`,
+        `Active: ${status.active ? "yes" : "no"}`,
+        `Boot without login: ${status.linger === undefined ? "unknown" : status.linger ? "yes" : "no"}`,
+    ].join("\n") + "\n";
 }
 async function runDesktop(home) {
     const entry = fileURLToPath(new URL("../desktop/main.js", import.meta.url));
@@ -258,7 +339,7 @@ async function runDesktop(home) {
         electron = require("electron");
     }
     catch {
-        throw new CliError("Electron is not included in the npm CLI package; use the pSpore AppImage for the desktop client");
+        throw new CliError("Electron is not included in the npm CLI package; use the pSpore desktop zip from GitHub Releases");
     }
     if (typeof electron !== "string")
         throw new CliError("The local Electron executable could not be resolved");
@@ -314,35 +395,46 @@ async function runSetupWizard(home) {
     const service = new LlmSettingsService(home, paths);
     const current = await service.get();
     process.stdout.write("\nModel setup — press Enter to accept each default, Ctrl+C to abort.\n\n");
-    const providerAnswer = await readLineInput(`1/5 provider [${current.provider}] (deepseek · openai · custom-openai): `);
+    const providerAnswer = await readLineInput(`1/6 provider [${current.provider}] (deepseek · openai · custom-openai): `);
     const provider = providerAnswer.trim() ? parseConfigProvider(providerAnswer.trim()) : current.provider;
     const suggestedModel = provider === current.provider ? current.model : defaultModelFor(provider);
-    const modelAnswer = await readLineInput(`2/5 model [${suggestedModel}]: `);
+    const modelAnswer = await readLineInput(`2/6 model [${suggestedModel}]: `);
     const model = modelAnswer.trim() || suggestedModel;
     let baseUrl = "";
     let api = "provider-default";
     if (provider === "custom-openai") {
         const suggestedUrl = current.provider === provider ? current.baseUrl : "";
-        const urlAnswer = await readLineInput(`3/5 Base URL${suggestedUrl ? ` [${suggestedUrl}]` : " (required)"}: `);
+        const urlAnswer = await readLineInput(`3/6 Base URL${suggestedUrl ? ` [${suggestedUrl}]` : " (required)"}: `);
         baseUrl = urlAnswer.trim() || suggestedUrl;
         if (!baseUrl)
             throw new CliError("A Base URL is required for custom OpenAI");
-        const apiAnswer = await readLineInput("3/5 API [chat] (chat · responses): ");
+        const apiAnswer = await readLineInput("3/6 API [chat] (chat · responses): ");
         api = parseConfigApi(apiAnswer.trim() || "chat");
     }
-    const thinkingAnswer = await readLineInput(`4/5 thinking [${current.thinking}] (${THINKING_LEVELS.join(" · ")}): `);
+    const thinkingAnswer = await readLineInput(`4/6 thinking [${current.thinking}] (${THINKING_LEVELS.join(" · ")}): `);
     const thinking = parseConfigThinking(thinkingAnswer.trim() || current.thinking);
     const keyDefault = current.hasApiKey ? "keep" : "set";
-    const keyAnswer = await readLineInput(`5/5 API key [${keyDefault}] (set · keep · clear): `);
+    const keyAnswer = await readLineInput(`5/6 API key [${keyDefault}] (set · keep · clear): `);
     const keyAction = (keyAnswer.trim().toLowerCase() || keyDefault);
     if (!["set", "keep", "clear"].includes(keyAction))
         throw new CliError("Key action must be set, keep, or clear");
     let apiKey;
     if (keyAction === "set") {
-        apiKey = await readSecretInput();
+        apiKey = await readSecretInput("API key");
         if (!apiKey)
             throw new CliError("API key cannot be empty");
     }
+    const cookieDefault = current.hasCookie ? "keep" : "skip";
+    const cookieAnswer = await readLineInput(`6/6 Cookie [${cookieDefault}] (set · keep · clear · skip): `);
+    const cookieAction = (cookieAnswer.trim().toLowerCase() || cookieDefault);
+    if (!["set", "keep", "clear", "skip"].includes(cookieAction))
+        throw new CliError("Cookie action must be set, keep, clear, or skip");
+    let cookie;
+    if (cookieAction === "set") {
+        cookie = await readSecretInput("Cookie");
+        if (!cookie)
+            throw new CliError("Cookie cannot be empty");
+    }
     const saved = await service.save(settingsUpdate(current, {
         provider,
         model,
@@ -351,7 +443,9 @@ async function runSetupWizard(home) {
         thinking,
         customModel: provider === "custom-openai",
         ...(apiKey ? { apiKey } : {}),
+        ...(cookie ? { cookie } : {}),
         clearApiKey: keyAction === "clear",
+        clearCookie: cookieAction === "clear",
     }));
     process.stdout.write("\n");
     printModelSettings(saved);
@@ -375,6 +469,10 @@ async function runConfigCommand(home, args) {
         printModelSettings(await service.get());
         return 0;
     }
+    // Indexing is its own config section rather than an LLM setting, so it is
+    // written directly instead of going through the settings service.
+    if (action === "indexing")
+        return runIndexingConfig(home, paths, args.slice(1));
     const current = await service.get();
     let update;
     if (action === "set") {
@@ -444,10 +542,33 @@ async function runConfigCommand(home, args) {
             throw new CliError(`config thinking usage: config thinking ${THINKING_LEVELS.join("|")}`);
         update = settingsUpdate(current, { thinking: parseConfigThinking(args[1]) });
     }
+    else if (action === "permissions") {
+        if (args.length !== 2) {
+            throw new CliError(`config permissions usage: config permissions ${PERMISSION_MODES.join("|")}|bypass`);
+        }
+        update = settingsUpdate(current, { permissionMode: parsePermissionMode(args[1]) });
+    }
+    else if (action === "compact") {
+        if (args.length < 2 || args.length > 5) {
+            throw new CliError("config compact usage: config compact on|off [RESERVE_TOKENS] [KEEP_RECENT_TOKENS] [TRIGGER_TOKENS]");
+        }
+        update = settingsUpdate(current, {
+            autoCompactionEnabled: parseConfigOnOff(args[1]),
+            autoCompactionReserveTokens: args[2] === undefined
+                ? current.autoCompactionReserveTokens
+                : parseConfigCompactionTokens(args[2], "reserve tokens"),
+            autoCompactionKeepRecentTokens: args[3] === undefined
+                ? current.autoCompactionKeepRecentTokens
+                : parseConfigCompactionTokens(args[3], "keep recent tokens"),
+            autoCompactionTriggerTokens: args[4] === undefined
+                ? current.autoCompactionTriggerTokens
+                : parseConfigCompactionTokens(args[4], "trigger tokens"),
+        });
+    }
     else if (action === "key") {
         if (args.length !== 1)
             throw new CliError("API keys are never accepted as command arguments; use `config key` and enter it securely");
-        const apiKey = await readSecretInput();
+        const apiKey = await readSecretInput("API key");
         if (!apiKey)
             throw new CliError("API key cannot be empty");
         update = settingsUpdate(current, { apiKey });
@@ -457,14 +578,131 @@ async function runConfigCommand(home, args) {
             throw new CliError("config clear-key does not accept arguments");
         update = settingsUpdate(current, { clearApiKey: true });
     }
+    else if (action === "cookie") {
+        if (args.length !== 1)
+            throw new CliError("Cookies are never accepted as command arguments; use `config cookie` and enter it securely");
+        const cookie = await readSecretInput("Cookie");
+        if (!cookie)
+            throw new CliError("Cookie cannot be empty");
+        update = settingsUpdate(current, { cookie });
+    }
+    else if (action === "clear-cookie") {
+        if (args.length !== 1)
+            throw new CliError("config clear-cookie does not accept arguments");
+        update = settingsUpdate(current, { clearCookie: true });
+    }
+    else if (action === "header") {
+        const name = args[1];
+        if (!name || args.length !== 2)
+            throw new CliError("config header usage: config header NAME (the value is read securely)");
+        const value = await readSecretInput(`${name} value`);
+        if (!value)
+            throw new CliError("Header value cannot be empty");
+        const others = current.customHeaders.filter((header) => header.name.toLowerCase() !== name.toLowerCase());
+        update = settingsUpdate(current, {
+            customHeaders: [...others.map((header) => ({ name: header.name })), { name, value }],
+        });
+    }
+    else if (action === "clear-header") {
+        const name = args[1];
+        if (!name || args.length !== 2)
+            throw new CliError("config clear-header usage: config clear-header NAME");
+        if (!current.customHeaders.some((header) => header.name.toLowerCase() === name.toLowerCase())) {
+            throw new CliError(`No custom header named ${name}`);
+        }
+        update = settingsUpdate(current, {
+            customHeaders: current.customHeaders
+                .filter((header) => header.name.toLowerCase() !== name.toLowerCase())
+                .map((header) => ({ name: header.name })),
+        });
+    }
     else {
-        throw new CliError("config usage: show | set | provider | model | endpoint | thinking | key | clear-key");
+        throw new CliError("config usage: show | set | provider | model | endpoint | thinking | permissions | compact | key | clear-key | cookie | clear-cookie | header | clear-header");
     }
     const saved = await service.save(update);
     printModelSettings(saved);
     process.stdout.write("Saved. Restart an existing daemon to apply the new model settings.\n");
     return 0;
 }
+/**
+ * Reads and edits `config.indexing`. Directories are resolved to absolute paths
+ * and checked to exist, because a typo here silently indexes nothing.
+ */
+async function runIndexingConfig(home, paths, args) {
+    const config = await loadConfig(home);
+    const indexing = config.indexing;
+    const action = args[0] ?? "show";
+    if (action === "show") {
+        requireNoArgs(args.slice(1), "config indexing show");
+        printIndexingSettings(indexing, paths.config);
+        return 0;
+    }
+    let next = { ...indexing, directories: [...indexing.directories], extensions: [...indexing.extensions] };
+    if (action === "on" || action === "off") {
+        requireNoArgs(args.slice(1), `config indexing ${action}`);
+        next.enabled = action === "on";
+    }
+    else if (action === "add" || action === "remove") {
+        if (args.length < 2)
+            throw new CliError(`config indexing ${action} usage: config indexing ${action} DIR [DIR...]`);
+        const targets = await Promise.all(args.slice(1).map(async (value) => resolveIndexDirectory(value, action === "add")));
+        next.directories = action === "add"
+            ? [...new Set([...next.directories, ...targets])].sort()
+            : next.directories.filter((existing) => !targets.includes(existing));
+    }
+    else if (action === "interval") {
+        if (args.length !== 2)
+            throw new CliError("config indexing interval usage: config indexing interval MINUTES");
+        const minutes = Number(args[1]);
+        if (!Number.isSafeInteger(minutes) || minutes < 1 || minutes > 10_080) {
+            throw new CliError("Indexing interval must be a whole number of minutes between 1 and 10080");
+        }
+        next.intervalMinutes = minutes;
+    }
+    else if (action === "ext") {
+        if (args.length !== 2)
+            throw new CliError("config indexing ext usage: config indexing ext txt,md,pdf");
+        const extensions = (args[1] ?? "").split(",").map((value) => value.trim()).filter(Boolean);
+        if (extensions.length === 0)
+            throw new CliError("At least one extension is required");
+        next.extensions = extensions;
+    }
+    else {
+        throw new CliError("config indexing usage: show | on | off | add DIR | remove DIR | interval MINUTES | ext a,b,c");
+    }
+    // Re-parsing validates the edit exactly as the daemon will read it.
+    const updated = parseConfig({ ...config, indexing: next }, home);
+    await atomicWriteJson(paths.config, updated, 0o600);
+    printIndexingSettings(updated.indexing, paths.config);
+    process.stdout.write("\nSaved. Restart the service to apply: `pspore service restart`.\n");
+    return 0;
+}
+async function resolveIndexDirectory(value, mustExist) {
+    const resolved = isAbsolute(value) ? normalize(value) : resolve(process.cwd(), value);
+    if (!mustExist)
+        return resolved;
+    try {
+        if (!(await stat(resolved)).isDirectory())
+            throw new CliError(`Not a directory: ${resolved}`);
+    }
+    catch (error) {
+        if (error instanceof CliError)
+            throw error;
+        throw new CliError(`Directory does not exist: ${resolved}`);
+    }
+    return resolved;
+}
+function printIndexingSettings(indexing, configPath) {
+    process.stdout.write([
+        `Indexing: ${indexing.enabled ? "on" : "off"}`,
+        `Interval: every ${indexing.intervalMinutes} minutes`,
+        `Extensions: ${indexing.extensions.join(", ")}`,
+        indexing.directories.length > 0
+            ? `Directories:\n  ${indexing.directories.join("\n  ")}`
+            : "Directories: none configured (nothing will be indexed)",
+        `Config file: ${configPath}`,
+    ].join("\n") + "\n");
+}
 function printModelSettings(settings) {
     process.stdout.write([
         `Provider: ${settings.provider}`,
@@ -472,7 +710,18 @@ function printModelSettings(settings) {
         `Base URL: ${settings.baseUrl || "provider default"}`,
         `API: ${settings.api}`,
         `Thinking: ${settings.thinking}`,
-        `API key: ${settings.hasApiKey ? "configured (hidden)" : "not configured"}`,
+        `Permissions: ${settings.permissionMode} — ${permissionModeSummary(settings.permissionMode)}`,
+        `Auto compact: ${settings.autoCompactionEnabled ? "on" : "off"}`,
+        `Compact trigger tokens: ${settings.autoCompactionTriggerTokens}`,
+        `Compact reserve tokens: ${settings.autoCompactionReserveTokens}`,
+        `Compact keep recent tokens: ${settings.autoCompactionKeepRecentTokens}`,
+        `API key: ${settings.hasApiKey ? "configured (hidden)" : "not configured"} — ${settings.apiKeyPath}`,
+        `Cookie: ${settings.hasCookie ? "configured (hidden)" : "not configured"} — ${settings.cookiePath}`,
+        settings.customHeaders.length === 0
+            ? "Custom headers: none"
+            : `Custom headers: ${settings.customHeaders.map((header) => `${header.name} (${header.hasValue ? "configured" : "missing value"})`).join(", ")}`,
+        `Config file: ${settings.configPath}`,
+        `Derived model catalog: ${settings.modelsPath}`,
     ].join("\n") + "\n");
 }
 /** Visible single-line prompt; secrets must go through readSecretInput instead. */
@@ -485,17 +734,17 @@ async function readLineInput(prompt) {
         rl.close();
     }
 }
-async function readSecretInput() {
+async function readSecretInput(label = "API key") {
     if (!process.stdin.isTTY) {
         let value = "";
         for await (const chunk of process.stdin) {
             value += String(chunk);
             if (value.length > 16_386)
-                throw new CliError("API key input exceeds 16384 characters");
+                throw new CliError(`${label} input exceeds 16384 characters`);
         }
         return value.replace(/\r?\n$/, "");
     }
-    process.stdout.write("API key (hidden): ");
+    process.stdout.write(`${label} (hidden): `);
     process.stdin.setRawMode(true);
     process.stdin.resume();
     return new Promise((resolve, reject) => {
@@ -513,7 +762,7 @@ async function readSecretInput() {
         const onData = (chunk) => {
             const data = String(chunk);
             if (data.includes("\u0003"))
-                return finish(new CliError("API key input cancelled"));
+                return finish(new CliError(`${label} input cancelled`));
             if (data.includes("\r") || data.includes("\n"))
                 return finish();
             if (data === "\u007f" || data === "\b") {
@@ -525,7 +774,7 @@ async function readSecretInput() {
                 : data;
             const printable = [...pasted].filter((character) => character >= " " && character <= "~").join("");
             if (value.length + printable.length > 16_384)
-                return finish(new CliError("API key input exceeds 16384 characters"));
+                return finish(new CliError(`${label} input exceeds 16384 characters`));
             value += printable;
         };
         process.stdin.on("data", onData);
@@ -545,6 +794,29 @@ function parseConfigThinking(value) {
     }
     return normalized;
 }
+function parsePermissionMode(value) {
+    const normalized = value?.trim().toLowerCase();
+    // `bypass` is the name users reach for; it maps onto the existing allow_all policy.
+    const mode = normalized === "bypass" ? "allow_all" : normalized;
+    if (!mode || !PERMISSION_MODES.includes(mode)) {
+        throw new CliError(`Permission mode must be one of: ${PERMISSION_MODES.join(", ")} (or bypass)`);
+    }
+    return mode;
+}
+function parseConfigOnOff(value) {
+    if (value === "on")
+        return true;
+    if (value === "off")
+        return false;
+    throw new CliError("Auto compact must be on or off");
+}
+function parseConfigCompactionTokens(value, label) {
+    const parsed = Number(value);
+    if (!Number.isSafeInteger(parsed) || parsed <= 0 || parsed > 1_000_000) {
+        throw new CliError(`${label} must be an integer from 1 to 1000000`);
+    }
+    return parsed;
+}
 function parseConfigApi(value) {
     const normalized = value.trim().toLowerCase();
     const api = normalized === "chat" ? "openai-completions" : normalized === "responses" ? "openai-responses" : normalized;
@@ -561,11 +833,34 @@ function settingsUpdate(settings, changes) {
         api: changes.api ?? settings.api,
         thinking: changes.thinking ?? settings.thinking,
         customModel: changes.customModel ?? settings.customModel,
+        permissionMode: changes.permissionMode ?? settings.permissionMode,
+        autoCompactionEnabled: changes.autoCompactionEnabled ?? settings.autoCompactionEnabled,
+        autoCompactionTriggerTokens: changes.autoCompactionTriggerTokens ?? settings.autoCompactionTriggerTokens,
+        autoCompactionReserveTokens: changes.autoCompactionReserveTokens ?? settings.autoCompactionReserveTokens,
+        autoCompactionKeepRecentTokens: changes.autoCompactionKeepRecentTokens ?? settings.autoCompactionKeepRecentTokens,
         ...(changes.apiKey ? { apiKey: changes.apiKey } : {}),
+        ...(changes.cookie ? { cookie: changes.cookie } : {}),
+        ...(changes.customHeaders ? { customHeaders: changes.customHeaders } : {}),
         clearApiKey: changes.clearApiKey ?? false,
+        clearCookie: changes.clearCookie ?? false,
     };
 }
-async function runPrompt(home, text) {
+async function runPromptCommand(home, args) {
+    let sessionId = "main";
+    let textArgs = args;
+    if (args[0] === "--session") {
+        const selected = args[1];
+        if (!selected)
+            throw new CliError("prompt --session requires a session ID");
+        sessionId = selected;
+        textArgs = args.slice(2);
+    }
+    const text = textArgs.join(" ").trim();
+    if (!text)
+        throw new CliError("prompt requires text");
+    return runPrompt(home, text, sessionId);
+}
+async function runPrompt(home, text, sessionId) {
     const client = await connectFromEndpoint(home, "prompt");
     let resolveSettled;
     let printedDelta = false;
@@ -573,19 +868,22 @@ async function runPrompt(home, text) {
         resolveSettled = resolve;
     });
     const unsubscribe = client.subscribe((event) => {
-        if (event.type === "message.delta" && typeof event.payload["delta"] === "string") {
+        const payload = event.payload;
+        if (payload["sessionId"] !== sessionId)
+            return;
+        if (event.type === "transcript.delta" && payload["kind"] !== "thinking" && typeof payload["delta"] === "string") {
             printedDelta = true;
-            process.stdout.write(event.payload["delta"]);
+            process.stdout.write(payload["delta"]);
         }
         if (event.type === "run.settled")
             resolveSettled();
     });
-    const abort = () => void client.command("session.abort", { reason: "CLI interrupted" }, { sessionId: "main" }).catch(() => undefined);
+    const abort = () => void client.command("session.abort", { reason: "CLI interrupted" }, { sessionId }).catch(() => undefined);
     process.once("SIGINT", abort);
     try {
-        await client.command("session.prompt", { text, mode: "prompt" }, { sessionId: "main" });
+        await client.command("session.prompt", { text, mode: "auto" }, { sessionId });
         await settled;
-        const snapshot = await client.command("session.snapshot", {}, { sessionId: "main" });
+        const snapshot = await client.command("session.snapshot", {}, { sessionId });
         if (!snapshot)
             throw new CliError("Session disappeared before completion");
         const finalText = snapshot.messages.at(-1)?.text;
@@ -601,6 +899,61 @@ async function runPrompt(home, text) {
         await client.close();
     }
 }
+async function printSessions(home) {
+    const client = await connectFromEndpoint(home, "sessions");
+    try {
+        const status = await client.command("status.get", {});
+        const roots = Object.values(status.sessions)
+            .filter((session) => session.rootSession)
+            .map((session) => ({
+            id: session.sessionId,
+            title: session.rootSession?.title,
+            status: session.status,
+            messages: session.messageCount,
+            updatedAt: session.rootSession?.updatedAt,
+        }));
+        process.stdout.write(`${JSON.stringify(roots, null, 2)}\n`);
+        return 0;
+    }
+    finally {
+        await client.close();
+    }
+}
+const SESSION_USAGE = "session usage: session new [TITLE] | session delete ID";
+async function runSessionCommand(home, args) {
+    if (args[0] === "new")
+        return createSession(home, args.slice(1).join(" ").trim());
+    if (args[0] === "delete") {
+        const sessionId = args[1];
+        if (!sessionId || args.length !== 2)
+            throw new CliError("session usage: session delete ID");
+        return deleteSession(home, sessionId);
+    }
+    throw new CliError(SESSION_USAGE);
+}
+async function createSession(home, title) {
+    const client = await connectFromEndpoint(home, "session-new");
+    try {
+        const created = await client.command("session.create", title ? { title } : {});
+        process.stdout.write(`${created.sessionId}\t${created.rootSession?.title ?? "New session"}\n`);
+        return 0;
+    }
+    finally {
+        await client.close();
+    }
+}
+/** Deletes a root session together with the transcript file it owns. */
+async function deleteSession(home, sessionId) {
+    const client = await connectFromEndpoint(home, "session-delete");
+    try {
+        const deleted = await client.command("session.delete", {}, { sessionId });
+        process.stdout.write(`${deleted.sessionId}\t${deleted.title ?? ""}\t${deleted.transcriptRemoved ? "transcript removed" : "transcript kept"}\n`);
+        return 0;
+    }
+    finally {
+        await client.close();
+    }
+}
 async function printProtocolList(home, command) {
     const client = await connectFromEndpoint(home, command.split(".")[0] ?? "list");
     try {
@@ -812,7 +1165,7 @@ async function endpointFor(home) {
         value = JSON.parse(await readFile(path, "utf8"));
     }
     catch (error) {
-        throw new CliError(`No daemon endpoint at ${path}; start it with \`${resolveInvokedName(process.argv[1])} daemon\``);
+        throw new CliError(`No service endpoint at ${path}; start it with \`${resolveInvokedName(process.argv[1])} service start\``);
     }
     if (!isRecord(value) || value["version"] !== 1 || typeof value["socket"] !== "string" || typeof value["state"] !== "string") {
         throw new CliError(`Invalid daemon endpoint file: ${path}`);
@@ -846,7 +1199,7 @@ function requireNoArgs(args, command) {
         throw new CliError(`${command} does not accept positional arguments`);
 }
 function helpText() {
-    return `pSpore ${PSPORE_VERSION} — Linux local agent core\n\nUsage: ${resolveInvokedName(process.argv[1])} [--home PATH] <command>\n\nCommands:\n  setup            Guided model setup (provider, model, thinking, API key)\n  init             Initialize private config/workspace/state directories\n  daemon           Run the foreground daemon\n  tui              Open the reconnecting terminal client and start a local daemon when needed\n  desktop          Open the secure Electron 43 client\n  config wizard    Same guided setup as the setup command\n  config show      Show model settings without exposing the API key\n  config set ...   Configure DeepSeek, OpenAI, or a custom OpenAI endpoint\n  config key       Read an API key from hidden TTY input or stdin\n  config clear-key Remove the current provider's managed API key\n  prompt TEXT      Send one prompt and wait for completion\n  jobs             List loaded cron jobs\n  runs             List durable automation runs\n  notifications    List durable local notifications\n  agents           List child agents and their current status\n  agent spawn TEXT Spawn a bounded shared-read child agent\n  agent send ID TEXT\n                   Send a queued message to a child agent\n  agent join ID... Wait for one or more child agents\n  agent cancel ID  Cancel a child agent and its descendants\n  mcp list         List configured MCP health without connecting\n  mcp tools        List schemas activated in this daemon process\n  mcp discover ID  Lazily connect and activate one trusted server\n  mcp ping ID      Check one trusted MCP server connection\n  resources        List trusted skills and host plugins\n  skills           List trusted skills and activation state\n  plugins          List trusted host plugins and activation state\n  resource inspect PATH\n                   Inspect one directory under workspace/staging without executing it\n  resource install PATH SHA256\n                   Trust and install only the exact inspected content digest\n  resource disable KIND NAME SHA256\n                   Revoke trust without deleting installed content\n  schedule put FILE\n                   Atomically create/update a cron job from JSON\n  run JOB_ID       Trigger one job now and wait for completion\n  cancel RUN_ID    Cancel a queued or active run\n  status           Show daemon and session status\n  doctor           Check Node, config, model, shell, ripgrep, resource trust, MCP, and daemon\n  version          Print pinned runtime versions\n  help             Show this help\n`;
+    return `pSpore ${PSPORE_VERSION} — Linux local agent core\n\nUsage: ${resolveInvokedName(process.argv[1])} [--home PATH] <command>\n\nCommands:\n  setup            Guided model setup (provider, model, thinking, API key, cookie)\n  init             Initialize private config/workspace/state directories\n  service install  Install, enable, and start the systemd user service\n  service status   Show system service, autostart, and linger state\n  service logs     Show recent system service logs\n  service restart  Restart the full background service\n  service stop     Stop it; service uninstall also removes the unit\n  daemon           Run the service process in the foreground (diagnostics/systemd)\n  tui              Open the reconnecting terminal shell; service stays running after exit\n  desktop          Open the secure Electron 43 shell\n  config wizard    Same guided setup as the setup command\n  config show      Show model settings without exposing the API key or cookie\n  config set ...   Configure DeepSeek, OpenAI, or a custom OpenAI endpoint\n  config permissions MODE\n                   Set the approval policy: ask_risky | ask_all | allow_all (bypass) | deny\n  config compact on|off [RESERVE] [KEEP] [TRIGGER]\n                   Configure automatic context compaction thresholds\n  config indexing ...\n                   show | on | off | add DIR | remove DIR | interval MINUTES | ext a,b,c\n  config key       Read an API key from hidden TTY input or stdin\n  config clear-key Remove the current provider's managed API key\n  config cookie    Read an LLM proxy Cookie header from hidden TTY input or stdin\n  config clear-cookie Remove the current provider's managed Cookie header\n  config header NAME\n                   Add or replace one custom request header; the value is read securely\n  config clear-header NAME\n                   Remove one custom request header and its stored value\n  sessions         List persistent root sessions\n  session new [TITLE]\n                   Create a persistent root session\n  session delete ID\n                   Delete a root session and its stored transcript\n  prompt [--session ID] TEXT\n                   Send normally; if busy, continue queuing and wait\n  jobs             List loaded cron jobs\n  runs             List durable automation runs\n  notifications    List durable local notifications\n  agents           List child agents and their current status\n  agent spawn TEXT Spawn a bounded shared-read child agent\n  agent send ID TEXT\n                   Send a queued message to a child agent\n  agent join ID... Wait for one or more child agents\n  agent cancel ID  Cancel a child agent and its descendants\n  mcp list         List configured MCP health without connecting\n  mcp tools        List schemas activated in this service process\n  mcp discover ID  Lazily connect and activate one trusted server\n  mcp ping ID      Check one trusted MCP server connection\n  resources        List trusted skills and host plugins\n  skills           List installed, bundled, and workspace skills, and why any is not loaded\n  plugins          List trusted host plugins and activation state\n  resource inspect PATH\n                   Inspect one directory under workspace/staging without executing it\n  resource install PATH SHA256\n                   Trust and install only the exact inspected content digest\n  resource disable KIND NAME SHA256\n                   Revoke trust without deleting installed content\n  schedule put FILE\n                   Atomically create/update a cron job from JSON\n  run JOB_ID       Trigger one job now and wait for completion\n  cancel RUN_ID    Cancel a queued or active run\n  status           Show service and session status\n  doctor           Check Node, config, model, shell, ripgrep, resource trust, MCP, and service\n  version          Print pinned runtime versions\n  help             Show this help\n`;
 }
 class CliError extends Error {
     constructor(message) {