chore: prep 2026.1.14 npm release

This commit is contained in:
Peter Steinberger
2026-01-15 07:46:51 +00:00
parent 081e5ef572
commit 79f340a410
18 changed files with 353 additions and 348 deletions

View File

@@ -1,6 +1,6 @@
# Changelog # Changelog
## 2026.1.14 (unreleased) ## 2026.1.14
### Changes ### Changes
- Docs: clarify per-agent auth stores, sandboxed skill binaries, and elevated semantics. - Docs: clarify per-agent auth stores, sandboxed skill binaries, and elevated semantics.
@@ -23,6 +23,11 @@
- CLI/Docs: add per-command CLI doc pages and link them from `clawdbot <command> --help`. - CLI/Docs: add per-command CLI doc pages and link them from `clawdbot <command> --help`.
- Browser: copy the installed Chrome extension path to clipboard after `clawdbot browser extension install/path`. - Browser: copy the installed Chrome extension path to clipboard after `clawdbot browser extension install/path`.
- WhatsApp: add `channels.whatsapp.sendReadReceipts` to disable auto read receipts. (#882) — thanks @chrisrodz. - WhatsApp: add `channels.whatsapp.sendReadReceipts` to disable auto read receipts. (#882) — thanks @chrisrodz.
- Usage: add MiniMax coding plan usage tracking.
- Auth: label Claude Code CLI auth options. (#915) — thanks @SeanZoR.
- Docs: standardize Claude Code CLI naming across docs and prompts. (follow-up to #915)
- Telegram: add message delete action in the message tool. (#903) — thanks @sleontenko.
- Config: add `channels.<provider>.configWrites` gating for channel-initiated config writes; migrate Slack channel IDs.
### Fixes ### Fixes
- Gateway: forward termination signals to respawned CLI child processes to avoid orphaned systemd runs. (#933) — thanks @roshanasingh4. - Gateway: forward termination signals to respawned CLI child processes to avoid orphaned systemd runs. (#933) — thanks @roshanasingh4.
@@ -50,22 +55,11 @@
- Telegram: let control commands bypass per-chat sequentialization; always allow abort triggers. - Telegram: let control commands bypass per-chat sequentialization; always allow abort triggers.
- Auto-reply: treat trailing `NO_REPLY` tokens as silent replies. - Auto-reply: treat trailing `NO_REPLY` tokens as silent replies.
- Config: prevent partial config writes from clobbering unrelated settings (base hash guard + merge patch for connection saves). - Config: prevent partial config writes from clobbering unrelated settings (base hash guard + merge patch for connection saves).
## 2026.1.14
### Changes
- Usage: add MiniMax coding plan usage tracking.
- Auth: label Claude Code CLI auth options. (#915) — thanks @SeanZoR.
- Docs: standardize Claude Code CLI naming across docs and prompts. (follow-up to #915)
- Telegram: add message delete action in the message tool. (#903) — thanks @sleontenko.
- Config: add `channels.<provider>.configWrites` gating for channel-initiated config writes; migrate Slack channel IDs.
### Fixes
- Sessions: return deep clones (`structuredClone`) so cached session entries can't be mutated. (#934) — thanks @ronak-guliani. - Sessions: return deep clones (`structuredClone`) so cached session entries can't be mutated. (#934) — thanks @ronak-guliani.
- Heartbeat: keep `updatedAt` monotonic when restoring heartbeat sessions. (#934) — thanks @ronak-guliani. - Heartbeat: keep `updatedAt` monotonic when restoring heartbeat sessions. (#934) — thanks @ronak-guliani.
- Agent: clear run context after CLI runs (`clearAgentRunContext`) to avoid runaway contexts. (#934) — thanks @ronak-guliani. - Agent: clear run context after CLI runs (`clearAgentRunContext`) to avoid runaway contexts. (#934) — thanks @ronak-guliani.
- Mac: pass auth token/password to dashboard URL for authenticated access. (#918) — thanks @rahthakor. - Mac: pass auth token/password to dashboard URL for authenticated access. (#918) — thanks @rahthakor.
- UI: use application-defined WebSocket close code (browser compatibility). (#918) — thanks @rahthakor. - UI: use application-defined WebSocket close code (browser compatibility). (#918) — thanks @rahthakor.
- TUI: render picker overlays via the overlay stack so /models and /settings display. (#921) — thanks @grizzdank. - TUI: render picker overlays via the overlay stack so /models and /settings display. (#921) — thanks @grizzdank.
- TUI: add a bright spinner + elapsed time in the status line for send/stream/run states. - TUI: add a bright spinner + elapsed time in the status line for send/stream/run states.
- Gateway/Dev: ensure `pnpm gateway:dev` always uses the dev profile config + state (`~/.clawdbot-dev`). - Gateway/Dev: ensure `pnpm gateway:dev` always uses the dev profile config + state (`~/.clawdbot-dev`).

View File

@@ -21,7 +21,7 @@ type PackageJson = {
}; };
function runPackDry(): PackResult[] { function runPackDry(): PackResult[] {
const raw = execSync("npm pack --dry-run --json", { const raw = execSync("npm pack --dry-run --json --ignore-scripts", {
encoding: "utf8", encoding: "utf8",
stdio: ["ignore", "pipe", "pipe"], stdio: ["ignore", "pipe", "pipe"],
}); });

View File

@@ -54,7 +54,10 @@ describe("browser extension install", () => {
const program = new Command(); const program = new Command();
const browser = program.command("browser").option("--json", false); const browser = program.command("browser").option("--json", false);
registerBrowserExtensionCommands(browser, (cmd) => cmd.parent?.opts?.() as { json?: boolean }); registerBrowserExtensionCommands(
browser,
(cmd) => cmd.parent?.opts?.() as { json?: boolean },
);
await program.parseAsync(["browser", "extension", "path"], { from: "user" }); await program.parseAsync(["browser", "extension", "path"], { from: "user" });

View File

@@ -18,19 +18,20 @@ export function registerWakeCommand(program: Command) {
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/wake", "docs.clawd.bot/cli/wake")}\n`, () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/wake", "docs.clawd.bot/cli/wake")}\n`,
).action(async (opts: GatewayRpcOpts & { text?: string; mode?: string }) => { )
try { .action(async (opts: GatewayRpcOpts & { text?: string; mode?: string }) => {
const result = await callGatewayFromCli( try {
"wake", const result = await callGatewayFromCli(
opts, "wake",
{ mode: opts.mode, text: opts.text }, opts,
{ expectFinal: false }, { mode: opts.mode, text: opts.text },
); { expectFinal: false },
if (opts.json) defaultRuntime.log(JSON.stringify(result, null, 2)); );
else defaultRuntime.log("ok"); if (opts.json) defaultRuntime.log(JSON.stringify(result, null, 2));
} catch (err) { else defaultRuntime.log("ok");
defaultRuntime.error(danger(String(err))); } catch (err) {
defaultRuntime.exit(1); defaultRuntime.error(danger(String(err)));
} defaultRuntime.exit(1);
}); }
});
} }

View File

@@ -27,7 +27,8 @@ export function registerHooksCli(program: Command) {
.description("Webhook helpers and hook-based integrations") .description("Webhook helpers and hook-based integrations")
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/hooks", "docs.clawd.bot/cli/hooks")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/hooks", "docs.clawd.bot/cli/hooks")}\n`,
); );
const gmail = hooks.command("gmail").description("Gmail Pub/Sub hooks (via gogcli)"); const gmail = hooks.command("gmail").description("Gmail Pub/Sub hooks (via gogcli)");

View File

@@ -25,7 +25,8 @@ export function registerMemoryCli(program: Command) {
.description("Memory search tools") .description("Memory search tools")
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/memory", "docs.clawd.bot/cli/memory")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/memory", "docs.clawd.bot/cli/memory")}\n`,
); );
memory memory

View File

@@ -16,7 +16,8 @@ export function registerNodesCli(program: Command) {
.description("Manage gateway-owned node pairing") .description("Manage gateway-owned node pairing")
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/nodes", "docs.clawd.bot/cli/nodes")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/nodes", "docs.clawd.bot/cli/nodes")}\n`,
); );
registerNodesStatusCommands(nodes); registerNodesStatusCommands(nodes);

View File

@@ -68,7 +68,8 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
.description("Manage isolated agents (workspaces + auth + routing)") .description("Manage isolated agents (workspaces + auth + routing)")
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/agents", "docs.clawd.bot/cli/agents")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/agents", "docs.clawd.bot/cli/agents")}\n`,
); );
agents agents

View File

@@ -13,7 +13,8 @@ export function registerMaintenanceCommands(program: Command) {
.description("Health checks + quick fixes for the gateway and channels") .description("Health checks + quick fixes for the gateway and channels")
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/doctor", "docs.clawd.bot/cli/doctor")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/doctor", "docs.clawd.bot/cli/doctor")}\n`,
) )
.option("--no-workspace-suggestions", "Disable workspace memory system suggestions", false) .option("--no-workspace-suggestions", "Disable workspace memory system suggestions", false)
.option("--yes", "Accept defaults without prompting", false) .option("--yes", "Accept defaults without prompting", false)
@@ -64,7 +65,8 @@ export function registerMaintenanceCommands(program: Command) {
.description("Reset local config/state (keeps the CLI installed)") .description("Reset local config/state (keeps the CLI installed)")
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/reset", "docs.clawd.bot/cli/reset")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/reset", "docs.clawd.bot/cli/reset")}\n`,
) )
.option("--scope <scope>", "config|config+creds+sessions|full (default: interactive prompt)") .option("--scope <scope>", "config|config+creds+sessions|full (default: interactive prompt)")
.option("--yes", "Skip confirmation prompts", false) .option("--yes", "Skip confirmation prompts", false)

View File

@@ -12,7 +12,8 @@ export function registerSetupCommand(program: Command) {
.description("Initialize ~/.clawdbot/clawdbot.json and the agent workspace") .description("Initialize ~/.clawdbot/clawdbot.json and the agent workspace")
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/setup", "docs.clawd.bot/cli/setup")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/setup", "docs.clawd.bot/cli/setup")}\n`,
) )
.option( .option(
"--workspace <dir>", "--workspace <dir>",

View File

@@ -33,7 +33,8 @@ Examples:
) )
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/status", "docs.clawd.bot/cli/status")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/status", "docs.clawd.bot/cli/status")}\n`,
) )
.action(async (opts) => { .action(async (opts) => {
const verbose = Boolean(opts.verbose || opts.debug); const verbose = Boolean(opts.verbose || opts.debug);
@@ -71,7 +72,8 @@ Examples:
.option("--debug", "Alias for --verbose", false) .option("--debug", "Alias for --verbose", false)
.addHelpText( .addHelpText(
"after", "after",
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/health", "docs.clawd.bot/cli/health")}\n`, () =>
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/health", "docs.clawd.bot/cli/health")}\n`,
) )
.action(async (opts) => { .action(async (opts) => {
const verbose = Boolean(opts.verbose || opts.debug); const verbose = Boolean(opts.verbose || opts.debug);

View File

@@ -38,7 +38,11 @@ import {
type SessionEntry, type SessionEntry,
saveSessionStore, saveSessionStore,
} from "../config/sessions.js"; } from "../config/sessions.js";
import { clearAgentRunContext, emitAgentEvent, registerAgentRunContext } from "../infra/agent-events.js"; import {
clearAgentRunContext,
emitAgentEvent,
registerAgentRunContext,
} from "../infra/agent-events.js";
import { defaultRuntime, type RuntimeEnv } from "../runtime.js"; import { defaultRuntime, type RuntimeEnv } from "../runtime.js";
import { applyVerboseOverride } from "../sessions/level-overrides.js"; import { applyVerboseOverride } from "../sessions/level-overrides.js";
import { resolveSendPolicy } from "../sessions/send-policy.js"; import { resolveSendPolicy } from "../sessions/send-policy.js";
@@ -137,305 +141,308 @@ export async function agentCommand(
} }
} }
let resolvedThinkLevel = let resolvedThinkLevel =
thinkOnce ?? thinkOnce ??
thinkOverride ?? thinkOverride ??
persistedThinking ?? persistedThinking ??
(agentCfg?.thinkingDefault as ThinkLevel | undefined); (agentCfg?.thinkingDefault as ThinkLevel | undefined);
const resolvedVerboseLevel = const resolvedVerboseLevel =
verboseOverride ?? persistedVerbose ?? (agentCfg?.verboseDefault as VerboseLevel | undefined); verboseOverride ?? persistedVerbose ?? (agentCfg?.verboseDefault as VerboseLevel | undefined);
if (sessionKey) { if (sessionKey) {
registerAgentRunContext(runId, { registerAgentRunContext(runId, {
sessionKey, sessionKey,
verboseLevel: resolvedVerboseLevel, verboseLevel: resolvedVerboseLevel,
}); });
}
const needsSkillsSnapshot = isNewSession || !sessionEntry?.skillsSnapshot;
const skillsSnapshot = needsSkillsSnapshot
? buildWorkspaceSkillSnapshot(workspaceDir, { config: cfg })
: sessionEntry?.skillsSnapshot;
if (skillsSnapshot && sessionStore && sessionKey && needsSkillsSnapshot) {
const current = sessionEntry ?? {
sessionId,
updatedAt: Date.now(),
};
const next: SessionEntry = {
...current,
sessionId,
updatedAt: Date.now(),
skillsSnapshot,
};
sessionStore[sessionKey] = next;
await saveSessionStore(storePath, sessionStore);
sessionEntry = next;
}
// Persist explicit /command overrides to the session store when we have a key.
if (sessionStore && sessionKey) {
const entry = sessionStore[sessionKey] ?? sessionEntry ?? { sessionId, updatedAt: Date.now() };
const next: SessionEntry = { ...entry, sessionId, updatedAt: Date.now() };
if (thinkOverride) {
if (thinkOverride === "off") delete next.thinkingLevel;
else next.thinkingLevel = thinkOverride;
} }
applyVerboseOverride(next, verboseOverride);
sessionStore[sessionKey] = next;
await saveSessionStore(storePath, sessionStore);
}
const agentModelPrimary = resolveAgentModelPrimary(cfg, sessionAgentId); const needsSkillsSnapshot = isNewSession || !sessionEntry?.skillsSnapshot;
const cfgForModelSelection = agentModelPrimary const skillsSnapshot = needsSkillsSnapshot
? { ? buildWorkspaceSkillSnapshot(workspaceDir, { config: cfg })
...cfg, : sessionEntry?.skillsSnapshot;
agents: {
...cfg.agents, if (skillsSnapshot && sessionStore && sessionKey && needsSkillsSnapshot) {
defaults: { const current = sessionEntry ?? {
...cfg.agents?.defaults, sessionId,
model: { updatedAt: Date.now(),
...(typeof cfg.agents?.defaults?.model === "object" };
? cfg.agents.defaults.model const next: SessionEntry = {
: undefined), ...current,
primary: agentModelPrimary, sessionId,
updatedAt: Date.now(),
skillsSnapshot,
};
sessionStore[sessionKey] = next;
await saveSessionStore(storePath, sessionStore);
sessionEntry = next;
}
// Persist explicit /command overrides to the session store when we have a key.
if (sessionStore && sessionKey) {
const entry = sessionStore[sessionKey] ??
sessionEntry ?? { sessionId, updatedAt: Date.now() };
const next: SessionEntry = { ...entry, sessionId, updatedAt: Date.now() };
if (thinkOverride) {
if (thinkOverride === "off") delete next.thinkingLevel;
else next.thinkingLevel = thinkOverride;
}
applyVerboseOverride(next, verboseOverride);
sessionStore[sessionKey] = next;
await saveSessionStore(storePath, sessionStore);
}
const agentModelPrimary = resolveAgentModelPrimary(cfg, sessionAgentId);
const cfgForModelSelection = agentModelPrimary
? {
...cfg,
agents: {
...cfg.agents,
defaults: {
...cfg.agents?.defaults,
model: {
...(typeof cfg.agents?.defaults?.model === "object"
? cfg.agents.defaults.model
: undefined),
primary: agentModelPrimary,
},
}, },
}, },
}, }
} : cfg;
: cfg;
const { provider: defaultProvider, model: defaultModel } = resolveConfiguredModelRef({ const { provider: defaultProvider, model: defaultModel } = resolveConfiguredModelRef({
cfg: cfgForModelSelection, cfg: cfgForModelSelection,
defaultProvider: DEFAULT_PROVIDER, defaultProvider: DEFAULT_PROVIDER,
defaultModel: DEFAULT_MODEL, defaultModel: DEFAULT_MODEL,
});
let provider = defaultProvider;
let model = defaultModel;
const hasAllowlist = agentCfg?.models && Object.keys(agentCfg.models).length > 0;
const hasStoredOverride = Boolean(sessionEntry?.modelOverride || sessionEntry?.providerOverride);
const needsModelCatalog = hasAllowlist || hasStoredOverride;
let allowedModelKeys = new Set<string>();
let allowedModelCatalog: Awaited<ReturnType<typeof loadModelCatalog>> = [];
let modelCatalog: Awaited<ReturnType<typeof loadModelCatalog>> | null = null;
if (needsModelCatalog) {
modelCatalog = await loadModelCatalog({ config: cfg });
const allowed = buildAllowedModelSet({
cfg,
catalog: modelCatalog,
defaultProvider,
defaultModel,
}); });
allowedModelKeys = allowed.allowedKeys; let provider = defaultProvider;
allowedModelCatalog = allowed.allowedCatalog; let model = defaultModel;
} const hasAllowlist = agentCfg?.models && Object.keys(agentCfg.models).length > 0;
const hasStoredOverride = Boolean(
sessionEntry?.modelOverride || sessionEntry?.providerOverride,
);
const needsModelCatalog = hasAllowlist || hasStoredOverride;
let allowedModelKeys = new Set<string>();
let allowedModelCatalog: Awaited<ReturnType<typeof loadModelCatalog>> = [];
let modelCatalog: Awaited<ReturnType<typeof loadModelCatalog>> | null = null;
if (sessionEntry && sessionStore && sessionKey && hasStoredOverride) { if (needsModelCatalog) {
const overrideProvider = sessionEntry.providerOverride?.trim() || defaultProvider; modelCatalog = await loadModelCatalog({ config: cfg });
const overrideModel = sessionEntry.modelOverride?.trim(); const allowed = buildAllowedModelSet({
if (overrideModel) { cfg,
const key = modelKey(overrideProvider, overrideModel); catalog: modelCatalog,
defaultProvider,
defaultModel,
});
allowedModelKeys = allowed.allowedKeys;
allowedModelCatalog = allowed.allowedCatalog;
}
if (sessionEntry && sessionStore && sessionKey && hasStoredOverride) {
const overrideProvider = sessionEntry.providerOverride?.trim() || defaultProvider;
const overrideModel = sessionEntry.modelOverride?.trim();
if (overrideModel) {
const key = modelKey(overrideProvider, overrideModel);
if (
!isCliProvider(overrideProvider, cfg) &&
allowedModelKeys.size > 0 &&
!allowedModelKeys.has(key)
) {
delete sessionEntry.providerOverride;
delete sessionEntry.modelOverride;
sessionEntry.updatedAt = Date.now();
sessionStore[sessionKey] = sessionEntry;
await saveSessionStore(storePath, sessionStore);
}
}
}
const storedProviderOverride = sessionEntry?.providerOverride?.trim();
const storedModelOverride = sessionEntry?.modelOverride?.trim();
if (storedModelOverride) {
const candidateProvider = storedProviderOverride || defaultProvider;
const key = modelKey(candidateProvider, storedModelOverride);
if ( if (
!isCliProvider(overrideProvider, cfg) && isCliProvider(candidateProvider, cfg) ||
allowedModelKeys.size > 0 && allowedModelKeys.size === 0 ||
!allowedModelKeys.has(key) allowedModelKeys.has(key)
) { ) {
delete sessionEntry.providerOverride; provider = candidateProvider;
delete sessionEntry.modelOverride; model = storedModelOverride;
}
}
if (sessionEntry?.authProfileOverride) {
const store = ensureAuthProfileStore();
const profile = store.profiles[sessionEntry.authProfileOverride];
if (!profile || profile.provider !== provider) {
delete sessionEntry.authProfileOverride;
sessionEntry.updatedAt = Date.now();
if (sessionStore && sessionKey) {
sessionStore[sessionKey] = sessionEntry;
await saveSessionStore(storePath, sessionStore);
}
}
}
if (!resolvedThinkLevel) {
let catalogForThinking = modelCatalog ?? allowedModelCatalog;
if (!catalogForThinking || catalogForThinking.length === 0) {
modelCatalog = await loadModelCatalog({ config: cfg });
catalogForThinking = modelCatalog;
}
resolvedThinkLevel = resolveThinkingDefault({
cfg,
provider,
model,
catalog: catalogForThinking,
});
}
if (resolvedThinkLevel === "xhigh" && !supportsXHighThinking(provider, model)) {
const explicitThink = Boolean(thinkOnce || thinkOverride);
if (explicitThink) {
throw new Error(`Thinking level "xhigh" is only supported for ${formatXHighModelHint()}.`);
}
resolvedThinkLevel = "high";
if (sessionEntry && sessionStore && sessionKey && sessionEntry.thinkingLevel === "xhigh") {
sessionEntry.thinkingLevel = "high";
sessionEntry.updatedAt = Date.now(); sessionEntry.updatedAt = Date.now();
sessionStore[sessionKey] = sessionEntry; sessionStore[sessionKey] = sessionEntry;
await saveSessionStore(storePath, sessionStore); await saveSessionStore(storePath, sessionStore);
} }
} }
} const sessionFile = resolveSessionFilePath(sessionId, sessionEntry, {
agentId: sessionAgentId,
const storedProviderOverride = sessionEntry?.providerOverride?.trim();
const storedModelOverride = sessionEntry?.modelOverride?.trim();
if (storedModelOverride) {
const candidateProvider = storedProviderOverride || defaultProvider;
const key = modelKey(candidateProvider, storedModelOverride);
if (
isCliProvider(candidateProvider, cfg) ||
allowedModelKeys.size === 0 ||
allowedModelKeys.has(key)
) {
provider = candidateProvider;
model = storedModelOverride;
}
}
if (sessionEntry?.authProfileOverride) {
const store = ensureAuthProfileStore();
const profile = store.profiles[sessionEntry.authProfileOverride];
if (!profile || profile.provider !== provider) {
delete sessionEntry.authProfileOverride;
sessionEntry.updatedAt = Date.now();
if (sessionStore && sessionKey) {
sessionStore[sessionKey] = sessionEntry;
await saveSessionStore(storePath, sessionStore);
}
}
}
if (!resolvedThinkLevel) {
let catalogForThinking = modelCatalog ?? allowedModelCatalog;
if (!catalogForThinking || catalogForThinking.length === 0) {
modelCatalog = await loadModelCatalog({ config: cfg });
catalogForThinking = modelCatalog;
}
resolvedThinkLevel = resolveThinkingDefault({
cfg,
provider,
model,
catalog: catalogForThinking,
}); });
}
if (resolvedThinkLevel === "xhigh" && !supportsXHighThinking(provider, model)) {
const explicitThink = Boolean(thinkOnce || thinkOverride);
if (explicitThink) {
throw new Error(`Thinking level "xhigh" is only supported for ${formatXHighModelHint()}.`);
}
resolvedThinkLevel = "high";
if (sessionEntry && sessionStore && sessionKey && sessionEntry.thinkingLevel === "xhigh") {
sessionEntry.thinkingLevel = "high";
sessionEntry.updatedAt = Date.now();
sessionStore[sessionKey] = sessionEntry;
await saveSessionStore(storePath, sessionStore);
}
}
const sessionFile = resolveSessionFilePath(sessionId, sessionEntry, {
agentId: sessionAgentId,
});
const startedAt = Date.now(); const startedAt = Date.now();
let lifecycleEnded = false; let lifecycleEnded = false;
let result: Awaited<ReturnType<typeof runEmbeddedPiAgent>>; let result: Awaited<ReturnType<typeof runEmbeddedPiAgent>>;
let fallbackProvider = provider; let fallbackProvider = provider;
let fallbackModel = model; let fallbackModel = model;
try { try {
const messageChannel = resolveMessageChannel(opts.messageChannel, opts.channel); const messageChannel = resolveMessageChannel(opts.messageChannel, opts.channel);
const fallbackResult = await runWithModelFallback({ const fallbackResult = await runWithModelFallback({
cfg, cfg,
provider, provider,
model, model,
fallbacksOverride: resolveAgentModelFallbacksOverride(cfg, sessionAgentId), fallbacksOverride: resolveAgentModelFallbacksOverride(cfg, sessionAgentId),
run: (providerOverride, modelOverride) => { run: (providerOverride, modelOverride) => {
if (isCliProvider(providerOverride, cfg)) { if (isCliProvider(providerOverride, cfg)) {
const cliSessionId = getCliSessionId(sessionEntry, providerOverride); const cliSessionId = getCliSessionId(sessionEntry, providerOverride);
return runCliAgent({ return runCliAgent({
sessionId,
sessionKey,
sessionFile,
workspaceDir,
config: cfg,
prompt: body,
provider: providerOverride,
model: modelOverride,
thinkLevel: resolvedThinkLevel,
timeoutMs,
runId,
extraSystemPrompt: opts.extraSystemPrompt,
cliSessionId,
images: opts.images,
});
}
return runEmbeddedPiAgent({
sessionId, sessionId,
sessionKey, sessionKey,
messageChannel,
sessionFile, sessionFile,
workspaceDir, workspaceDir,
config: cfg, config: cfg,
skillsSnapshot,
prompt: body, prompt: body,
images: opts.images,
provider: providerOverride, provider: providerOverride,
model: modelOverride, model: modelOverride,
authProfileId: sessionEntry?.authProfileOverride,
thinkLevel: resolvedThinkLevel, thinkLevel: resolvedThinkLevel,
verboseLevel: resolvedVerboseLevel,
timeoutMs, timeoutMs,
runId, runId,
lane: opts.lane,
abortSignal: opts.abortSignal,
extraSystemPrompt: opts.extraSystemPrompt, extraSystemPrompt: opts.extraSystemPrompt,
cliSessionId, agentDir,
images: opts.images, onAgentEvent: (evt) => {
if (
evt.stream === "lifecycle" &&
typeof evt.data?.phase === "string" &&
(evt.data.phase === "end" || evt.data.phase === "error")
) {
lifecycleEnded = true;
}
emitAgentEvent({
runId,
stream: evt.stream,
data: evt.data,
});
},
}); });
} },
return runEmbeddedPiAgent({ });
sessionId, result = fallbackResult.result;
sessionKey, fallbackProvider = fallbackResult.provider;
messageChannel, fallbackModel = fallbackResult.model;
sessionFile, if (!lifecycleEnded) {
workspaceDir, emitAgentEvent({
config: cfg,
skillsSnapshot,
prompt: body,
images: opts.images,
provider: providerOverride,
model: modelOverride,
authProfileId: sessionEntry?.authProfileOverride,
thinkLevel: resolvedThinkLevel,
verboseLevel: resolvedVerboseLevel,
timeoutMs,
runId, runId,
lane: opts.lane, stream: "lifecycle",
abortSignal: opts.abortSignal, data: {
extraSystemPrompt: opts.extraSystemPrompt, phase: "end",
agentDir, startedAt,
onAgentEvent: (evt) => { endedAt: Date.now(),
if ( aborted: result.meta.aborted ?? false,
evt.stream === "lifecycle" &&
typeof evt.data?.phase === "string" &&
(evt.data.phase === "end" || evt.data.phase === "error")
) {
lifecycleEnded = true;
}
emitAgentEvent({
runId,
stream: evt.stream,
data: evt.data,
});
}, },
}); });
}, }
}); } catch (err) {
result = fallbackResult.result; if (!lifecycleEnded) {
fallbackProvider = fallbackResult.provider; emitAgentEvent({
fallbackModel = fallbackResult.model; runId,
if (!lifecycleEnded) { stream: "lifecycle",
emitAgentEvent({ data: {
runId, phase: "error",
stream: "lifecycle", startedAt,
data: { endedAt: Date.now(),
phase: "end", error: String(err),
startedAt, },
endedAt: Date.now(), });
aborted: result.meta.aborted ?? false, }
}, throw err;
});
} }
} catch (err) {
if (!lifecycleEnded) {
emitAgentEvent({
runId,
stream: "lifecycle",
data: {
phase: "error",
startedAt,
endedAt: Date.now(),
error: String(err),
},
});
}
throw err;
}
// Update token+model fields in the session store. // Update token+model fields in the session store.
if (sessionStore && sessionKey) { if (sessionStore && sessionKey) {
await updateSessionStoreAfterAgentRun({ await updateSessionStoreAfterAgentRun({
cfg,
contextTokensOverride: agentCfg?.contextTokens,
sessionId,
sessionKey,
storePath,
sessionStore,
defaultProvider: provider,
defaultModel: model,
fallbackProvider,
fallbackModel,
result,
});
}
const payloads = result.payloads ?? [];
return await deliverAgentCommandResult({
cfg, cfg,
contextTokensOverride: agentCfg?.contextTokens, deps,
sessionId, runtime,
sessionKey, opts,
storePath, sessionEntry,
sessionStore,
defaultProvider: provider,
defaultModel: model,
fallbackProvider,
fallbackModel,
result, result,
payloads,
}); });
}
const payloads = result.payloads ?? [];
return await deliverAgentCommandResult({
cfg,
deps,
runtime,
opts,
sessionEntry,
result,
payloads,
});
} finally { } finally {
clearAgentRunContext(runId); clearAgentRunContext(runId);
} }

