@poolzin/pool-bot 2026.2.25 → 2026.2.26

package/dist/cli/update-cli/update-command.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { confirm, isCancel } from "@clack/prompts";
 import { checkShellCompletionStatus, ensureCompletionCacheExists, } from "../../commands/doctor-completion.js";
 import { doctorCommand } from "../../commands/doctor.js";
-import { readConfigFileSnapshot, writeConfigFile } from "../../config/config.js";
+import { readConfigFileSnapshot, resolveGatewayPort, writeConfigFile, } from "../../config/config.js";
 import { resolveGatewayService } from "../../daemon/service.js";
 import { channelToNpmTag, DEFAULT_GIT_CHANNEL, DEFAULT_PACKAGE_CHANNEL, normalizeUpdateChannel, } from "../../infra/update-channels.js";
 import { compareSemverStrings, resolveNpmChannelTag, checkUpdateStatus, } from "../../infra/update-check.js";
@@ -17,12 +17,14 @@ import { pathExists } from "../../utils.js";
 import { replaceCliName, resolveCliName } from "../cli-name.js";
 import { formatCliCommand } from "../command-format.js";
 import { installCompletion } from "../completion-cli.js";
-import { runDaemonRestart } from "../daemon-cli.js";
+import { runDaemonInstall, runDaemonRestart } from "../daemon-cli.js";
+import { renderRestartDiagnostics, terminateStaleGatewayPids, waitForGatewayHealthyRestart, } from "../daemon-cli/restart-health.js";
 import { createUpdateProgress, printResult } from "./progress.js";
 import { prepareRestartScript, runRestartScript } from "./restart-helper.js";
-import { DEFAULT_PACKAGE_NAME, ensureGitCheckout, normalizeTag, readPackageName, readPackageVersion, resolveGitInstallDir, resolveGlobalManager, resolveNodeRunner, resolveTargetVersion, resolveUpdateRoot, runUpdateStep, tryWriteCompletionCache, } from "./shared.js";
+import { DEFAULT_PACKAGE_NAME, createGlobalCommandRunner, ensureGitCheckout, normalizeTag, parseTimeoutMsOrExit, readPackageName, readPackageVersion, resolveGitInstallDir, resolveGlobalManager, resolveNodeRunner, resolveTargetVersion, resolveUpdateRoot, runUpdateStep, tryWriteCompletionCache, } from "./shared.js";
 import { suppressDeprecations } from "./suppress-deprecations.js";
 const CLI_NAME = resolveCliName();
