@gguf/pigbot 0.0.1 → 0.0.2

package/dist/agents/pi-embedded-runner/compact.js

@@ -13,16 +13,16 @@ import { normalizeMessageChannel } from "../../utils/message-channel.js";
 import { isSubagentSessionKey } from "../../routing/session-key.js";
 import { isReasoningTagProvider } from "../../utils/provider-utils.js";
 import { resolveUserPath } from "../../utils.js";
-import { resolvePigbotAgentDir } from "../agent-paths.js";
+import { resolveMoltbotAgentDir } from "../agent-paths.js";
 import { resolveSessionAgentIds } from "../agent-scope.js";
 import { makeBootstrapWarn, resolveBootstrapContextForRun } from "../bootstrap-files.js";
-import { resolvePigbotDocsPath } from "../docs-path.js";
+import { resolveMoltbotDocsPath } from "../docs-path.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../defaults.js";
 import { getApiKeyForModel, resolveModelAuthMode } from "../model-auth.js";
-import { ensurePigbotModelsJson } from "../models-config.js";
+import { ensureMoltbotModelsJson } from "../models-config.js";
 import { ensureSessionHeader, validateAnthropicTurns, validateGeminiTurns, } from "../pi-embedded-helpers.js";
 import { ensurePiCompactionReserveTokens, resolveCompactionReserveTokensFloor, } from "../pi-settings.js";
-import { createPigbotCodingTools } from "../pi-tools.js";
+import { createMoltbotCodingTools } from "../pi-tools.js";
 import { resolveSandboxContext } from "../sandbox.js";
 import { guardSessionManager } from "../session-tool-result-guard-wrapper.js";
 import { resolveTranscriptPolicy } from "../transcript-policy.js";
