@poolzin/pool-bot 2026.1.39 → 2026.2.0

package/dist/agents/session-transcript-repair.js

@@ -1,3 +1,4 @@
+const TOOL_CALL_TYPES = new Set(["toolCall", "toolUse", "functionCall"]);
 function extractToolCallsFromAssistant(msg) {
     const content = msg.content;
     if (!Array.isArray(content))
@@ -18,6 +19,18 @@ function extractToolCallsFromAssistant(msg) {
     }
     return toolCalls;
 }
+function isToolCallBlock(block) {
+    if (!block || typeof block !== "object") {
+        return false;
+    }
+    const type = block.type;
+    return typeof type === "string" && TOOL_CALL_TYPES.has(type);
+}
+function hasToolCallInput(block) {
+    const hasInput = "input" in block ? block.input !== undefined && block.input !== null : false;
+    const hasArguments = "arguments" in block ? block.arguments !== undefined && block.arguments !== null : false;
+    return hasInput || hasArguments;
+}
 function extractToolResultId(msg) {
     const toolCallId = msg.toolCallId;
     if (typeof toolCallId === "string" && toolCallId)
@@ -43,6 +56,51 @@ function makeMissingToolResult(params) {
     };
 }
 export { makeMissingToolResult };
+export function repairToolCallInputs(messages) {
+    let droppedToolCalls = 0;
+    let droppedAssistantMessages = 0;
+    let changed = false;
+    const out = [];
+    for (const msg of messages) {
+        if (!msg || typeof msg !== "object") {
+            out.push(msg);
+            continue;
+        }
+        if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
+            out.push(msg);
+            continue;
+        }
+        const nextContent = [];
+        let droppedInMessage = 0;
+        for (const block of msg.content) {
+            if (isToolCallBlock(block) && !hasToolCallInput(block)) {
+                droppedToolCalls += 1;
+                droppedInMessage += 1;
+                changed = true;
+                continue;
+            }
+            nextContent.push(block);
+        }
+        if (droppedInMessage > 0) {
+            if (nextContent.length === 0) {
+                droppedAssistantMessages += 1;
+                changed = true;
+                continue;
+            }
+            out.push({ ...msg, content: nextContent });
+            continue;
+        }
+        out.push(msg);
+    }
+    return {
+        messages: changed ? out : messages,
+        droppedToolCalls,
+        droppedAssistantMessages,
+    };
+}
+export function sanitizeToolCallInputs(messages) {
+    return repairToolCallInputs(messages).messages;
+}
 export function sanitizeToolUseResultPairing(messages) {
     return repairToolUseResultPairing(messages).messages;
 }
@@ -92,6 +150,16 @@ export function repairToolUseResultPairing(messages) {
             continue;
         }
         const assistant = msg;