+const SERVICE_REFRESH_TIMEOUT_MS = 60_000;
 const UPDATE_QUIPS = [
     "Leveled up! New skills unlocked. You're welcome.",
     "Fresh code, same lobster. Miss me?",
@@ -48,6 +50,43 @@ const UPDATE_QUIPS = [
 function pickUpdateQuip() {
     return UPDATE_QUIPS[Math.floor(Math.random() * UPDATE_QUIPS.length)] ?? "Update complete.";
 }
+function resolveGatewayInstallEntrypointCandidates(root) {
+    if (!root) {
+        return [];
+    }
+    return [
+        path.join(root, "dist", "entry.js"),
+        path.join(root, "dist", "entry.mjs"),
+        path.join(root, "dist", "index.js"),
+        path.join(root, "dist", "index.mjs"),
+    ];
+}
+function formatCommandFailure(stdout, stderr) {
+    const detail = (stderr || stdout).trim();
+    if (!detail) {
+        return "command returned a non-zero exit code";
+    }
+    return detail.split("\n").slice(-3).join("\n");
+}
+async function refreshGatewayServiceEnv(params) {
+    const args = ["gateway", "install", "--force"];
+    if (params.jsonMode) {
+        args.push("--json");
+    }
+    for (const candidate of resolveGatewayInstallEntrypointCandidates(params.result.root)) {
+        if (!(await pathExists(candidate))) {
+            continue;
+        }
+        const res = await runCommandWithTimeout([resolveNodeRunner(), candidate, ...args], {
+            timeoutMs: SERVICE_REFRESH_TIMEOUT_MS,
+        });
+        if (res.code === 0) {
+            return;
+        }
+        throw new Error(`updated install refresh failed (${candidate}): ${formatCommandFailure(res.stdout, res.stderr)}`);
+    }
+    await runDaemonInstall({ force: true, json: params.jsonMode || undefined });
+}
 async function tryInstallShellCompletion(opts) {
     if (opts.jsonMode || !process.stdin.isTTY) {
         return;
@@ -93,10 +132,7 @@ async function runPackageInstallUpdate(params) {
         installKind: params.installKind,
         timeoutMs: params.timeoutMs,
     });
-    const runCommand = async (argv, options) => {
-        const res = await runCommandWithTimeout(argv, options);
-        return { stdout: res.stdout, stderr: res.stderr, code: res.code };
-    };
+    const runCommand = createGlobalCommandRunner();
     const pkgRoot = await resolveGlobalPackageRoot(manager, runCommand, params.timeoutMs);
     const packageName = (pkgRoot ? await readPackageName(pkgRoot) : await readPackageName(params.root)) ??
         DEFAULT_PACKAGE_NAME;
@@ -289,6 +325,19 @@ async function maybeRestartService(params) {
         try {
             let restarted = false;
             let restartInitiated = false;
+            if (params.refreshServiceEnv) {
+                try {
+                    await refreshGatewayServiceEnv({
+                        result: params.result,
+                        jsonMode: Boolean(params.opts.json),
+                    });
+                }
+                catch (err) {
+                    if (!params.opts.json) {
+                        defaultRuntime.log(theme.warn(`Failed to refresh gateway service environment from updated install: ${String(err)}`));
+                    }
+                }
+            }
             if (params.restartScriptPath) {
                 await runRestartScript(params.restartScriptPath);
                 restartInitiated = true;
@@ -314,8 +363,32 @@ async function maybeRestartService(params) {
                 }
             }
             if (!params.opts.json && restartInitiated) {
-                defaultRuntime.log(theme.success("Daemon restart initiated."));
-                defaultRuntime.log(theme.muted(`Verify with \`${replaceCliName(formatCliCommand("poolbot gateway status"), CLI_NAME)}\` once the gateway is back.`));
+                const service = resolveGatewayService();
+                let health = await waitForGatewayHealthyRestart({
+                    service,
+                    port: params.gatewayPort,
+                });
+                if (!health.healthy && health.staleGatewayPids.length > 0) {
+                    if (!params.opts.json) {
+                        defaultRuntime.log(theme.warn(`Found stale gateway process(es) after restart: ${health.staleGatewayPids.join(", ")}. Cleaning up...`));
+                    }
+                    await terminateStaleGatewayPids(health.staleGatewayPids);
+                    await runDaemonRestart();
+                    health = await waitForGatewayHealthyRestart({
+                        service,
+                        port: params.gatewayPort,
+                    });
+                }
+                if (health.healthy) {
+                    defaultRuntime.log(theme.success("Daemon restart completed."));
+                }
+                else {
+                    defaultRuntime.log(theme.warn("Gateway did not become healthy after restart."));
+                    for (const line of renderRestartDiagnostics(health)) {
+                        defaultRuntime.log(theme.muted(line));
+                    }
+                    defaultRuntime.log(theme.muted(`Run \`${replaceCliName(formatCliCommand("poolbot gateway status --probe --deep"), CLI_NAME)}\` for details.`));
+                }
                 defaultRuntime.log("");
             }
         }
@@ -339,11 +412,9 @@ async function maybeRestartService(params) {
 }
 export async function updateCommand(opts) {
     suppressDeprecations();
-    const timeoutMs = opts.timeout ? Number.parseInt(opts.timeout, 10) * 1000 : undefined;
+    const timeoutMs = parseTimeoutMsOrExit(opts.timeout);
     const shouldRestart = opts.restart !== false;
-    if (timeoutMs !== undefined && (Number.isNaN(timeoutMs) || timeoutMs <= 0)) {
-        defaultRuntime.error("--timeout must be a positive integer (seconds)");
-        defaultRuntime.exit(1);
+    if (timeoutMs === null) {
         return;
     }
     const root = await resolveUpdateRoot();
@@ -439,11 +510,13 @@ export async function updateCommand(opts) {
     const { progress, stop } = createUpdateProgress(showProgress);
     const startedAt = Date.now();
     let restartScriptPath = null;
+    let refreshGatewayServiceEnv = false;
     if (shouldRestart) {
         try {
             const loaded = await resolveGatewayService().isLoaded({ env: process.env });
             if (loaded) {
                 restartScriptPath = await prepareRestartScript(process.env);
+                refreshGatewayServiceEnv = true;
             }
         }
         catch {
@@ -484,7 +557,7 @@ export async function updateCommand(opts) {
         }
         if (result.reason === "not-git-install") {
             defaultRuntime.log(theme.warn(`Skipped: this Pool Bot install isn't a git checkout, and the package manager couldn't be detected. Update via your package manager, then run \`${replaceCliName(formatCliCommand("poolbot doctor"), CLI_NAME)}\` and \`${replaceCliName(formatCliCommand("poolbot gateway restart"), CLI_NAME)}\`.`));
-            defaultRuntime.log(theme.muted(`Examples: \`${replaceCliName("npm i -g poolbot@latest", CLI_NAME)}\` or \`${replaceCliName("pnpm add -g poolbot@latest", CLI_NAME)}\``));
+            defaultRuntime.log(theme.muted(`Examples: \`${replaceCliName("npm i -g @poolzin/pool-bot@latest", CLI_NAME)}\` or \`${replaceCliName("pnpm add -g poolbot@latest", CLI_NAME)}\``));
         }
         defaultRuntime.exit(0);
         return;
@@ -504,6 +577,8 @@ export async function updateCommand(opts) {
         shouldRestart,
         result,
         opts,
+        refreshServiceEnv: refreshGatewayServiceEnv,
+        gatewayPort: resolveGatewayPort(configSnapshot.valid ? configSnapshot.config : undefined),
         restartScriptPath,
     });
     if (!opts.json) {

package/dist/cli/update-cli/wizard.js

@@ -1,28 +1,22 @@
-import { confirm, isCancel, select } from "@clack/prompts";
+import { confirm, isCancel } from "@clack/prompts";
 import { readConfigFileSnapshot } from "../../config/config.js";
 import { formatUpdateChannelLabel, normalizeUpdateChannel, resolveEffectiveUpdateChannel, } from "../../infra/update-channels.js";
 import { checkUpdateStatus } from "../../infra/update-check.js";
 import { defaultRuntime } from "../../runtime.js";
-import { stylePromptHint, stylePromptMessage } from "../../terminal/prompt-style.js";
+import { selectStyled } from "../../terminal/prompt-select-styled.js";
+import { stylePromptMessage } from "../../terminal/prompt-style.js";
 import { theme } from "../../terminal/theme.js";
 import { pathExists } from "../../utils.js";
-import { isEmptyDir, isGitCheckout, resolveGitInstallDir, resolveUpdateRoot, } from "./shared.js";
+import { isEmptyDir, isGitCheckout, parseTimeoutMsOrExit, resolveGitInstallDir, resolveUpdateRoot, } from "./shared.js";
 import { updateCommand } from "./update-command.js";
-const selectStyled = (params) => select({
-    ...params,
-    message: stylePromptMessage(params.message),
-    options: params.options.map((opt) => opt.hint === undefined ? opt : { ...opt, hint: stylePromptHint(opt.hint) }),
-});
 export async function updateWizardCommand(opts = {}) {
     if (!process.stdin.isTTY) {
         defaultRuntime.error("Update wizard requires a TTY. Use `poolbot update --channel <stable|beta|dev>` instead.");
         defaultRuntime.exit(1);
         return;
     }
-    const timeoutMs = opts.timeout ? Number.parseInt(opts.timeout, 10) * 1000 : undefined;
-    if (timeoutMs !== undefined && (Number.isNaN(timeoutMs) || timeoutMs <= 0)) {
-        defaultRuntime.error("--timeout must be a positive integer (seconds)");
-        defaultRuntime.exit(1);
+    const timeoutMs = parseTimeoutMsOrExit(opts.timeout);
+    if (timeoutMs === null) {
         return;
     }
     const root = await resolveUpdateRoot();

package/dist/commands/agent/run-context.js

@@ -3,25 +3,38 @@ import { resolveMessageChannel } from "../../utils/message-channel.js";
 export function resolveAgentRunContext(opts) {
     const merged = opts.runContext ? { ...opts.runContext } : {};
     const normalizedChannel = resolveMessageChannel(merged.messageChannel ?? opts.messageChannel, opts.replyChannel ?? opts.channel);
-    if (normalizedChannel)
+    if (normalizedChannel) {
         merged.messageChannel = normalizedChannel;
+    }
     const normalizedAccountId = normalizeAccountId(merged.accountId ?? opts.accountId);
-    if (normalizedAccountId)
+    if (normalizedAccountId) {
         merged.accountId = normalizedAccountId;
+    }
     const groupId = (merged.groupId ?? opts.groupId)?.toString().trim();
-    if (groupId)
+    if (groupId) {
         merged.groupId = groupId;
+    }
     const groupChannel = (merged.groupChannel ?? opts.groupChannel)?.toString().trim();
-    if (groupChannel)
+    if (groupChannel) {
         merged.groupChannel = groupChannel;
+    }
     const groupSpace = (merged.groupSpace ?? opts.groupSpace)?.toString().trim();
-    if (groupSpace)
+    if (groupSpace) {
         merged.groupSpace = groupSpace;
+    }
     if (merged.currentThreadTs == null &&
         opts.threadId != null &&
         opts.threadId !== "" &&
         opts.threadId !== null) {
         merged.currentThreadTs = String(opts.threadId);
     }
+    // Populate currentChannelId from the outbound target so that
+    // resolveTelegramAutoThreadId can match the originating chat.
+    if (!merged.currentChannelId && opts.to) {
+        const trimmedTo = opts.to.trim();
+        if (trimmedTo) {
+            merged.currentChannelId = trimmedTo;
+        }
+    }
     return merged;
 }

package/dist/commands/agent/session-store.js

@@ -2,11 +2,13 @@ import { setCliSessionId } from "../../agents/cli-session.js";
 import { lookupContextTokens } from "../../agents/context.js";
 import { DEFAULT_CONTEXT_TOKENS } from "../../agents/defaults.js";
 import { isCliProvider } from "../../agents/model-selection.js";
-import { hasNonzeroUsage } from "../../agents/usage.js";
+import { deriveSessionTotalTokens, hasNonzeroUsage } from "../../agents/usage.js";
 import { updateSessionStore } from "../../config/sessions.js";
 export async function updateSessionStoreAfterAgentRun(params) {
     const { cfg, sessionId, sessionKey, storePath, sessionStore, defaultProvider, defaultModel, fallbackProvider, fallbackModel, result, } = params;
     const usage = result.meta.agentMeta?.usage;
+    const promptTokens = result.meta.agentMeta?.promptTokens;
+    const compactionsThisRun = Math.max(0, result.meta.agentMeta?.compactionCount ?? 0);
     const modelUsed = result.meta.agentMeta?.model ?? fallbackModel ?? defaultModel;
     const providerUsed = result.meta.agentMeta?.provider ?? fallbackProvider ?? defaultProvider;
     const contextTokens = params.contextTokensOverride ?? lookupContextTokens(modelUsed) ?? DEFAULT_CONTEXT_TOKENS;
@@ -24,17 +26,28 @@ export async function updateSessionStoreAfterAgentRun(params) {
     };
     if (isCliProvider(providerUsed, cfg)) {
         const cliSessionId = result.meta.agentMeta?.sessionId?.trim();
-        if (cliSessionId)
+        if (cliSessionId) {
             setCliSessionId(next, providerUsed, cliSessionId);
+        }
     }
     next.abortedLastRun = result.meta.aborted ?? false;
     if (hasNonzeroUsage(usage)) {
         const input = usage.input ?? 0;
         const output = usage.output ?? 0;
-        const promptTokens = input + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
+        const totalTokens = deriveSessionTotalTokens({
+            usage,
+            contextTokens,
+            promptTokens,
+        }) ?? input;
         next.inputTokens = input;
         next.outputTokens = output;
-        next.totalTokens = promptTokens > 0 ? promptTokens : (usage.total ?? input);
+        next.totalTokens = totalTokens;
+        next.totalTokensFresh = true;
+        next.cacheRead = usage.cacheRead ?? 0;
+        next.cacheWrite = usage.cacheWrite ?? 0;
+    }
+    if (compactionsThisRun > 0) {
+        next.compactionCount = (entry.compactionCount ?? 0) + compactionsThisRun;
     }
     sessionStore[sessionKey] = next;
     await updateSessionStore(storePath, (store) => {

package/dist/commands/agent.js

@@ -1,3 +1,4 @@
+import path from "node:path";
 import { listAgentIds, resolveAgentDir, resolveEffectiveModelFallbacks, resolveAgentModelPrimary, resolveAgentSkillsFilter, resolveAgentWorkspaceDir, } from "../agents/agent-scope.js";
 import { ensureAuthProfileStore } from "../agents/auth-profiles.js";
 import { clearSessionAuthProfileOverride } from "../agents/auth-profiles/session-override.js";
@@ -17,7 +18,7 @@ import { formatThinkingLevels, formatXHighModelHint, normalizeThinkLevel, normal
 import { formatCliCommand } from "../cli/command-format.js";
 import { createDefaultDeps } from "../cli/deps.js";
 import { loadConfig } from "../config/config.js";
-import { resolveAgentIdFromSessionKey, resolveSessionFilePath, updateSessionStore, } from "../config/sessions.js";
+import { parseSessionThreadInfo, resolveAndPersistSessionFile, resolveAgentIdFromSessionKey, resolveSessionFilePath, resolveSessionTranscriptPath, updateSessionStore, } from "../config/sessions.js";
 import { clearAgentRunContext, emitAgentEvent, registerAgentRunContext, } from "../infra/agent-events.js";
 import { getRemoteSkillEligibility } from "../infra/skills-remote.js";
 import { normalizeAgentId } from "../routing/session-key.js";
@@ -256,6 +257,7 @@ export async function agentCommand(opts, runtime = defaultRuntime, deps = create
                 storePath,
                 entry: next,
             });
+            sessionEntry = next;
         }
         const agentModelPrimary = resolveAgentModelPrimary(cfg, sessionAgentId);
         const cfgForModelSelection = agentModelPrimary
@@ -387,9 +389,27 @@ export async function agentCommand(opts, runtime = defaultRuntime, deps = create
                 });
             }
         }
-        const sessionFile = resolveSessionFilePath(sessionId, sessionEntry, {
+        let sessionFile = resolveSessionFilePath(sessionId, sessionEntry, {
             agentId: sessionAgentId,
         });
+        if (sessionStore && sessionKey) {
+            const threadIdFromSessionKey = parseSessionThreadInfo(sessionKey).threadId;
+            const fallbackSessionFile = !sessionEntry?.sessionFile
+                ? resolveSessionTranscriptPath(sessionId, sessionAgentId, opts.threadId ?? threadIdFromSessionKey)
+                : undefined;
+            const resolvedSessionFile = await resolveAndPersistSessionFile({
+                sessionId,
+                sessionKey,
+                sessionStore,
+                storePath,
+                sessionEntry,
+                agentId: sessionAgentId,
+                sessionsDir: path.dirname(storePath),
+                fallbackSessionFile,
+            });
+            sessionFile = resolvedSessionFile.sessionFile;
+            sessionEntry = resolvedSessionFile.sessionEntry;
+        }
         const startedAt = Date.now();
         let lifecycleEnded = false;
         let result;

package/dist/commands/agents.bindings.js

@@ -15,14 +15,18 @@ function bindingMatchKey(match) {
 export function describeBinding(binding) {
     const match = binding.match;
     const parts = [match.channel];
-    if (match.accountId)
+    if (match.accountId) {
         parts.push(`accountId=${match.accountId}`);
-    if (match.peer)
+    }
+    if (match.peer) {
         parts.push(`peer=${match.peer.kind}:${match.peer.id}`);
-    if (match.guildId)
+    }
+    if (match.guildId) {
         parts.push(`guild=${match.guildId}`);
-    if (match.teamId)
+    }
+    if (match.teamId) {
         parts.push(`team=${match.teamId}`);
+    }
     return parts.join(" ");
 }
 export function applyAgentBindings(cfg, bindings) {
@@ -68,8 +72,9 @@ export function applyAgentBindings(cfg, bindings) {
 }
 function resolveDefaultAccountId(cfg, provider) {
     const plugin = getChannelPlugin(provider);
-    if (!plugin)
+    if (!plugin) {
         return DEFAULT_ACCOUNT_ID;
+    }
     return resolveChannelDefaultAccountId({ plugin, cfg });
 }
 export function buildChannelBindings(params) {
@@ -98,8 +103,9 @@ export function parseBindingSpecs(params) {
     const agentId = normalizeAgentId(params.agentId);
     for (const raw of specs) {
         const trimmed = raw?.trim();
-        if (!trimmed)
+        if (!trimmed) {
             continue;
+        }
         const [channelRaw, accountRaw] = trimmed.split(":", 2);
         const channel = normalizeChannelId(channelRaw);
         if (!channel) {
@@ -118,8 +124,9 @@ export function parseBindingSpecs(params) {
             }
         }
         const match = { channel };
-        if (accountId)
+        if (accountId) {
             match.accountId = accountId;
+        }
         bindings.push({ agentId, match });
     }
     return { bindings, errors };

package/dist/commands/agents.commands.add.js

@@ -13,8 +13,8 @@ import { WizardCancelledError } from "../wizard/prompts.js";
 import { applyAgentBindings, buildChannelBindings, describeBinding, parseBindingSpecs, } from "./agents.bindings.js";
 import { createQuietRuntime, requireValidConfig } from "./agents.command-shared.js";
 import { applyAgentConfig, findAgentEntryIndex, listAgentEntries } from "./agents.config.js";
-import { applyAuthChoice, warnIfModelConfigLooksOff } from "./auth-choice.js";
 import { promptAuthChoiceGrouped } from "./auth-choice-prompt.js";
+import { applyAuthChoice, warnIfModelConfigLooksOff } from "./auth-choice.js";
 import { setupChannels } from "./onboard-channels.js";
 import { ensureWorkspaceAndSessions } from "./onboard-helpers.js";
 async function fileExists(pathname) {
@@ -28,8 +28,9 @@ async function fileExists(pathname) {
 }
 export async function agentsAddCommand(opts, runtime = defaultRuntime, params) {
     const cfg = await requireValidConfig(runtime);
-    if (!cfg)
+    if (!cfg) {
         return;
+    }
     const workspaceFlag = opts.workspace?.trim();
     const nameInput = opts.name?.trim();
     const hasFlags = params?.hasFlags === true;
@@ -90,8 +91,9 @@ export async function agentsAddCommand(opts, runtime = defaultRuntime, params) {
             ? applyAgentBindings(nextConfig, bindingParse.bindings)
             : { config: nextConfig, added: [], skipped: [], conflicts: [] };
         await writeConfigFile(bindingResult.config);
-        if (!opts.json)
+        if (!opts.json) {
             logConfigUpdated(runtime);
+        }
         const quietRuntime = opts.json ? createQuietRuntime(runtime) : runtime;
         await ensureWorkspaceAndSessions(workspaceDir, quietRuntime, {
             skipBootstrap: Boolean(bindingResult.config.agents?.defaults?.skipBootstrap),
@@ -116,8 +118,9 @@ export async function agentsAddCommand(opts, runtime = defaultRuntime, params) {
             runtime.log(`Agent: ${agentId}`);
             runtime.log(`Workspace: ${shortenHomePath(workspaceDir)}`);
             runtime.log(`Agent dir: ${shortenHomePath(agentDir)}`);
-            if (model)
+            if (model) {
                 runtime.log(`Model: ${model}`);
+            }
             if (bindingResult.conflicts.length > 0) {
                 runtime.error([
                     "Skipped bindings already claimed by another agent:",
@@ -129,13 +132,14 @@ export async function agentsAddCommand(opts, runtime = defaultRuntime, params) {
     }
     const prompter = createClackPrompter();
     try {
-        await prompter.intro("Add Poolbot agent");
+        await prompter.intro("Add Pool Bot agent");
         const name = nameInput ??
             (await prompter.text({
                 message: "Agent name",
                 validate: (value) => {
-                    if (!value?.trim())
+                    if (!value?.trim()) {
                         return "Required";
+                    }
                     const normalized = normalizeAgentId(value);
                     if (normalized === DEFAULT_AGENT_ID) {
                         return `"${DEFAULT_AGENT_ID}" is reserved. Choose another name.`;
@@ -143,7 +147,7 @@ export async function agentsAddCommand(opts, runtime = defaultRuntime, params) {
                     return undefined;
                 },
             }));
-        const agentName = String(name).trim();
+        const agentName = String(name ?? "").trim();
         const agentId = normalizeAgentId(agentName);
         if (agentName !== agentId) {
             await prompter.note(`Normalized id to "${agentId}".`, "Agent id");
@@ -165,7 +169,7 @@ export async function agentsAddCommand(opts, runtime = defaultRuntime, params) {
             initialValue: workspaceDefault,
             validate: (value) => (value?.trim() ? undefined : "Required"),
         });
-        const workspaceDir = resolveUserPath(String(workspaceInput).trim() || workspaceDefault);
+        const workspaceDir = resolveUserPath(String(workspaceInput ?? "").trim() || workspaceDefault);
         const agentDir = resolveAgentDir(cfg, agentId);
         let nextConfig = applyAgentConfig(cfg, {
             agentId,
@@ -285,7 +289,7 @@ export async function agentsAddCommand(opts, runtime = defaultRuntime, params) {
     }
     catch (err) {
         if (err instanceof WizardCancelledError) {
-            runtime.exit(0);
+            runtime.exit(1);
             return;
         }
         throw err;

package/dist/commands/agents.commands.identity.js

@@ -38,8 +38,9 @@ function resolveAgentIdByWorkspace(cfg, workspaceDir) {
 }
 export async function agentsSetIdentityCommand(opts, runtime = defaultRuntime) {
     const cfg = await requireValidConfig(runtime);
-    if (!cfg)
+    if (!cfg) {
         return;
+    }
     const agentRaw = coerceTrimmed(opts.agent);
     const nameRaw = coerceTrimmed(opts.name);
     const emojiRaw = coerceTrimmed(opts.emoji);
@@ -155,14 +156,19 @@ export async function agentsSetIdentityCommand(opts, runtime = defaultRuntime) {
     }
     logConfigUpdated(runtime);
     runtime.log(`Agent: ${agentId}`);
-    if (nextIdentity.name)
+    if (nextIdentity.name) {
         runtime.log(`Name: ${nextIdentity.name}`);
-    if (nextIdentity.theme)
+    }
+    if (nextIdentity.theme) {
         runtime.log(`Theme: ${nextIdentity.theme}`);
-    if (nextIdentity.emoji)
+    }
+    if (nextIdentity.emoji) {
         runtime.log(`Emoji: ${nextIdentity.emoji}`);
-    if (nextIdentity.avatar)
+    }
+    if (nextIdentity.avatar) {
         runtime.log(`Avatar: ${nextIdentity.avatar}`);
-    if (workspaceDir)
+    }
+    if (workspaceDir) {
         runtime.log(`Workspace: ${shortenHomePath(workspaceDir)}`);
+    }
 }

package/dist/commands/agents.commands.list.js

@@ -1,6 +1,6 @@
+import { formatCliCommand } from "../cli/command-format.js";
 import { normalizeAgentId } from "../routing/session-key.js";
 import { defaultRuntime } from "../runtime.js";
-import { formatCliCommand } from "../cli/command-format.js";
 import { shortenHomePath } from "../utils.js";
 import { describeBinding } from "./agents.bindings.js";
 import { requireValidConfig } from "./agents.command-shared.js";
@@ -12,10 +12,12 @@ function formatSummary(summary) {
         ? `${summary.id}${defaultTag} (${summary.name})`
         : `${summary.id}${defaultTag}`;
     const identityParts = [];
-    if (summary.identityEmoji)
+    if (summary.identityEmoji) {
         identityParts.push(summary.identityEmoji);
-    if (summary.identityName)
+    }
+    if (summary.identityName) {
         identityParts.push(summary.identityName);
+    }
     const identityLine = identityParts.length > 0 ? identityParts.join(" ") : null;
     const identitySource = summary.identitySource === "identity"
         ? "IDENTITY.md"
@@ -28,8 +30,9 @@ function formatSummary(summary) {
     }
     lines.push(`  Workspace: ${shortenHomePath(summary.workspace)}`);
     lines.push(`  Agent dir: ${shortenHomePath(summary.agentDir)}`);
-    if (summary.model)
+    if (summary.model) {
         lines.push(`  Model: ${summary.model}`);
+    }
     lines.push(`  Routing rules: ${summary.bindings}`);
     if (summary.routes?.length) {
         lines.push(`  Routing: ${summary.routes.join(", ")}`);
@@ -50,8 +53,9 @@ function formatSummary(summary) {
 }
 export async function agentsListCommand(opts, runtime = defaultRuntime) {
     const cfg = await requireValidConfig(runtime);
-    if (!cfg)
+    if (!cfg) {
         return;
+    }
     const summaries = buildAgentSummaries(cfg);
     const bindingMap = new Map();
     for (const binding of cfg.bindings ?? []) {
@@ -84,8 +88,9 @@ export async function agentsListCommand(opts, runtime = defaultRuntime) {
             bindings,
             providerStatus,
         });
-        if (providerLines.length > 0)
+        if (providerLines.length > 0) {
             summary.providers = providerLines;
+        }
     }
     if (opts.json) {
         runtime.log(JSON.stringify(summaries, null, 2));

package/dist/commands/agents.config.js

@@ -1,12 +1,7 @@
-import { resolveAgentDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, } from "../agents/agent-scope.js";
+import { listAgentEntries, resolveAgentDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, } from "../agents/agent-scope.js";
 import { identityHasValues, loadAgentIdentityFromWorkspace, parseIdentityMarkdown as parseIdentityMarkdownFile, } from "../agents/identity-file.js";
 import { normalizeAgentId } from "../routing/session-key.js";
-export function listAgentEntries(cfg) {
-    const list = cfg.agents?.list;
-    if (!Array.isArray(list))
-        return [];
-    return list.filter((entry) => Boolean(entry && typeof entry === "object"));
-}
+export { listAgentEntries };
 export function findAgentEntryIndex(list, agentId) {
     const id = normalizeAgentId(agentId);
     return list.findIndex((entry) => normalizeAgentId(entry.id) === id);
@@ -23,13 +18,15 @@ function resolveAgentModel(cfg, agentId) {
         }
         if (typeof entry.model === "object") {
             const primary = entry.model.primary?.trim();
-            if (primary)
+            if (primary) {
                 return primary;
+            }
         }
     }
     const raw = cfg.agents?.defaults?.model;
-    if (typeof raw === "string")
+    if (typeof raw === "string") {
         return raw;
+    }
     return raw?.primary?.trim() || undefined;
 }
 export function parseIdentityMarkdown(content) {
@@ -37,8 +34,9 @@ export function parseIdentityMarkdown(content) {
 }
 export function loadAgentIdentity(workspace) {
     const parsed = loadAgentIdentityFromWorkspace(workspace);
-    if (!parsed)
+    if (!parsed) {
         return null;
+    }
     return identityHasValues(parsed) ? parsed : null;
 }
 export function buildAgentSummaries(cfg) {