@@ -50,8 +50,8 @@ export async function compactEmbeddedPiSessionDirect(params) {
     const prevCwd = process.cwd();
     const provider = (params.provider ?? DEFAULT_PROVIDER).trim() || DEFAULT_PROVIDER;
     const modelId = (params.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
-    const agentDir = params.agentDir ?? resolvePigbotAgentDir();
-    await ensurePigbotModelsJson(params.config, agentDir);
+    const agentDir = params.agentDir ?? resolveMoltbotAgentDir();
+    await ensureMoltbotModelsJson(params.config, agentDir);
     const { model, error, authStorage, modelRegistry } = resolveModel(provider, modelId, agentDir, params.config);
     if (!model) {
         return {
@@ -139,7 +139,7 @@ export async function compactEmbeddedPiSessionDirect(params) {
             warn: makeBootstrapWarn({ sessionLabel, warn: (message) => log.warn(message) }),
         });
         const runAbortController = new AbortController();
-        const toolsRaw = createPigbotCodingTools({
+        const toolsRaw = createMoltbotCodingTools({
             exec: {
                 ...resolveExecToolDefaults(params.config),
                 elevated: params.bashElevated,
@@ -240,7 +240,7 @@ export async function compactEmbeddedPiSessionDirect(params) {
         });
         const isDefaultAgent = sessionAgentId === defaultAgentId;
         const promptMode = isSubagentSessionKey(params.sessionKey) ? "minimal" : "full";
-        const docsPath = await resolvePigbotDocsPath({
+        const docsPath = await resolveMoltbotDocsPath({
             workspaceDir: effectiveWorkspace,
             argv1: process.argv[1],
             cwd: process.cwd(),

package/dist/agents/pi-embedded-runner/extensions.js

@@ -2,6 +2,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { resolveContextWindowInfo } from "../context-window-guard.js";
 import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";
+import { setCompactionSafeguardRuntime } from "../pi-extensions/compaction-safeguard-runtime.js";
 import { setContextPruningRuntime } from "../pi-extensions/context-pruning/runtime.js";
 import { computeEffectiveSettings } from "../pi-extensions/context-pruning/settings.js";
 import { makeToolPrunablePredicate } from "../pi-extensions/context-pruning/tools.js";
@@ -48,6 +49,10 @@ function resolveCompactionMode(cfg) {
 export function buildEmbeddedExtensionPaths(params) {
     const paths = [];
     if (resolveCompactionMode(params.cfg) === "safeguard") {
+        const compactionCfg = params.cfg?.agents?.defaults?.compaction;
+        setCompactionSafeguardRuntime(params.sessionManager, {
+            maxHistoryShare: compactionCfg?.maxHistoryShare,
+        });
         paths.push(resolvePiExtensionPath("compaction-safeguard"));
     }
     const pruning = buildContextPruningExtension(params);

package/dist/agents/pi-embedded-runner/model.js

@@ -1,5 +1,5 @@
 import { discoverAuthStorage, discoverModels } from "@mariozechner/pi-coding-agent";
-import { resolvePigbotAgentDir } from "../agent-paths.js";
+import { resolveMoltbotAgentDir } from "../agent-paths.js";
 import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";
 import { normalizeModelCompat } from "../model-compat.js";
 import { normalizeProviderId } from "../model-selection.js";
@@ -8,7 +8,12 @@ export function buildInlineProviderModels(providers) {
         const trimmed = providerId.trim();
         if (!trimmed)
             return [];
-        return (entry?.models ?? []).map((model) => ({ ...model, provider: trimmed }));
+        return (entry?.models ?? []).map((model) => ({
+            ...model,
+            provider: trimmed,
+            baseUrl: entry?.baseUrl,
+            api: model.api ?? entry?.api,
+        }));
     });
 }
 export function buildModelAliasLines(cfg) {
@@ -28,7 +33,7 @@ export function buildModelAliasLines(cfg) {
         .map((entry) => `- ${entry.alias}: ${entry.model}`);
 }
 export function resolveModel(provider, modelId, agentDir, cfg) {
-    const resolvedAgentDir = agentDir ?? resolvePigbotAgentDir();
+    const resolvedAgentDir = agentDir ?? resolveMoltbotAgentDir();
     const authStorage = discoverAuthStorage(resolvedAgentDir);
     const modelRegistry = discoverModels(authStorage, resolvedAgentDir);
     const model = modelRegistry.find(provider, modelId);
@@ -52,6 +57,7 @@ export function resolveModel(provider, modelId, agentDir, cfg) {
                 name: modelId,
                 api: providerCfg?.api ?? "openai-responses",
                 provider,
+                baseUrl: providerCfg?.baseUrl,
                 reasoning: false,
                 input: ["text"],
                 cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },

package/dist/agents/pi-embedded-runner/run/attempt.js

@@ -15,15 +15,15 @@ import { isSubagentSessionKey } from "../../../routing/session-key.js";
 import { resolveUserPath } from "../../../utils.js";
 import { createCacheTrace } from "../../cache-trace.js";
 import { createAnthropicPayloadLogger } from "../../anthropic-payload-log.js";
-import { resolvePigbotAgentDir } from "../../agent-paths.js";
+import { resolveMoltbotAgentDir } from "../../agent-paths.js";
 import { resolveSessionAgentIds } from "../../agent-scope.js";
 import { makeBootstrapWarn, resolveBootstrapContextForRun } from "../../bootstrap-files.js";
-import { resolvePigbotDocsPath } from "../../docs-path.js";
+import { resolveMoltbotDocsPath } from "../../docs-path.js";
 import { resolveModelAuthMode } from "../../model-auth.js";
 import { isCloudCodeAssistFormatError, resolveBootstrapMaxChars, validateAnthropicTurns, validateGeminiTurns, } from "../../pi-embedded-helpers.js";
 import { subscribeEmbeddedPiSession } from "../../pi-embedded-subscribe.js";
 import { ensurePiCompactionReserveTokens, resolveCompactionReserveTokensFloor, } from "../../pi-settings.js";
-import { createPigbotCodingTools } from "../../pi-tools.js";
+import { createMoltbotCodingTools } from "../../pi-tools.js";
 import { resolveSandboxContext } from "../../sandbox.js";
 import { guardSessionManager } from "../../session-tool-result-guard-wrapper.js";
 import { resolveTranscriptPolicy } from "../../transcript-policy.js";
@@ -141,12 +141,12 @@ export async function runEmbeddedAttempt(params) {
         const workspaceNotes = hookAdjustedBootstrapFiles.some((file) => file.name === DEFAULT_BOOTSTRAP_FILENAME && !file.missing)
             ? ["Reminder: commit your changes in this workspace after edits."]
             : undefined;
-        const agentDir = params.agentDir ?? resolvePigbotAgentDir();
+        const agentDir = params.agentDir ?? resolveMoltbotAgentDir();
         // Check if the model supports native image input
         const modelHasVision = params.model.input?.includes("image") ?? false;
         const toolsRaw = params.disableTools
             ? []
-            : createPigbotCodingTools({
+            : createMoltbotCodingTools({
                 exec: {
                     ...params.execOverrides,
                     elevated: params.bashElevated,
@@ -160,6 +160,10 @@ export async function runEmbeddedAttempt(params) {
                 groupChannel: params.groupChannel,
                 groupSpace: params.groupSpace,
                 spawnedBy: params.spawnedBy,
+                senderId: params.senderId,
+                senderName: params.senderName,
+                senderUsername: params.senderUsername,
+                senderE164: params.senderE164,
                 sessionKey: params.sessionKey ?? params.sessionId,
                 agentDir,
                 workspaceDir: effectiveWorkspace,
@@ -263,7 +267,7 @@ export async function runEmbeddedAttempt(params) {
         });
         const isDefaultAgent = sessionAgentId === defaultAgentId;
         const promptMode = isSubagentSessionKey(params.sessionKey) ? "minimal" : "full";
-        const docsPath = await resolvePigbotDocsPath({
+        const docsPath = await resolveMoltbotDocsPath({
             workspaceDir: effectiveWorkspace,
             argv1: process.argv[1],
             cwd: process.cwd(),

package/dist/agents/pi-embedded-runner/run.js

@@ -2,14 +2,14 @@ import fs from "node:fs/promises";
 import { enqueueCommandInLane } from "../../process/command-queue.js";
 import { resolveUserPath } from "../../utils.js";
 import { isMarkdownCapableMessageChannel } from "../../utils/message-channel.js";
-import { resolvePigbotAgentDir } from "../agent-paths.js";
+import { resolveMoltbotAgentDir } from "../agent-paths.js";
 import { isProfileInCooldown, markAuthProfileFailure, markAuthProfileGood, markAuthProfileUsed, } from "../auth-profiles.js";
 import { CONTEXT_WINDOW_HARD_MIN_TOKENS, CONTEXT_WINDOW_WARN_BELOW_TOKENS, evaluateContextWindowGuard, resolveContextWindowInfo, } from "../context-window-guard.js";
 import { DEFAULT_CONTEXT_TOKENS, DEFAULT_MODEL, DEFAULT_PROVIDER } from "../defaults.js";
 import { FailoverError, resolveFailoverStatus } from "../failover-error.js";
 import { ensureAuthProfileStore, getApiKeyForModel, resolveAuthProfileOrder, } from "../model-auth.js";
 import { normalizeProviderId } from "../model-selection.js";
-import { ensurePigbotModelsJson } from "../models-config.js";
+import { ensureMoltbotModelsJson } from "../models-config.js";
 import { classifyFailoverReason, formatAssistantErrorText, isAuthAssistantError, isCompactionFailureError, isContextOverflowError, isFailoverAssistantError, isFailoverErrorMessage, parseImageDimensionError, isRateLimitAssistantError, isTimeoutErrorMessage, pickFallbackThinkingLevel, } from "../pi-embedded-helpers.js";
 import { normalizeUsage } from "../usage.js";
 import { compactEmbeddedPiSessionDirect } from "./compact.js";
@@ -46,9 +46,9 @@ export async function runEmbeddedPiAgent(params) {
         const prevCwd = process.cwd();
         const provider = (params.provider ?? DEFAULT_PROVIDER).trim() || DEFAULT_PROVIDER;
         const modelId = (params.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
-        const agentDir = params.agentDir ?? resolvePigbotAgentDir();
+        const agentDir = params.agentDir ?? resolveMoltbotAgentDir();
         const fallbackConfigured = (params.config?.agents?.defaults?.model?.fallbacks?.length ?? 0) > 0;
-        await ensurePigbotModelsJson(params.config, agentDir);
+        await ensureMoltbotModelsJson(params.config, agentDir);
         const { model, error, authStorage, modelRegistry } = resolveModel(provider, modelId, agentDir, params.config);
         if (!model) {
             throw new Error(error ?? `Unknown model: ${provider}/${modelId}`);
@@ -487,7 +487,7 @@ export async function runEmbeddedPiAgent(params) {
                     verboseLevel: params.verboseLevel,
                     reasoningLevel: params.reasoningLevel,
                     toolResultFormat: resolvedToolResultFormat,
-                    inlineToolResultsAllowed: !params.onPartialReply && !params.onToolResult,
+                    inlineToolResultsAllowed: false,
                 });
                 log.debug(`embedded run done: runId=${params.runId} sessionId=${params.sessionId} durationMs=${Date.now() - started} aborted=${aborted}`);
                 if (lastProfileId) {

package/dist/agents/pi-embedded-runner/sandbox-info.js

@@ -7,12 +7,9 @@ export function buildEmbeddedSandboxInfo(sandbox, execElevated) {
         workspaceDir: sandbox.workspaceDir,
         workspaceAccess: sandbox.workspaceAccess,
         agentWorkspaceMount: sandbox.workspaceAccess === "ro" ? "/agent" : undefined,
-        browserControlUrl: sandbox.browser?.controlUrl,
+        browserBridgeUrl: sandbox.browser?.bridgeUrl,
         browserNoVncUrl: sandbox.browser?.noVncUrl,
         hostBrowserAllowed: sandbox.browserAllowHostControl,
-        allowedControlUrls: sandbox.browserAllowedControlUrls,
-        allowedControlHosts: sandbox.browserAllowedControlHosts,
-        allowedControlPorts: sandbox.browserAllowedControlPorts,
         ...(elevatedAllowed
             ? {
                 elevated: {

package/dist/agents/pi-embedded-runner/session-manager-cache.js

@@ -5,7 +5,7 @@ const SESSION_MANAGER_CACHE = new Map();
 const DEFAULT_SESSION_MANAGER_TTL_MS = 45_000; // 45 seconds
 function getSessionManagerTtl() {
     return resolveCacheTtlMs({
-        envValue: process.env.PIGBOT_SESSION_MANAGER_CACHE_TTL_MS,
+        envValue: process.env.CLAWDBOT_SESSION_MANAGER_CACHE_TTL_MS,
         defaultTtlMs: DEFAULT_SESSION_MANAGER_TTL_MS,
     });
 }

package/dist/agents/pi-embedded-runner/utils.js

@@ -1,5 +1,5 @@
 export function mapThinkingLevel(level) {
-    // pi-agent-core supports "xhigh"; Pigbot enables it for specific models.
+    // pi-agent-core supports "xhigh"; Moltbot enables it for specific models.
     if (!level)
         return "off";
     return level;

package/dist/agents/pi-embedded-subscribe.raw-stream.js

@@ -2,8 +2,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { resolveStateDir } from "../config/paths.js";
 import { isTruthyEnvValue } from "../infra/env.js";
-const RAW_STREAM_ENABLED = isTruthyEnvValue(process.env.PIGBOT_RAW_STREAM);
-const RAW_STREAM_PATH = process.env.PIGBOT_RAW_STREAM_PATH?.trim() ||
+const RAW_STREAM_ENABLED = isTruthyEnvValue(process.env.CLAWDBOT_RAW_STREAM);
+const RAW_STREAM_PATH = process.env.CLAWDBOT_RAW_STREAM_PATH?.trim() ||
     path.join(resolveStateDir(), "logs", "raw-stream.jsonl");
 let rawStreamReady = false;
 export function appendRawStream(payload) {

package/dist/agents/pi-embedded-utils.js

@@ -203,7 +203,13 @@ export function formatReasoningMessage(text) {
         return "";
     // Show reasoning in italics (cursive) for markdown-friendly surfaces (Discord, etc.).
     // Keep the plain "Reasoning:" prefix so existing parsing/detection keeps working.
-    return `Reasoning:\n_${trimmed}_`;
+    // Note: Underscore markdown cannot span multiple lines on Telegram, so we wrap
+    // each non-empty line separately.
+    const italicLines = trimmed
+        .split("\n")
+        .map((line) => (line ? `_${line}_` : line))
+        .join("\n");
+    return `Reasoning:\n${italicLines}`;
 }
 export function splitThinkingTaggedText(text) {
     const trimmedStart = text.trimStart();

package/dist/agents/pi-extensions/compaction-safeguard-runtime.js

@@ -0,0 +1,20 @@
+// Session-scoped runtime registry keyed by object identity.
+// Follows the same WeakMap pattern as context-pruning/runtime.ts.
+const REGISTRY = new WeakMap();
+export function setCompactionSafeguardRuntime(sessionManager, value) {
+    if (!sessionManager || typeof sessionManager !== "object") {
+        return;
+    }
+    const key = sessionManager;
+    if (value === null) {
+        REGISTRY.delete(key);
+        return;
+    }
+    REGISTRY.set(key, value);
+}
+export function getCompactionSafeguardRuntime(sessionManager) {
+    if (!sessionManager || typeof sessionManager !== "object") {
+        return null;
+    }
+    return REGISTRY.get(sessionManager) ?? null;
+}

package/dist/agents/pi-extensions/compaction-safeguard.js

@@ -1,4 +1,5 @@
 import { BASE_CHUNK_RATIO, MIN_CHUNK_RATIO, SAFETY_MARGIN, computeAdaptiveChunkRatio, estimateMessagesTokens, isOversizedForSummary, pruneHistoryForContextShare, resolveContextWindowTokens, summarizeInStages, } from "../compaction.js";
+import { getCompactionSafeguardRuntime } from "./compaction-safeguard-runtime.js";
 const FALLBACK_SUMMARY = "Summary unavailable due to context limits. Older messages were truncated.";
 const TURN_PREFIX_INSTRUCTIONS = "This summary covers the prefix of a split turn. Focus on the original request," +
     " early progress, and any details needed to understand the retained suffix.";
@@ -135,18 +136,22 @@ export default function compactionSafeguardExtension(api) {
             const contextWindowTokens = resolveContextWindowTokens(model);
             const turnPrefixMessages = preparation.turnPrefixMessages ?? [];
             let messagesToSummarize = preparation.messagesToSummarize;
+            const runtime = getCompactionSafeguardRuntime(ctx.sessionManager);
+            const maxHistoryShare = runtime?.maxHistoryShare ?? 0.5;
             const tokensBefore = typeof preparation.tokensBefore === "number" && Number.isFinite(preparation.tokensBefore)
                 ? preparation.tokensBefore
                 : undefined;
+            let droppedSummary;
             if (tokensBefore !== undefined) {
                 const summarizableTokens = estimateMessagesTokens(messagesToSummarize) + estimateMessagesTokens(turnPrefixMessages);
                 const newContentTokens = Math.max(0, Math.floor(tokensBefore - summarizableTokens));
-                const maxHistoryTokens = Math.floor(contextWindowTokens * 0.5);
+                // Apply SAFETY_MARGIN so token underestimates don't trigger unnecessary pruning
+                const maxHistoryTokens = Math.floor(contextWindowTokens * maxHistoryShare * SAFETY_MARGIN);
                 if (newContentTokens > maxHistoryTokens) {
                     const pruned = pruneHistoryForContextShare({
                         messages: messagesToSummarize,
                         maxContextTokens: contextWindowTokens,
-                        maxHistoryShare: 0.5,
+                        maxHistoryShare,
                         parts: 2,
                     });
                     if (pruned.droppedChunks > 0) {
@@ -154,6 +159,27 @@ export default function compactionSafeguardExtension(api) {
                         console.warn(`Compaction safeguard: new content uses ${newContentRatio.toFixed(1)}% of context; dropped ${pruned.droppedChunks} older chunk(s) ` +
                             `(${pruned.droppedMessages} messages) to fit history budget.`);
                         messagesToSummarize = pruned.messages;
+                        // Summarize dropped messages so context isn't lost
+                        if (pruned.droppedMessagesList.length > 0) {
+                            try {
+                                const droppedChunkRatio = computeAdaptiveChunkRatio(pruned.droppedMessagesList, contextWindowTokens);
+                                const droppedMaxChunkTokens = Math.max(1, Math.floor(contextWindowTokens * droppedChunkRatio));
+                                droppedSummary = await summarizeInStages({
+                                    messages: pruned.droppedMessagesList,
+                                    model,
+                                    apiKey,
+                                    signal,
+                                    reserveTokens: Math.max(1, Math.floor(preparation.settings.reserveTokens)),
+                                    maxChunkTokens: droppedMaxChunkTokens,
+                                    contextWindow: contextWindowTokens,
+                                    customInstructions,
+                                    previousSummary: preparation.previousSummary,
+                                });
+                            }
+                            catch (droppedError) {
+                                console.warn(`Compaction safeguard: failed to summarize dropped messages, continuing without: ${droppedError instanceof Error ? droppedError.message : String(droppedError)}`);
+                            }
+                        }
                     }
                 }
             }
@@ -162,6 +188,9 @@ export default function compactionSafeguardExtension(api) {
             const adaptiveRatio = computeAdaptiveChunkRatio(allMessages, contextWindowTokens);
             const maxChunkTokens = Math.max(1, Math.floor(contextWindowTokens * adaptiveRatio));
             const reserveTokens = Math.max(1, Math.floor(preparation.settings.reserveTokens));
+            // Feed dropped-messages summary as previousSummary so the main summarization
+            // incorporates context from pruned messages instead of losing it entirely.
+            const effectivePreviousSummary = droppedSummary ?? preparation.previousSummary;
             const historySummary = await summarizeInStages({
                 messages: messagesToSummarize,
                 model,
@@ -171,7 +200,7 @@ export default function compactionSafeguardExtension(api) {
                 maxChunkTokens,
                 contextWindow: contextWindowTokens,
                 customInstructions,
-                previousSummary: preparation.previousSummary,
+                previousSummary: effectivePreviousSummary,
             });
             let summary = historySummary;
             if (preparation.isSplitTurn && turnPrefixMessages.length > 0) {

package/dist/agents/pi-tools.js

@@ -4,10 +4,10 @@ import { resolveGatewayMessageChannel } from "../utils/message-channel.js";
 import { createApplyPatchTool } from "./apply-patch.js";
 import { createExecTool, createProcessTool, } from "./bash-tools.js";
 import { listChannelAgentTools } from "./channel-tools.js";
-import { createPigbotTools } from "./pigbot-tools.js";
+import { createMoltbotTools } from "./moltbot-tools.js";
 import { wrapToolWithAbortSignal } from "./pi-tools.abort.js";
 import { filterToolsByPolicy, isToolAllowedByPolicies, resolveEffectiveToolPolicy, resolveGroupToolPolicy, resolveSubagentToolPolicy, } from "./pi-tools.policy.js";
-import { assertRequiredParams, CLAUDE_PARAM_GROUPS, createPigbotReadTool, createSandboxedEditTool, createSandboxedReadTool, createSandboxedWriteTool, normalizeToolParams, patchToolSchemaForClaudeCompatibility, wrapToolParamNormalization, } from "./pi-tools.read.js";
+import { assertRequiredParams, CLAUDE_PARAM_GROUPS, createMoltbotReadTool, createSandboxedEditTool, createSandboxedReadTool, createSandboxedWriteTool, normalizeToolParams, patchToolSchemaForClaudeCompatibility, wrapToolParamNormalization, } from "./pi-tools.read.js";
 import { cleanToolSchemaForGemini, normalizeToolParameters } from "./pi-tools.schema.js";
 import { buildPluginToolGroups, collectExplicitAllowlist, expandPolicyWithPluginGroups, normalizeToolName, resolveToolProfilePolicy, stripPluginOnlyAllowlist, } from "./tool-policy.js";
 import { getPluginToolMeta } from "../plugins/tools.js";
@@ -43,6 +43,7 @@ function resolveExecConfig(cfg) {
         ask: globalExec?.ask,
         node: globalExec?.node,
         pathPrepend: globalExec?.pathPrepend,
+        safeBins: globalExec?.safeBins,
         backgroundMs: globalExec?.backgroundMs,
         timeoutSec: globalExec?.timeoutSec,
         approvalRunningNoticeMs: globalExec?.approvalRunningNoticeMs,
@@ -58,10 +59,10 @@ export const __testing = {
     wrapToolParamNormalization,
     assertRequiredParams,
 };
-export function createPigbotCodingTools(options) {
+export function createMoltbotCodingTools(options) {
     const execToolName = "exec";
     const sandbox = options?.sandbox?.enabled ? options.sandbox : undefined;
-    const { agentId, globalPolicy, globalProviderPolicy, agentPolicy, agentProviderPolicy, profile, providerProfile, } = resolveEffectiveToolPolicy({
+    const { agentId, globalPolicy, globalProviderPolicy, agentPolicy, agentProviderPolicy, profile, providerProfile, profileAlsoAllow, providerProfileAlsoAllow, } = resolveEffectiveToolPolicy({
         config: options?.config,
         sessionKey: options?.sessionKey,
         modelProvider: options?.modelProvider,
@@ -76,16 +77,27 @@ export function createPigbotCodingTools(options) {
         groupChannel: options?.groupChannel,
         groupSpace: options?.groupSpace,
         accountId: options?.agentAccountId,
+        senderId: options?.senderId,
+        senderName: options?.senderName,
+        senderUsername: options?.senderUsername,
+        senderE164: options?.senderE164,
     });
     const profilePolicy = resolveToolProfilePolicy(profile);
     const providerProfilePolicy = resolveToolProfilePolicy(providerProfile);
+    const mergeAlsoAllow = (policy, alsoAllow) => {
+        if (!policy?.allow || !Array.isArray(alsoAllow) || alsoAllow.length === 0)
+            return policy;
+        return { ...policy, allow: Array.from(new Set([...policy.allow, ...alsoAllow])) };
+    };
+    const profilePolicyWithAlsoAllow = mergeAlsoAllow(profilePolicy, profileAlsoAllow);
+    const providerProfilePolicyWithAlsoAllow = mergeAlsoAllow(providerProfilePolicy, providerProfileAlsoAllow);
     const scopeKey = options?.exec?.scopeKey ?? (agentId ? `agent:${agentId}` : undefined);
     const subagentPolicy = isSubagentSessionKey(options?.sessionKey) && options?.sessionKey
         ? resolveSubagentToolPolicy(options.config)
         : undefined;
     const allowBackground = isToolAllowedByPolicies("process", [
-        profilePolicy,
-        providerProfilePolicy,
+        profilePolicyWithAlsoAllow,
+        providerProfilePolicyWithAlsoAllow,
         globalPolicy,
         globalProviderPolicy,
         agentPolicy,
@@ -112,7 +124,7 @@ export function createPigbotCodingTools(options) {
                 return [createSandboxedReadTool(sandboxRoot)];
             }
             const freshReadTool = createReadTool(workspaceRoot);
-            return [createPigbotReadTool(freshReadTool)];
+            return [createMoltbotReadTool(freshReadTool)];
         }
         if (tool.name === "bash" || tool.name === execToolName)
             return [];
@@ -140,6 +152,7 @@ export function createPigbotCodingTools(options) {
         ask: options?.exec?.ask ?? execConfig.ask,
         node: options?.exec?.node ?? execConfig.node,
         pathPrepend: options?.exec?.pathPrepend ?? execConfig.pathPrepend,
+        safeBins: options?.exec?.safeBins ?? execConfig.safeBins,
         agentId,
         cwd: options?.workspaceDir,
         allowBackground,
@@ -181,12 +194,9 @@ export function createPigbotCodingTools(options) {
         processTool,
         // Channel docking: include channel-defined agent tools (login, etc.).
         ...listChannelAgentTools({ cfg: options?.config }),
-        ...createPigbotTools({
-            browserControlUrl: sandbox?.browser?.controlUrl,
+        ...createMoltbotTools({
+            sandboxBrowserBridgeUrl: sandbox?.browser?.bridgeUrl,
             allowHostBrowserControl: sandbox ? sandbox.browserAllowHostControl : true,
-            allowedControlUrls: sandbox?.browserAllowedControlUrls,
-            allowedControlHosts: sandbox?.browserAllowedControlHosts,
-            allowedControlPorts: sandbox?.browserAllowedControlPorts,
             agentSessionKey: options?.sessionKey,
             agentChannel: resolveGatewayMessageChannel(options?.messageProvider),
             agentAccountId: options?.agentAccountId,
@@ -216,6 +226,7 @@ export function createPigbotCodingTools(options) {
             replyToMode: options?.replyToMode,
             hasRepliedRef: options?.hasRepliedRef,
             modelHasVision: options?.modelHasVision,
+            requesterAgentIdOverride: agentId,
         }),
     ];
     const coreToolNames = new Set(tools
@@ -231,14 +242,14 @@ export function createPigbotCodingTools(options) {
         if (resolved.unknownAllowlist.length > 0) {
             const entries = resolved.unknownAllowlist.join(", ");
             const suffix = resolved.strippedAllowlist
-                ? "Ignoring allowlist so core tools remain available."
+                ? "Ignoring allowlist so core tools remain available. Use tools.alsoAllow for additive plugin tool enablement."
                 : "These entries won't match any tool unless the plugin is enabled.";
             logWarn(`tools: ${label} allowlist contains unknown entries (${entries}). ${suffix}`);
         }
         return expandPolicyWithPluginGroups(resolved.policy, pluginGroups);
     };
-    const profilePolicyExpanded = resolvePolicy(profilePolicy, profile ? `tools.profile (${profile})` : "tools.profile");
-    const providerProfileExpanded = resolvePolicy(providerProfilePolicy, providerProfile ? `tools.byProvider.profile (${providerProfile})` : "tools.byProvider.profile");
+    const profilePolicyExpanded = resolvePolicy(profilePolicyWithAlsoAllow, profile ? `tools.profile (${profile})` : "tools.profile");
+    const providerProfileExpanded = resolvePolicy(providerProfilePolicyWithAlsoAllow, providerProfile ? `tools.byProvider.profile (${providerProfile})` : "tools.byProvider.profile");
     const globalPolicyExpanded = resolvePolicy(globalPolicy, "tools.allow");
     const globalProviderExpanded = resolvePolicy(globalProviderPolicy, "tools.byProvider.allow");
     const agentPolicyExpanded = resolvePolicy(agentPolicy, agentId ? `agents.${agentId}.tools.allow` : "agent tools.allow");

package/dist/agents/pi-tools.policy.js

@@ -90,10 +90,24 @@ export function filterToolsByPolicy(tools, policy) {
     const matcher = makeToolPolicyMatcher(policy);
     return tools.filter((tool) => matcher(tool.name));
 }
+function unionAllow(base, extra) {
+    if (!Array.isArray(extra) || extra.length === 0)
+        return base;
+    // If the user is using alsoAllow without an allowlist, treat it as additive on top of
+    // an implicit allow-all policy.
+    if (!Array.isArray(base) || base.length === 0) {
+        return Array.from(new Set(["*", ...extra]));
+    }
+    return Array.from(new Set([...base, ...extra]));
+}
 function pickToolPolicy(config) {
     if (!config)
         return undefined;
-    const allow = Array.isArray(config.allow) ? config.allow : undefined;
+    const allow = Array.isArray(config.allow)
+        ? unionAllow(config.allow, config.alsoAllow)
+        : Array.isArray(config.alsoAllow) && config.alsoAllow.length > 0
+            ? unionAllow(undefined, config.alsoAllow)
+            : undefined;
     const deny = Array.isArray(config.deny) ? config.deny : undefined;
     if (!allow && !deny)
         return undefined;
@@ -171,6 +185,17 @@ export function resolveEffectiveToolPolicy(params) {
         agentProviderPolicy: pickToolPolicy(agentProviderPolicy),
         profile,
         providerProfile: agentProviderPolicy?.profile ?? providerPolicy?.profile,
+        // alsoAllow is applied at the profile stage (to avoid being filtered out early).
+        profileAlsoAllow: Array.isArray(agentTools?.alsoAllow)
+            ? agentTools?.alsoAllow
+            : Array.isArray(globalTools?.alsoAllow)
+                ? globalTools?.alsoAllow
+                : undefined,
+        providerProfileAlsoAllow: Array.isArray(agentProviderPolicy?.alsoAllow)
+            ? agentProviderPolicy?.alsoAllow
+            : Array.isArray(providerPolicy?.alsoAllow)
+                ? providerPolicy?.alsoAllow
+                : undefined,
     };
 }
 export function resolveGroupToolPolicy(params) {
@@ -198,12 +223,20 @@ export function resolveGroupToolPolicy(params) {
         groupChannel: params.groupChannel,
         groupSpace: params.groupSpace,
         accountId: params.accountId,
+        senderId: params.senderId,
+        senderName: params.senderName,
+        senderUsername: params.senderUsername,
+        senderE164: params.senderE164,
     }) ??
         resolveChannelGroupToolsPolicy({
             cfg: params.config,
             channel,
             groupId,
             accountId: params.accountId,
+            senderId: params.senderId,
+            senderName: params.senderName,
+            senderUsername: params.senderUsername,
+            senderE164: params.senderE164,
         });
     return pickToolPolicy(toolsConfig);
 }

package/dist/agents/pi-tools.read.js

@@ -199,7 +199,7 @@ function wrapSandboxPathGuard(tool, root) {
 }
 export function createSandboxedReadTool(root) {
     const base = createReadTool(root);
-    return wrapSandboxPathGuard(createPigbotReadTool(base), root);
+    return wrapSandboxPathGuard(createMoltbotReadTool(base), root);
 }
 export function createSandboxedWriteTool(root) {
     const base = createWriteTool(root);
@@ -209,7 +209,7 @@ export function createSandboxedEditTool(root) {
     const base = createEditTool(root);
     return wrapSandboxPathGuard(wrapToolParamNormalization(base, CLAUDE_PARAM_GROUPS.edit), root);
 }
-export function createPigbotReadTool(base) {
+export function createMoltbotReadTool(base) {
     const patched = patchToolSchemaForClaudeCompatibility(base);
     return {
         ...patched,

package/dist/agents/sandbox/browser.js

@@ -1,6 +1,6 @@
 import { startBrowserBridgeServer, stopBrowserBridgeServer } from "../../browser/bridge-server.js";
 import { resolveProfile } from "../../browser/config.js";
-import { DEFAULT_CLAWD_BROWSER_COLOR } from "../../browser/constants.js";
+import { DEFAULT_BROWSER_EVALUATE_ENABLED, DEFAULT_CLAWD_BROWSER_COLOR, } from "../../browser/constants.js";
 import { BROWSER_BRIDGES } from "./browser-bridges.js";
 import { DEFAULT_SANDBOX_BROWSER_IMAGE, SANDBOX_AGENT_WORKSPACE_MOUNT } from "./constants.js";
 import { buildSandboxCreateArgs, dockerContainerState, execDocker, readDockerPort, } from "./docker.js";
@@ -31,13 +31,10 @@ async function waitForSandboxCdp(params) {
     return false;
 }
 function buildSandboxBrowserResolvedConfig(params) {
-    const controlHost = "127.0.0.1";
-    const controlUrl = `http://${controlHost}:${params.controlPort}`;
     const cdpHost = "127.0.0.1";
     return {
         enabled: true,
-        controlUrl,
-        controlHost,
+        evaluateEnabled: params.evaluateEnabled,
         controlPort: params.controlPort,
         cdpProtocol: "http",
         cdpHost,
@@ -78,7 +75,7 @@ export async function ensureSandboxBrowser(params) {
             name: containerName,
             cfg: params.cfg.docker,
             scopeKey: params.scopeKey,
-            labels: { "pigbot.sandboxBrowser": "1" },
+            labels: { "moltbot.sandboxBrowser": "1" },
         });
         const mainMountSuffix = params.cfg.workspaceAccess === "ro" && params.workspaceDir === params.agentWorkspaceDir
             ? ":ro"
@@ -92,11 +89,11 @@ export async function ensureSandboxBrowser(params) {
         if (params.cfg.browser.enableNoVnc && !params.cfg.browser.headless) {
             args.push("-p", `127.0.0.1::${params.cfg.browser.noVncPort}`);
         }
-        args.push("-e", `PIGBOT_BROWSER_HEADLESS=${params.cfg.browser.headless ? "1" : "0"}`);
-        args.push("-e", `PIGBOT_BROWSER_ENABLE_NOVNC=${params.cfg.browser.enableNoVnc ? "1" : "0"}`);
-        args.push("-e", `PIGBOT_BROWSER_CDP_PORT=${params.cfg.browser.cdpPort}`);
-        args.push("-e", `PIGBOT_BROWSER_VNC_PORT=${params.cfg.browser.vncPort}`);
-        args.push("-e", `PIGBOT_BROWSER_NOVNC_PORT=${params.cfg.browser.noVncPort}`);
+        args.push("-e", `CLAWDBOT_BROWSER_HEADLESS=${params.cfg.browser.headless ? "1" : "0"}`);
+        args.push("-e", `CLAWDBOT_BROWSER_ENABLE_NOVNC=${params.cfg.browser.enableNoVnc ? "1" : "0"}`);
+        args.push("-e", `CLAWDBOT_BROWSER_CDP_PORT=${params.cfg.browser.cdpPort}`);
+        args.push("-e", `CLAWDBOT_BROWSER_VNC_PORT=${params.cfg.browser.vncPort}`);
+        args.push("-e", `CLAWDBOT_BROWSER_NOVNC_PORT=${params.cfg.browser.noVncPort}`);
         args.push(params.cfg.browser.image);
         await execDocker(args);
         await execDocker(["start", containerName]);
@@ -146,6 +143,7 @@ export async function ensureSandboxBrowser(params) {
                 controlPort: 0,
                 cdpPort: mappedCdp,
                 headless: params.cfg.browser.headless,
+                evaluateEnabled: params.evaluateEnabled ?? DEFAULT_BROWSER_EVALUATE_ENABLED,
             }),
             onEnsureAttachTarget,
         });
@@ -171,7 +169,7 @@ export async function ensureSandboxBrowser(params) {
         ? `http://127.0.0.1:${mappedNoVnc}/vnc.html?autoconnect=1&resize=remote`
         : undefined;
     return {
-        controlUrl: resolvedBridge.baseUrl,
+        bridgeUrl: resolvedBridge.baseUrl,
         noVncUrl,
         containerName,
     };