+        // Skip tool call extraction for aborted or errored assistant messages.
+        // When stopReason is "error" or "aborted", the tool_use blocks may be incomplete
+        // (e.g., partialJson: true) and should not have synthetic tool_results created.
+        // Creating synthetic results for incomplete tool calls causes API 400 errors:
+        // "unexpected tool_use_id found in tool_result blocks"
+        const stopReason = assistant.stopReason;
+        if (stopReason === "error" || stopReason === "aborted") {
+            out.push(msg);
+            continue;
+        }
         const toolCalls = extractToolCallsFromAssistant(assistant);
         if (toolCalls.length === 0) {
             out.push(msg);

package/dist/agents/skills/frontmatter.js

@@ -67,7 +67,7 @@ function parseFrontmatterBool(value, fallback) {
     const parsed = parseBooleanValue(value);
     return parsed === undefined ? fallback : parsed;
 }
-export function resolveMoltbotMetadata(frontmatter) {
+export function resolvePoolbotMetadata(frontmatter) {
     const raw = getFrontmatterValue(frontmatter, "metadata");
     if (!raw)
         return undefined;

package/dist/agents/skills/workspace.js

@@ -5,7 +5,7 @@ import { createSubsystemLogger } from "../../logging/subsystem.js";
 import { CONFIG_DIR, resolveUserPath } from "../../utils.js";
 import { resolveBundledSkillsDir } from "./bundled-dir.js";
 import { shouldIncludeSkill } from "./config.js";
-import { parseFrontmatter, resolveMoltbotMetadata, resolveSkillInvocationPolicy, } from "./frontmatter.js";
+import { parseFrontmatter, resolvePoolbotMetadata, resolveSkillInvocationPolicy, } from "./frontmatter.js";
 import { resolvePluginSkillDirs } from "./plugin-skills.js";
 import { serializeByKey } from "./serialize.js";
 const fsp = fs.promises;
@@ -129,7 +129,7 @@ function loadSkillEntries(workspaceDir, opts) {
         return {
             skill,
             frontmatter,
-            metadata: resolveMoltbotMetadata(frontmatter),
+            metadata: resolvePoolbotMetadata(frontmatter),
             invocation: resolveSkillInvocationPolicy(frontmatter),
         };
     });

package/dist/agents/system-prompt.js

@@ -23,11 +23,18 @@ function buildMemorySection(params) {
     if (!params.availableTools.has("memory_search") && !params.availableTools.has("memory_get")) {
         return [];
     }
-    return [
+    const lines = [
         "## Memory Recall",
         "Before answering anything about prior work, decisions, dates, people, preferences, or todos: run memory_search on MEMORY.md + memory/*.md; then use memory_get to pull only the needed lines. If low confidence after search, say you checked.",
-        "",
     ];
+    if (params.citationsMode === "off") {
+        lines.push("Citations are disabled: do not mention file paths or line numbers in replies unless the user explicitly asks.");
+    }
+    else {
+        lines.push("Citations: include Source: <path#line> when it helps the user verify memory snippets.");
+    }
+    lines.push("");
+    return lines;
 }
 function buildUserIdentitySection(ownerLine, isMinimal) {
     if (!ownerLine || isMinimal)
@@ -46,7 +53,7 @@ function buildReplyTagsSection(isMinimal) {
         "## Reply Tags",
         "To request a native reply/quote on supported surfaces, include one tag in your reply:",
         "- [[reply_to_current]] replies to the triggering message.",
-        "- [[reply_to:<id>]] replies to a specific message id when you have it.",
+        "- Prefer [[reply_to_current]]. Use [[reply_to:<id>]] only when an id was explicitly provided (e.g. by the user or a tool).",
         "Whitespace inside the tag is allowed (e.g. [[ reply_to_current ]] / [[ reply_to: 123 ]]).",
         "Tags are stripped before sending; support depends on the current channel config.",
         "",
@@ -228,12 +235,23 @@ export function buildAgentSystemPrompt(params) {
     const messageChannelOptions = listDeliverableMessageChannels().join("|");
     const promptMode = params.promptMode ?? "full";
     const isMinimal = promptMode === "minimal" || promptMode === "none";
+    const safetySection = [
+        "## Safety",
+        "You have no independent goals: do not pursue self-preservation, replication, resource acquisition, or power-seeking; avoid long-term plans beyond the user's request.",
+        "Prioritize safety and human oversight over completion; if instructions conflict, pause and ask; comply with stop/pause/audit requests and never bypass safeguards. (Inspired by Anthropic's constitution.)",
+        "Do not manipulate or persuade anyone to expand access or disable safeguards. Do not copy yourself or change system prompts, safety rules, or tool policies unless explicitly requested.",
+        "",
+    ];
     const skillsSection = buildSkillsSection({
         skillsPrompt,
         isMinimal,
         readToolName,
     });
-    const memorySection = buildMemorySection({ isMinimal, availableTools });
+    const memorySection = buildMemorySection({
+        isMinimal,
+        availableTools,
+        citationsMode: params.memoryCitationsMode,
+    });
     const docsSection = buildDocsSection({
         docsPath: params.docsPath,
         isMinimal,
@@ -267,6 +285,7 @@ export function buildAgentSystemPrompt(params) {
                 "- sessions_list: list sessions",
                 "- sessions_history: fetch session history",
                 "- sessions_send: send to another session",
+                '- session_status: show usage/time/model state and answer "what model are we using?"',
             ].join("\n"),
         "TOOLS.md does not control tool availability; it is user guidance for how to use external tools.",
         "If a task is more complex or takes longer, spawn a sub-agent. It will do the work for you and ping you when it's done. You can always check up on it.",
@@ -277,6 +296,7 @@ export function buildAgentSystemPrompt(params) {
         "Keep narration brief and value-dense; avoid repeating obvious steps.",
         "Use plain human language for narration unless in a technical context.",
         "",
+        ...safetySection,
         "## Pool Bot CLI Quick Reference",
         "Pool Bot is controlled via subcommands. Do not invent commands.",
         "To manage the Gateway daemon service (start/stop/restart):",
@@ -311,6 +331,9 @@ export function buildAgentSystemPrompt(params) {
             ? params.modelAliasLines.join("\n")
             : "",
         params.modelAliasLines && params.modelAliasLines.length > 0 && !isMinimal ? "" : "",
+        userTimezone
+            ? "If you need the current date, time, or day of week, run session_status (📊 session_status)."
+            : "",
         "## Workspace",
         `Your working directory is: ${params.workspaceDir}`,
         "Treat this directory as the single global workspace for file operations unless explicitly instructed otherwise.",
@@ -445,6 +468,7 @@ export function buildRuntimeLine(runtimeInfo, runtimeChannel, runtimeCapabilitie
         runtimeInfo?.node ? `node=${runtimeInfo.node}` : "",
         runtimeInfo?.model ? `model=${runtimeInfo.model}` : "",
         runtimeInfo?.defaultModel ? `default_model=${runtimeInfo.defaultModel}` : "",
+        runtimeInfo?.shell ? `shell=${runtimeInfo.shell}` : "",
         runtimeChannel ? `channel=${runtimeChannel}` : "",
         runtimeChannel
             ? `capabilities=${runtimeCapabilities.length > 0 ? runtimeCapabilities.join(",") : "none"}`

package/dist/agents/together-models.js

@@ -0,0 +1,127 @@
+export const TOGETHER_BASE_URL = "https://api.together.xyz/v1";
+export const TOGETHER_MODEL_CATALOG = [
+    {
+        id: "zai-org/GLM-4.7",
+        name: "GLM 4.7 Fp8",
+        reasoning: false,
+        input: ["text"],
+        contextWindow: 202752,
+        maxTokens: 8192,
+        cost: {
+            input: 0.45,
+            output: 2.0,
+            cacheRead: 0.45,
+            cacheWrite: 2.0,
+        },
+    },
+    {
+        id: "moonshotai/Kimi-K2.5",
+        name: "Kimi K2.5",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: {
+            input: 0.5,
+            output: 2.8,
+            cacheRead: 0.5,
+            cacheWrite: 2.8,
+        },
+        contextWindow: 262144,
+        maxTokens: 32768,
+    },
+    {
+        id: "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+        name: "Llama 3.3 70B Instruct Turbo",
+        reasoning: false,
+        input: ["text"],
+        contextWindow: 131072,
+        maxTokens: 8192,
+        cost: {
+            input: 0.88,
+            output: 0.88,
+            cacheRead: 0.88,
+            cacheWrite: 0.88,
+        },
+    },
+    {
+        id: "meta-llama/Llama-4-Scout-17B-16E-Instruct",
+        name: "Llama 4 Scout 17B 16E Instruct",
+        reasoning: false,
+        input: ["text", "image"],
+        contextWindow: 10000000,
+        maxTokens: 32768,
+        cost: {
+            input: 0.18,
+            output: 0.59,
+            cacheRead: 0.18,
+            cacheWrite: 0.18,
+        },
+    },
+    {
+        id: "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8",
+        name: "Llama 4 Maverick 17B 128E Instruct FP8",
+        reasoning: false,
+        input: ["text", "image"],
+        contextWindow: 20000000,
+        maxTokens: 32768,
+        cost: {
+            input: 0.27,
+            output: 0.85,
+            cacheRead: 0.27,
+            cacheWrite: 0.27,
+        },
+    },
+    {
+        id: "deepseek-ai/DeepSeek-V3.1",
+        name: "DeepSeek V3.1",
+        reasoning: false,
+        input: ["text"],
+        contextWindow: 131072,
+        maxTokens: 8192,
+        cost: {
+            input: 0.6,
+            output: 1.25,
+            cacheRead: 0.6,
+            cacheWrite: 0.6,
+        },
+    },
+    {
+        id: "deepseek-ai/DeepSeek-R1",
+        name: "DeepSeek R1",
+        reasoning: true,
+        input: ["text"],
+        contextWindow: 131072,
+        maxTokens: 8192,
+        cost: {
+            input: 3.0,
+            output: 7.0,
+            cacheRead: 3.0,
+            cacheWrite: 3.0,
+        },
+    },
+    {
+        id: "moonshotai/Kimi-K2-Instruct-0905",
+        name: "Kimi K2-Instruct 0905",
+        reasoning: false,
+        input: ["text"],
+        contextWindow: 262144,
+        maxTokens: 8192,
+        cost: {
+            input: 1.0,
+            output: 3.0,
+            cacheRead: 1.0,
+            cacheWrite: 3.0,
+        },
+    },
+];
+export function buildTogetherModelDefinition(model) {
+    return {
+        id: model.id,
+        name: model.name,
+        api: "openai-completions",
+        reasoning: model.reasoning,
+        input: model.input,
+        cost: model.cost,
+        contextWindow: model.contextWindow,
+        maxTokens: model.maxTokens,
+    };
+}

package/dist/agents/tool-images.js

@@ -1,6 +1,6 @@
 import { createSubsystemLogger } from "../logging/subsystem.js";
 import { getImageMetadata, resizeToJpeg } from "../media/image-ops.js";
-// Anthropic Messages API limitations (observed in Moltbot sessions):
+// Anthropic Messages API limitations (observed in Poolbot sessions):
 // - Images over ~2000px per side can fail in multi-image requests.
 // - Images over 5MB are rejected by the API.
 //

package/dist/agents/tool-policy.js

@@ -26,7 +26,7 @@ export const TOOL_GROUPS = {
     "group:messaging": ["message"],
     // Nodes + device tools
     "group:nodes": ["nodes"],
-    // All Moltbot native tools (excludes provider plugins).
+    // All Poolbot native tools (excludes provider plugins).
     "group:poolbot": [
         "browser",
         "canvas",

package/dist/agents/tools/browser-tool.js

@@ -143,11 +143,11 @@ export function createBrowserTool(opts) {
         label: "Browser",
         name: "browser",
         description: [
-            "Control the browser via Moltbot's browser control server (status/start/stop/profiles/tabs/open/snapshot/screenshot/actions).",
+            "Control the browser via Poolbot's browser control server (status/start/stop/profiles/tabs/open/snapshot/screenshot/actions).",
             'Profiles: use profile="chrome" for Chrome extension relay takeover (your existing Chrome tabs). Use profile="clawd" for the isolated clawd-managed browser.',
             'If the user mentions the Chrome extension / Browser Relay / toolbar button / “attach tab”, ALWAYS use profile="chrome" (do not ask which profile).',
             'When a node-hosted browser proxy is available, the tool may auto-route to it. Pin a node with node=<id|name> or target="node".',
-            "Chrome extension relay needs an attached tab: user must click the Moltbot Browser Relay toolbar icon on the tab (badge ON). If no tab is connected, ask them to attach it.",
+            "Chrome extension relay needs an attached tab: user must click the Poolbot Browser Relay toolbar icon on the tab (badge ON). If no tab is connected, ask them to attach it.",
             "When using refs from snapshot (e.g. e12), keep the same tab: prefer passing targetId from the snapshot response into subsequent actions (act/click/type/etc).",
             'For stable, self-resolving refs across calls, use snapshot with refs="aria" (Playwright aria-ref ids). Default refs="role" are role+name-based.',
             "Use snapshot+act for UI automation. Avoid act:wait by default; use only in exceptional cases when no reliable UI state exists.",
@@ -581,7 +581,7 @@ export function createBrowserTool(opts) {
                                 })).tabs ?? [])
                                 : await browserTabs(baseUrl, { profile }).catch(() => []);
                             if (!tabs.length) {
-                                throw new Error("No Chrome tabs are attached via the Moltbot Browser Relay extension. Click the toolbar icon on the tab you want to control (badge ON), then retry.");
+                                throw new Error("No Chrome tabs are attached via the Poolbot Browser Relay extension. Click the toolbar icon on the tab you want to control (badge ON), then retry.");
                             }
                             throw new Error(`Chrome tab not found (stale targetId?). Run action=tabs profile="chrome" and use one of the returned targetIds.`);
                         }

package/dist/agents/tools/image-tool.js

@@ -11,7 +11,7 @@ import { minimaxUnderstandImage } from "../minimax-vlm.js";
 import { getApiKeyForModel, requireApiKey, resolveEnvApiKey } from "../model-auth.js";
 import { runWithImageModelFallback } from "../model-fallback.js";
 import { resolveConfiguredModelRef } from "../model-selection.js";
-import { ensureMoltbotModelsJson } from "../models-config.js";
+import { ensurePoolbotModelsJson } from "../models-config.js";
 import { assertSandboxPath } from "../sandbox-paths.js";
 import { coerceImageAssistantText, coerceImageModelConfig, decodeDataUrl, resolveProviderVisionModelFromConfig, } from "./image-tool.helpers.js";
 const DEFAULT_PROMPT = "Describe the image.";
@@ -187,7 +187,7 @@ async function runImagePrompt(params) {
             },
         }
         : undefined;
-    await ensureMoltbotModelsJson(effectiveCfg, params.agentDir);
+    await ensurePoolbotModelsJson(effectiveCfg, params.agentDir);
     const authStorage = discoverAuthStorage(params.agentDir);
     const modelRegistry = discoverModels(authStorage, params.agentDir);
     const result = await runWithImageModelFallback({

package/dist/agents/tools/memory-tool.js

@@ -1,5 +1,7 @@
 import { Type } from "@sinclair/typebox";
+import { resolveMemoryBackendConfig } from "../../memory/backend-config.js";
 import { getMemorySearchManager } from "../../memory/index.js";
+import { parseAgentSessionKey } from "../../routing/session-key.js";
 import { resolveSessionAgentId } from "../agent-scope.js";
 import { resolveMemorySearchConfig } from "../memory-search.js";
 import { jsonResult, readNumberParam, readStringParam } from "./common.js";
@@ -15,14 +17,16 @@ const MemoryGetSchema = Type.Object({
 });
 export function createMemorySearchTool(options) {
     const cfg = options.config;
-    if (!cfg)
+    if (!cfg) {
         return null;
+    }
     const agentId = resolveSessionAgentId({
         sessionKey: options.agentSessionKey,
         config: cfg,
     });
-    if (!resolveMemorySearchConfig(cfg, agentId))
+    if (!resolveMemorySearchConfig(cfg, agentId)) {
         return null;
+    }
     return {
         label: "Memory Search",
         name: "memory_search",
@@ -40,17 +44,28 @@ export function createMemorySearchTool(options) {
                 return jsonResult({ results: [], disabled: true, error });
             }
             try {
-                const results = await manager.search(query, {
+                const citationsMode = resolveMemoryCitationsMode(cfg);
+                const includeCitations = shouldIncludeCitations({
+                    mode: citationsMode,
+                    sessionKey: options.agentSessionKey,
+                });
+                const rawResults = await manager.search(query, {
                     maxResults,
                     minScore,
                     sessionKey: options.agentSessionKey,
                 });
                 const status = manager.status();
+                const decorated = decorateCitations(rawResults, includeCitations);
+                const resolved = resolveMemoryBackendConfig({ cfg, agentId });
+                const results = status.backend === "qmd"
+                    ? clampResultsByInjectedChars(decorated, resolved.qmd?.limits.maxInjectedChars)
+                    : decorated;
                 return jsonResult({
                     results,
                     provider: status.provider,
                     model: status.model,
                     fallback: status.fallback,
+                    citations: citationsMode,
                 });
             }
             catch (err) {
@@ -62,14 +77,16 @@ export function createMemorySearchTool(options) {
 }
 export function createMemoryGetTool(options) {
     const cfg = options.config;
-    if (!cfg)
+    if (!cfg) {
         return null;
+    }
     const agentId = resolveSessionAgentId({
         sessionKey: options.agentSessionKey,
         config: cfg,
     });
-    if (!resolveMemorySearchConfig(cfg, agentId))
+    if (!resolveMemorySearchConfig(cfg, agentId)) {
         return null;
+    }
     return {
         label: "Memory Get",
         name: "memory_get",
@@ -101,3 +118,74 @@ export function createMemoryGetTool(options) {
         },
     };
 }
+function resolveMemoryCitationsMode(cfg) {
+    const mode = cfg.memory?.citations;
+    if (mode === "on" || mode === "off" || mode === "auto") {
+        return mode;
+    }
+    return "auto";
+}
+function decorateCitations(results, include) {
+    if (!include) {
+        return results.map((entry) => ({ ...entry, citation: undefined }));
+    }
+    return results.map((entry) => {
+        const citation = formatCitation(entry);
+        const snippet = `${entry.snippet.trim()}\n\nSource: ${citation}`;
+        return { ...entry, citation, snippet };
+    });
+}
+function formatCitation(entry) {
+    const lineRange = entry.startLine === entry.endLine
+        ? `#L${entry.startLine}`
+        : `#L${entry.startLine}-L${entry.endLine}`;
+    return `${entry.path}${lineRange}`;
+}
+function clampResultsByInjectedChars(results, budget) {
+    if (!budget || budget <= 0) {
+        return results;
+    }
+    let remaining = budget;
+    const clamped = [];
+    for (const entry of results) {
+        if (remaining <= 0) {
+            break;
+        }
+        const snippet = entry.snippet ?? "";
+        if (snippet.length <= remaining) {
+            clamped.push(entry);
+            remaining -= snippet.length;
+        }
+        else {
+            const trimmed = snippet.slice(0, Math.max(0, remaining));
+            clamped.push({ ...entry, snippet: trimmed });
+            break;
+        }
+    }
+    return clamped;
+}
+function shouldIncludeCitations(params) {
+    if (params.mode === "on") {
+        return true;
+    }
+    if (params.mode === "off") {
+        return false;
+    }
+    // auto: show citations in direct chats; suppress in groups/channels by default.
+    const chatType = deriveChatTypeFromSessionKey(params.sessionKey);
+    return chatType === "direct";
+}
+function deriveChatTypeFromSessionKey(sessionKey) {
+    const parsed = parseAgentSessionKey(sessionKey);
+    if (!parsed?.rest) {
+        return "direct";
+    }
+    const tokens = new Set(parsed.rest.toLowerCase().split(":").filter(Boolean));
+    if (tokens.has("channel")) {
+        return "channel";
+    }
+    if (tokens.has("group")) {
+        return "group";
+    }
+    return "direct";
+}

package/dist/agents/tools/web-search.js

@@ -190,7 +190,7 @@ async function runPerplexitySearch(params) {
             "Content-Type": "application/json",
             Authorization: `Bearer ${params.apiKey}`,
             "HTTP-Referer": "https://molt.bot",
-            "X-Title": "Moltbot Web Search",
+            "X-Title": "Poolbot Web Search",
         },
         body: JSON.stringify({
             model: params.model,

package/dist/auto-reply/commands-registry.data.js

@@ -322,7 +322,7 @@ function buildChatCommands() {
         defineChatCommand({
             key: "restart",
             nativeName: "restart",
-            description: "Restart Moltbot.",
+            description: "Restart Poolbot.",
             textAlias: "/restart",
             category: "tools",
         }),

package/dist/auto-reply/reply/commands-context-report.js

@@ -1,6 +1,6 @@
 import { resolveSessionAgentIds } from "../../agents/agent-scope.js";
 import { resolveBootstrapMaxChars } from "../../agents/pi-embedded-helpers.js";
-import { createMoltbotCodingTools } from "../../agents/pi-tools.js";
+import { createPoolbotCodingTools } from "../../agents/pi-tools.js";
 import { resolveSandboxRuntimeStatus } from "../../agents/sandbox.js";
 import { buildWorkspaceSkillSnapshot } from "../../agents/skills.js";
 import { getSkillsSnapshotVersion } from "../../agents/skills/refresh.js";
@@ -66,7 +66,7 @@ async function resolveContextReport(params) {
     });
     const tools = (() => {
         try {
-            return createMoltbotCodingTools({
+            return createPoolbotCodingTools({
                 config: params.cfg,
                 workspaceDir,
                 sessionKey: params.sessionKey,

package/dist/auto-reply/reply/commands-session.js

@@ -2,7 +2,7 @@ import { abortEmbeddedPiRun } from "../../agents/pi-embedded.js";
 import { updateSessionStore } from "../../config/sessions.js";
 import { logVerbose } from "../../globals.js";
 import { createInternalHookEvent, triggerInternalHook } from "../../hooks/internal-hooks.js";
-import { scheduleGatewaySigusr1Restart, triggerMoltbotRestart } from "../../infra/restart.js";
+import { scheduleGatewaySigusr1Restart, triggerPoolbotRestart } from "../../infra/restart.js";
 import { parseActivationCommand } from "../group-activation.js";
 import { parseSendPolicyCommand } from "../send-policy.js";
 import { normalizeUsageDisplay, resolveResponseUsageMode } from "../thinking.js";
@@ -214,7 +214,7 @@ export const handleRestartCommand = async (params, allowTextCommands) => {
             },
         };
     }
-    const restartMethod = triggerMoltbotRestart();
+    const restartMethod = triggerPoolbotRestart();
     if (!restartMethod.ok) {
         const detail = restartMethod.detail ? ` Details: ${restartMethod.detail}` : "";
         return {

package/dist/auto-reply/reply/get-reply-run.js

@@ -17,7 +17,9 @@ import { buildGroupIntro } from "./groups.js";
 import { resolveQueueSettings } from "./queue.js";
 import { ensureSkillSnapshot, prependSystemEvents } from "./session-updates.js";
 import { resolveTypingMode } from "./typing-mode.js";
-const BARE_SESSION_RESET_PROMPT = "A new session was started via /new or /reset. Say hi briefly (1-2 sentences) and ask what the user wants to do next. If the runtime model differs from default_model in the system prompt, mention the default model in the greeting. Do not mention internal steps, files, tools, or reasoning.";
+import { buildInboundMetaSystemPrompt, buildInboundUserContextPrefix } from "./inbound-meta.js";
+import { appendUntrustedContext } from "./untrusted-context.js";
+const BARE_SESSION_RESET_PROMPT = "A new session was started via /new or /reset. Greet the user in your configured persona, if one is provided. Be yourself - use your defined voice, mannerisms, and mood. Keep it to 1-3 sentences and ask what they want to do. If the runtime model differs from default_model in the system prompt, mention the default model. Do not mention internal steps, files, tools, or reasoning.";
 export async function runPreparedReply(params) {
     const { ctx, sessionCtx, cfg, agentId, agentDir, agentCfg, sessionCfg, commandAuthorized, command, commandSource, allowTextCommands, directives, defaultActivation, elevatedEnabled, elevatedAllowed, blockStreamingEnabled, blockReplyChunking, resolvedBlockStreamingBreak, modelState, provider, model, perMessageQueueMode, perMessageQueueOptions, typing, opts, defaultProvider, defaultModel, timeoutMs, isNewSession, resetTriggered, systemSent, sessionKey, sessionId, storePath, workspaceDir, sessionStore, } = params;
     let { sessionEntry, resolvedThinkLevel, resolvedVerboseLevel, resolvedReasoningLevel, resolvedElevatedLevel, execOverrides, abortedLastRun, } = params;
@@ -43,7 +45,10 @@ export async function runPreparedReply(params) {
         })
         : "";
     const groupSystemPrompt = sessionCtx.GroupSystemPrompt?.trim() ?? "";
-    const extraSystemPrompt = [groupIntro, groupSystemPrompt].filter(Boolean).join("\n\n");
+    const inboundMetaPrompt = buildInboundMetaSystemPrompt(isNewSession ? sessionCtx : { ...sessionCtx, ThreadStarterBody: undefined });
+    const extraSystemPrompt = [inboundMetaPrompt, groupIntro, groupSystemPrompt]
+        .filter(Boolean)
+        .join("\n\n");
     const baseBody = sessionCtx.BodyStripped ?? sessionCtx.Body ?? "";
     // Use CommandBody/RawBody for bare reset detection (clean message without structural context).
     const rawBodyTrimmed = (ctx.CommandBody ?? ctx.RawBody ?? ctx.Body ?? "").trim();
@@ -59,7 +64,11 @@ export async function runPreparedReply(params) {
     const isBareSessionReset = isNewSession &&
         ((baseBodyTrimmedRaw.length === 0 && rawBodyTrimmed.length > 0) || isBareNewOrReset);
     const baseBodyFinal = isBareSessionReset ? BARE_SESSION_RESET_PROMPT : baseBody;
-    const baseBodyTrimmed = baseBodyFinal.trim();
+    const inboundUserContext = buildInboundUserContextPrefix(isNewSession ? sessionCtx : { ...sessionCtx, ThreadStarterBody: undefined });
+    const baseBodyForPrompt = isBareSessionReset
+        ? baseBodyFinal
+        : [inboundUserContext, baseBodyFinal].filter(Boolean).join("\n\n");
+    const baseBodyTrimmed = baseBodyForPrompt.trim();
     if (!baseBodyTrimmed) {
         await typing.onReplyStart();
         logVerbose("Inbound body empty after normalization; skipping agent run");
@@ -69,7 +78,7 @@ export async function runPreparedReply(params) {
         };
     }
     let prefixedBodyBase = await applySessionHints({
-        baseBody: baseBodyFinal,
+        baseBody: baseBodyForPrompt,
         abortedLastRun,
         sessionEntry,
         sessionStore,
@@ -87,6 +96,7 @@ export async function runPreparedReply(params) {
         isNewSession,
         prefixedBodyBase,
     });
+    prefixedBodyBase = appendUntrustedContext(prefixedBodyBase, sessionCtx.UntrustedContext);
     const threadStarterBody = ctx.ThreadStarterBody?.trim();
     const threadStarterNote = isNewSession && threadStarterBody
         ? `[Thread starter - for context]\n${threadStarterBody}`