View File

@@ -163,7 +163,6 @@ async function handleMissingSandboxImage(
} }
if (built) return; if (built) return;
} }
export async function maybeRepairSandboxImages( export async function maybeRepairSandboxImages(

View File

@@ -4,9 +4,7 @@ export const GATEWAY_SYSTEMD_SERVICE_NAME = "clawdbot-gateway";
export const GATEWAY_WINDOWS_TASK_NAME = "Clawdbot Gateway"; export const GATEWAY_WINDOWS_TASK_NAME = "Clawdbot Gateway";
export const GATEWAY_SERVICE_MARKER = "clawdbot"; export const GATEWAY_SERVICE_MARKER = "clawdbot";
export const GATEWAY_SERVICE_KIND = "gateway"; export const GATEWAY_SERVICE_KIND = "gateway";
export const LEGACY_GATEWAY_LAUNCH_AGENT_LABELS = [ export const LEGACY_GATEWAY_LAUNCH_AGENT_LABELS = ["com.steipete.clawdbot.gateway"];
"com.steipete.clawdbot.gateway",
];
export const LEGACY_GATEWAY_SYSTEMD_SERVICE_NAMES: string[] = []; export const LEGACY_GATEWAY_SYSTEMD_SERVICE_NAMES: string[] = [];
export const LEGACY_GATEWAY_WINDOWS_TASK_NAMES: string[] = []; export const LEGACY_GATEWAY_WINDOWS_TASK_NAMES: string[] = [];

View File

@@ -28,7 +28,6 @@ function resolveTaskScriptPath(env: Record<string, string | undefined>): string
return path.join(home, `.clawdbot${suffix}`, "gateway.cmd"); return path.join(home, `.clawdbot${suffix}`, "gateway.cmd");
} }
function quoteCmdArg(value: string): string { function quoteCmdArg(value: string): string {
if (!/[ \t"]/g.test(value)) return value; if (!/[ \t"]/g.test(value)) return value;
return `"${value.replace(/"/g, '\\"')}"`; return `"${value.replace(/"/g, '\\"')}"`;

View File

@@ -25,14 +25,10 @@ function ensureExperimentalWarningSuppressed(): boolean {
process.env.CLAWDBOT_NODE_OPTIONS_READY = "1"; process.env.CLAWDBOT_NODE_OPTIONS_READY = "1";
process.env.NODE_OPTIONS = `${nodeOptions} ${EXPERIMENTAL_WARNING_FLAG}`.trim(); process.env.NODE_OPTIONS = `${nodeOptions} ${EXPERIMENTAL_WARNING_FLAG}`.trim();
const child = spawn( const child = spawn(process.execPath, [...process.execArgv, ...process.argv.slice(1)], {
process.execPath, stdio: "inherit",
[...process.execArgv, ...process.argv.slice(1)], env: process.env,
{ });
stdio: "inherit",
env: process.env,
},
);
attachChildProcessBridge(child); attachChildProcessBridge(child);

View File

@@ -76,40 +76,36 @@ describe("attachChildProcessBridge", () => {
children.length = 0; children.length = 0;
}); });
it( it("forwards SIGTERM to the wrapped child", async () => {
"forwards SIGTERM to the wrapped child", const childPath = path.resolve(process.cwd(), "test/fixtures/child-process-bridge/child.js");
async () => {
const childPath = path.resolve(process.cwd(), "test/fixtures/child-process-bridge/child.js");
const child = spawn(process.execPath, [childPath], { const child = spawn(process.execPath, [childPath], {
stdio: ["ignore", "pipe", "inherit"], stdio: ["ignore", "pipe", "inherit"],
env: process.env, env: process.env,
});
const { detach } = attachChildProcessBridge(child);
detachments.push(detach);
children.push(child);
if (!child.stdout) throw new Error("expected stdout");
const portLine = await waitForLine(child.stdout);
const port = Number(portLine);
expect(Number.isFinite(port)).toBe(true);
expect(await canConnect(port)).toBe(true);
// Simulate systemd sending SIGTERM to the parent process.
process.emit("SIGTERM");
await new Promise<void>((resolve, reject) => {
const timeout = setTimeout(() => reject(new Error("timeout waiting for child exit")), 10_000);
child.once("exit", () => {
clearTimeout(timeout);
resolve();
}); });
const { detach } = attachChildProcessBridge(child); });
detachments.push(detach);
children.push(child);
if (!child.stdout) throw new Error("expected stdout"); await new Promise((r) => setTimeout(r, 250));
const portLine = await waitForLine(child.stdout); expect(await canConnect(port)).toBe(false);
const port = Number(portLine); }, 20_000);
expect(Number.isFinite(port)).toBe(true);
expect(await canConnect(port)).toBe(true);
// Simulate systemd sending SIGTERM to the parent process.
process.emit("SIGTERM");
await new Promise<void>((resolve, reject) => {
const timeout = setTimeout(() => reject(new Error("timeout waiting for child exit")), 10_000);
child.once("exit", () => {
clearTimeout(timeout);
resolve();
});
});
await new Promise((r) => setTimeout(r, 250));
expect(await canConnect(port)).toBe(false);
},
20_000,
);
}); });

View File

@@ -69,7 +69,10 @@ export function getTelegramSequentialKey(ctx: {
const chatId = msg?.chat?.id ?? ctx.chat?.id; const chatId = msg?.chat?.id ?? ctx.chat?.id;
const rawText = msg?.text ?? msg?.caption; const rawText = msg?.text ?? msg?.caption;
const botUsername = (ctx as { me?: { username?: string } }).me?.username; const botUsername = (ctx as { me?: { username?: string } }).me?.username;
if (rawText && isControlCommandMessage(rawText, undefined, botUsername ? { botUsername } : undefined)) { if (
rawText &&
isControlCommandMessage(rawText, undefined, botUsername ? { botUsername } : undefined)
) {
if (typeof chatId === "number") return `telegram:${chatId}:control`; if (typeof chatId === "number") return `telegram:${chatId}:control`;
return "telegram:control"; return "telegram:control";
} }