@llblab/pi-actors 0.58.0 → 0.58.2

package/dist/lib/registry.js

@@ -43,7 +43,7 @@ function listTools(deps) {
         content: [
             textContent(ExecutionOutput.formatToolText(registryListText(rows))),
         ],
-        details: { tool: "register_tool" },
+        details: { tool: "actors_tool_register" },
     };
 }
 function getRecipeRoot(deps) {
@@ -65,18 +65,18 @@ function activationBoundary(activation) {
 }
 function recipeDoctorAction(source) {
     return /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*\/[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/u.test(source)
-        ? `inspect target=recipes view=doctor identity=${source}`
-        : "inspect target=recipes view=doctor";
+        ? `actors_inspect target=recipes view=doctor identity=${source}`
+        : "actors_inspect target=recipes view=doctor";
 }
 function registrationNextActions(tool, source, callableNow) {
     if (callableNow) {
         return [
             `call tool ${tool}`,
-            `inspect target=tool:${tool} view=status`,
+            `actors_inspect target=tool:${tool} view=status`,
         ];
     }
     return [
-        `inspect target=tool:${tool} view=status`,
+        `actors_inspect target=tool:${tool} view=status`,
         ...(source === "template" || source === "draft"
             ? []
             : [recipeDoctorAction(source)]),
@@ -134,7 +134,7 @@ function registrationReceiptText(data) {
     const omittedNext = omission("next_action", 1, !nextWellFormed);
     // This producer knows only its existing status hint; invocation advice stays opaque.
     const next = part(nextWellFormed
-        ? data.callable ? { instruction: data.next } : { next: { tool: "inspect", target: `tool:${data.tool}`, view: "status" } }
+        ? data.callable ? { instruction: data.next } : { next: { tool: "actors_inspect", target: `tool:${data.tool}`, view: "status" } }
         : omittedNext, omittedNext);
     const render = () => renderPart({ ...tool.selected, result: data.result, ...source.selected, callable_now: data.callable,
         ...(data.boundary === undefined ? {} : { activation_boundary: data.boundary }), ...required.selected, ...optional.selected,
@@ -195,7 +195,7 @@ function draftPathFailureText(kind, reference) {
     const selected = registrySelected(kind === "root" ? "allowed_root" : "path", reference);
     const render = () => ({ field: "draft", ...selected.selected,
         result: kind === "root" ? "Draft must be under the allowed root." : "Draft not found.",
-        ...(kind === "root" ? { instruction: "Use inspect target=recipes view=summary to list drafts." } : {}) });
+        ...(kind === "root" ? { instruction: "Use actors_inspect target=recipes view=summary to list drafts." } : {}) });
     return growRegistryDocument(render, [selected]);
 }
 function assertDraftPath(deps, draft) {
@@ -226,8 +226,8 @@ function draftReceiptText(result, tool, callable, next) {
     const identity = part("tool", tool, { tool });
     const flag = part("callable_now", callable, { callable_now: callable });
     // Only this producer's exact canonical read-only status hint is typed, never body advice.
-    const status = /^inspect target=(tool:[a-z][a-z0-9_]{0,63}) view=status$/u.exec(next);
-    const hint = part("next_action", next, status ? { next: { tool: "inspect", target: status[1], view: "status" } } : { instruction: next });
+    const status = /^actors_inspect target=(tool:[a-z][a-z0-9_]{0,63}) view=status$/u.exec(next);
+    const hint = part("next_action", next, status ? { next: { tool: "actors_inspect", target: status[1], view: "status" } } : { instruction: next });
     const render = () => renderPart({ ...identity.selected, result, source: "draft", ...flag.selected, ...hint.selected });
     for (const current of [identity, flag, hint]) {
         if (current.selected === current.full)
@@ -341,6 +341,9 @@ function deleteTool(name, ctx, deps) {
             details: { tool: name },
         };
     }
+    const blocker = deps.getToolNameBlocker(name);
+    if (blocker)
+        throw new Error(ExecutionOutput.formatToolText(blocker));
     const recipePath = getToolRecipePath(deps, name);
     if (existsSync(recipePath))
         unlinkSync(recipePath);
@@ -390,7 +393,7 @@ function assertTemplateIsNotNestedRecipe(value) {
         (Object.keys(record).length === 1 ||
             ["artifacts", "async", "control", "description", "imports", "values"].some((key) => Object.hasOwn(record, key)))) {
         throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ field: "template",
-            result: "Nested Recipe-shaped templates are not a register_tool source mode.",
+            result: "Nested Recipe-shaped templates are not a actors_tool_register source mode.",
             instruction: "retry with from=<skill>/<recipe> and defaults={...}." })));
     }
 }
@@ -437,7 +440,7 @@ function normalizeDefaults(value) {
 function normalizeFromReference(value, resolutionContext) {
     const trimmed = value.trim();
     if (!trimmed) {
-        throw new Error(ExecutionOutput.formatToolText("Tool from must be a non-empty Recipe reference. Next: retry register_tool with from=<skill>/<recipe> or an explicit .json/.md path."));
+        throw new Error(ExecutionOutput.formatToolText("Tool from must be a non-empty Recipe reference. Next: retry actors_tool_register with from=<skill>/<recipe> or an explicit .json/.md path."));
     }
     if (trimmed.startsWith("std:")) {
         throw new Error(ExecutionOutput.formatToolText("std: Recipe references were removed; use <skill>/<recipe> or an explicit .json/.md file path."));
@@ -472,7 +475,7 @@ function buildAuthoredRecipe(input, existing, existingRecipe) {
             throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ field: "defaults",
                 ...registrySelected("key", runtimeOwnedDefault).selected,
                 result: "Tool defaults cannot set runtime-owned input.",
-                instruction: "remove that default and retry register_tool; the runtime supplies it." })));
+                instruction: "remove that default and retry actors_tool_register; the runtime supplies it." })));
         }
         const authored = {
             ...(description ? { description } : {}),
@@ -522,9 +525,9 @@ function buildAuthoredRecipe(input, existing, existingRecipe) {
 function assertRegisterToolInputModes(input) {
     const record = input;
     if (Object.hasOwn(record, "values")) {
-        throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ field: "values", result: "register_tool values was removed.",
+        throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ field: "values", result: "actors_tool_register values was removed.",
             replacement_fields: ["defaults", "from"],
-            instruction: "retry register_tool with defaults for caller inputs, or use from=<skill>/<recipe> for maintained composition." })));
+            instruction: "retry actors_tool_register with defaults for caller inputs, or use from=<skill>/<recipe> for maintained composition." })));
     }
     const fromProvided = Object.hasOwn(record, "from");
     if (fromProvided &&
@@ -532,22 +535,22 @@ function assertRegisterToolInputModes(input) {
         throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ field: "from",
             result: "Tool from must be a non-empty Recipe reference.",
             reference_forms: ["<skill>/<recipe>", "explicit .json path", "explicit .md path"],
-            instruction: "retry register_tool with from=<skill>/<recipe> or an explicit .json/.md path." })));
+            instruction: "retry actors_tool_register with from=<skill>/<recipe> or an explicit .json/.md path." })));
     }
     const draftProvided = typeof input.draft === "string" && input.draft.trim().length > 0;
     const templateProvided = Object.hasOwn(record, "template");
     const modeCount = Number(fromProvided) + Number(draftProvided) + Number(templateProvided);
     if (modeCount > 1) {
-        throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ result: "Use exactly one register_tool source mode.",
+        throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ result: "Use exactly one actors_tool_register source mode.",
             source_modes: ["from", "template", "draft"],
-            instruction: "remove the extra source fields and retry register_tool." })));
+            instruction: "remove the extra source fields and retry actors_tool_register." })));
     }
     if (fromProvided &&
         (Object.hasOwn(record, "args") || Object.hasOwn(record, "async"))) {
         throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ field: "from",
-            result: "register_tool from inherits args and async behavior.",
+            result: "actors_tool_register from inherits args and async behavior.",
             inherited_fields: ["args", "async"],
-            instruction: "retry register_tool with from and optional defaults only; omit args and async." })));
+            instruction: "retry actors_tool_register with from and optional defaults only; omit args and async." })));
     }
 }
 function reservedRegistrationNameText(value) {
@@ -613,7 +616,7 @@ function executeRegisterToolUnlocked(params, ctx, deps) {
     if (template === undefined && !input.from && !existing) {
         throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ result: "New registration requires exactly one source mode.",
             source_modes: ["from", "template", "draft"],
-            instruction: "retry register_tool with one source field." })));
+            instruction: "retry actors_tool_register with one source field." })));
     }
     const recipePath = getToolRecipePath(deps, name);
     const authoredRecipe = buildAuthoredRecipe(input, existing, authoritative.recipe);
@@ -645,7 +648,7 @@ function executeRegisterToolUnlocked(params, ctx, deps) {
             (!activation.host_registered ||
                 !activation.active_tool ||
                 !activation.callable_now)) {
-            throw new Error(`Tool "${name}" activation failed at ${activationBoundary(activation)}; host_registered=${activation.host_registered}, active_tool=${activation.active_tool}, callable_now=${activation.callable_now}. Registration was rolled back. Next: inspect target=runtime view=status; do not use spawn as proof of tool invocation.`);
+            throw new Error(`Tool "${name}" activation failed at ${activationBoundary(activation)}; host_registered=${activation.host_registered}, active_tool=${activation.active_tool}, callable_now=${activation.callable_now}. Registration was rolled back. Next: actors_inspect target=runtime view=status; do not use spawn as proof of tool invocation.`);
         }
     }
     catch (error) {
@@ -872,11 +875,11 @@ function retainRecipe(input, ctx, deps) {
                     const facts = { kind: "retained_recipe", result: "retained", persisted: true, resolved: true,
                         validated: true, activation: "not_requested", async: admitted.async };
                     const text = growRegistryDocument(() => ({ ...selectedName.selected, ...facts, ...recipe.selected, ...selectedSource.selected,
-                        ...required.selected, ...optional.selected, next: { tool: "inspect", target: "recipes", view: "summary", verbose: true } }), [recipe, selectedName, selectedSource, required, optional]);
+                        ...required.selected, ...optional.selected, next: { tool: "actors_inspect", target: "recipes", view: "summary", verbose: true } }), [recipe, selectedName, selectedSource, required, optional]);
                     const result = {
                         content: [textContent(ExecutionOutput.formatToolText(text))],
                         details: { ...facts, tool: name, recipe: path, source, required_args: args.required, optional_args: args.optional,
-                            next_actions: ["inspect target=recipes view=summary verbose=true"] },
+                            next_actions: ["actors_inspect target=recipes view=summary verbose=true"] },
                     };
                     stage = "release";
                     return result;
@@ -888,7 +891,7 @@ function retainRecipe(input, ctx, deps) {
         const reason = error instanceof RetainedRecipeRefusal ? { reason: error.reason } : {};
         throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ operation: "retain", stage, result: "unconfirmed",
             effects: "unknown; inspect retained inventory before retry", ...reason,
-            next: { tool: "inspect", target: "recipes", view: "summary", verbose: true } })), { cause: error });
+            next: { tool: "actors_inspect", target: "recipes", view: "summary", verbose: true } })), { cause: error });
     }
 }
 export async function executeRegisterTool(params, ctx, deps) {

package/dist/lib/review-control.js

@@ -90,7 +90,7 @@ export function controlAutomaticReview(action, scope, options = {}) {
     });
     if (result.changed === true)
         schedule(scope, options);
-    const nextActions = ["inspect target=recipes view=reviews"];
+    const nextActions = ["actors_inspect target=recipes view=reviews"];
     if (action === "review.retry" &&
         scope === "tool" &&
         (result.phase === "approved" || result.phase === "lineage_pending"))

package/dist/lib/run-delivery.d.ts

@@ -66,7 +66,7 @@ export interface RunCompletionBatch {
     /** Retained singleton capture; absence preserves older indexed bytes. Never a new-capture selector. */
     readonly single_result?: true;
     /** Captured record-list shape; no public format/version choice or source authority. */
-    readonly result_layout?: "records" | "run_headers" | "headings" | "headings_flat_omissions" | "headings_outcomes" | "headings_shared_results" | "headings_shared_kinds" | "frontmatter_v1" | "frontmatter_v2" | "completion_yaml_core_v1" | "completion_yaml_files_v1";
+    readonly result_layout?: "records" | "run_headers" | "headings" | "headings_flat_omissions" | "headings_outcomes" | "headings_shared_results" | "headings_shared_kinds" | "frontmatter_v1" | "frontmatter_v2" | "completion_yaml_core_v1" | "completion_yaml_files_v1" | "completion_yaml_files_v2";
     /** Immutable scope/order/range data, not a caller-selected format or allocation authority. */
     readonly numbering?: RunCompletionNumbering;
     /** Formatting version/data only; no recipient ownership, read or publication capability. */

package/dist/lib/run-delivery.js

@@ -278,8 +278,11 @@ function parseInventorySource(value, batch) {
 function isFrontmatterCompletionLayout(layout) {
     return layout === "frontmatter_v1" || layout === "frontmatter_v2";
 }
+function isRootedCompletionLayout(layout) {
+    return layout === "completion_yaml_files_v1" || layout === "completion_yaml_files_v2";
+}
 function isYamlCompletionLayout(layout) {
-    return layout === "completion_yaml_core_v1" || layout === "completion_yaml_files_v1";
+    return layout === "completion_yaml_core_v1" || isRootedCompletionLayout(layout);
 }
 function isSharedCompletionLayout(layout) {
     return layout === "headings_shared_results" || layout === "headings_shared_kinds" || isYamlCompletionLayout(layout) || isFrontmatterCompletionLayout(layout);
@@ -688,7 +691,7 @@ export function requestRunCompletionStream(input) {
     });
 }
 export function admitRunCompletionBatch(input) {
-    return captureCompletionBatch(input, false, "completion_yaml_files_v1");
+    return captureCompletionBatch(input, false, "completion_yaml_files_v2");
 }
 /** Kernel-only opt-in; ordinary Pi capture stays fenced until session/lifecycle integration is admitted. */
 export function captureRunCompletionStreamBatch(input) {
@@ -696,7 +699,7 @@ export function captureRunCompletionStreamBatch(input) {
 }
 /** Private ordinary candidate composition; stream capture retains its separately gated codec. */
 export function captureRunCompletionYamlCandidateBatch(input) {
-    return captureCompletionBatch(input, false, "completion_yaml_files_v1");
+    return captureCompletionBatch(input, false, "completion_yaml_files_v2");
 }
 function captureCompletionBatch(input, numbered, layout = "frontmatter_v2") {
     const now = (input.now ?? new Date()).toISOString();
@@ -1697,13 +1700,14 @@ function completionRootedFiles(row, member, locations) {
 }
 function prepareCompletionYamlProjection(safe, candidates, references, ordered) {
     const packet = { batchId: safe.batch_id, records: [] };
-    const rooted = safe.result_layout === "completion_yaml_files_v1";
+    const rooted = isRootedCompletionLayout(safe.result_layout);
+    const localSingleton = safe.result_layout === "completion_yaml_files_v2" && !safe.numbering && candidates.length === 1;
     if (!safe.batch_id.isWellFormed())
         return { state: "unsupported" };
     for (const [index, { row, location }] of candidates.entries()) {
         const member = ordered[index];
         const displayed = safe.numbering ? safe.numbering.kind === "stream" ? safe.numbering.first_index + index : "?" : index;
-        const metadata = { index: displayed };
+        const metadata = localSingleton ? {} : { index: displayed };
         for (const piece of row.pieces) {
             if (piece.block)
                 continue;
@@ -1763,7 +1767,9 @@ function prepareCompletionYamlProjection(safe, candidates, references, ordered)
         }
         packet.records.push({ metadata, parts });
     }
-    const service = rooted ? { header_layout: "rooted_files_v1" } : {};
+    const service = rooted ? {
+        header_layout: safe.result_layout === "completion_yaml_files_v2" ? "rooted_files_v2" : "rooted_files_v1",
+    } : {};
     const omitted = safe.members.length - candidates.length;
     if (omitted) {
         service.omitted_results = omitted;
@@ -2302,7 +2308,7 @@ export function readRunCompletionPresentation(content, value) {
             hint.content_sha256 !== createHash("sha256").update(content).digest("hex"))
             return full;
         const segments = [];
-        const rooted = core.packet.service?.header_layout === "rooted_files_v1";
+        const rooted = core.packet.service?.header_layout === "rooted_files_v1" || core.packet.service?.header_layout === "rooted_files_v2";
         const facts = Object.fromEntries(Object.entries(core.packet.service ?? {}).filter(([key]) => key !== "header_layout"));
         for (const [index, record] of core.packet.records.entries()) {
             if (index)
@@ -2551,6 +2557,8 @@ export function encodeCompletionYamlCarrier(input) {
         (Object.hasOwn(packet, "service") && (!completionYamlMapping(packet.service) || !Object.keys(packet.service).length)) ||
         (!packet.records.length && !Object.hasOwn(packet, "service")))
         return unavailable;
+    const localSingleton = packet.records.length === 1 && completionYamlMapping(packet.service) &&
+        packet.service.header_layout === "rooted_files_v2" && !Object.hasOwn(packet.service, "numbering");
     const rows = [];
     for (let index = 0; index < Math.max(1, packet.records.length); index++) {
         const row = packet.records[index];
@@ -2568,14 +2576,16 @@ export function encodeCompletionYamlCarrier(input) {
                 !completionYamlMapping(row.metadata) || !Array.isArray(row.parts))
                 return unavailable;
             const meta = row.metadata;
-            if (!(meta.index === "?" || (typeof meta.index === "number" && Number.isSafeInteger(meta.index) && meta.index >= 0)) ||
+            const validIndex = localSingleton ? !Object.hasOwn(meta, "index")
+                : meta.index === "?" || (typeof meta.index === "number" && Number.isSafeInteger(meta.index) && meta.index >= 0);
+            if (!validIndex ||
                 typeof meta.run !== "string" || !meta.run.length || typeof meta.state !== "string" || !meta.state.length ||
                 (Object.hasOwn(meta, "kind") && meta.kind !== "primary" && meta.kind !== "diagnostic") ||
                 Object.hasOwn(meta, completionYamlServiceKey) ||
                 // JS enumerates array-index keys before semantic core fields; do not silently reorder the header.
                 Object.keys(meta).some(key => /^(0|[1-9]\d*)$/u.test(key) && Number(key) < 4294967295))
                 return unavailable;
-            for (const key of ["index", "run", "state", ...(Object.hasOwn(meta, "kind") ? ["kind"] : []),
+            for (const key of [...(localSingleton ? [] : ["index"]), "run", "state", ...(Object.hasOwn(meta, "kind") ? ["kind"] : []),
                 ...Object.keys(meta).filter(key => !["index", "run", "state", "kind"].includes(key))]) {
                 Object.defineProperty(header, key, { value: meta[key], enumerable: true });
             }

package/dist/lib/run-evidence-policy.js

@@ -12,8 +12,8 @@ export const TRACE_COMPACTION_VERSION = 1;
 const PENDING_CONTROL_STATUSES = new Set(["queued", "delivered", "claimed"]);
 const TERMINAL_CONTROL_STATUSES = new Set(["handled", "failed"]);
 const CONTROL_ADMISSION_NEXT_ACTIONS = [
-    "inspect target=run:<id> view=control",
-    "inspect target=runtime view=triage",
+    "actors_inspect target=run:<id> view=control",
+    "actors_inspect target=runtime view=triage",
 ];
 function isCount(value) {
     return Number.isSafeInteger(value) && value >= 0;

package/dist/lib/runtime.d.ts

@@ -27,6 +27,9 @@ export interface ToolRegistryRuntimeDeps {
     getActiveTools?: () => string[];
     getAllTools?: () => Array<{
         name: string;
+        sourceInfo?: {
+            path: string;
+        };
     }>;
     registerTool: (definition: ReturnType<typeof ToolsLocal.createRuntimeToolDefinition>) => void;
     reservedToolNames: Set<string>;

package/dist/lib/runtime.js

@@ -5,6 +5,7 @@
  */
 import { existsSync, watch } from "node:fs";
 import { basename, dirname } from "node:path";
+import * as Identity from "./identity.js";
 import * as Paths from "./paths.js";
 import * as RecipesDiscovery from "./recipes-discovery.js";
 import * as RecipesReferences from "./recipes-references.js";
@@ -15,6 +16,8 @@ export function createAutoToolsRuntime(deps) {
     const tools = new Map();
     const runtimeToolFingerprints = new Map();
     const runtimeTools = new Set();
+    // Host declarations survive deactivation; retain their observed provenance separately.
+    const runtimeToolSources = new Map();
     const recipeRoot = deps.recipeRoot ?? Paths.getRecipeRoot();
     const status = {
         active_tool_count: 0,
@@ -28,9 +31,13 @@ export function createAutoToolsRuntime(deps) {
             ctx.ui.notify(message, type);
     }
     function getToolNameBlocker(name) {
-        return deps.reservedToolNames.has(name)
-            ? `Reserved tool name: ${name}`
-            : undefined;
+        const normalized = Identity.normalizeToolName(name);
+        if ([...deps.reservedToolNames].some((reserved) => Identity.normalizeToolName(reserved) === normalized))
+            return `Reserved tool name: ${name}`;
+        const foreign = deps.getAllTools?.().find((tool) => Identity.normalizeToolName(tool.name) === normalized &&
+            !(tool.name === name && runtimeToolSources.has(name) &&
+                tool.sourceInfo?.path === runtimeToolSources.get(name)));
+        return foreign ? `Host tool name collision: ${name} conflicts with ${foreign.name}` : undefined;
     }
     function getToolFingerprint(cfg) {
         return JSON.stringify({
@@ -61,13 +68,15 @@ export function createAutoToolsRuntime(deps) {
         const stale = [...runtimeTools].filter((name) => !activeNames.has(name));
         if (stale.length === 0)
             return;
+        const hostTools = deps.getAllTools?.();
+        const staleOwned = stale.filter((name) => !hostTools || hostTools.some((tool) => tool.name === name && tool.sourceInfo?.path === runtimeToolSources.get(name)));
         for (const name of stale) {
             runtimeTools.delete(name);
             runtimeToolFingerprints.delete(name);
         }
         if (!deps.getActiveTools || !deps.setActiveTools)
             return;
-        const staleSet = new Set(stale);
+        const staleSet = new Set(staleOwned);
         deps.setActiveTools(deps.getActiveTools().filter((name) => !staleSet.has(name)));
     }
     function activationFor(name) {
@@ -81,10 +90,14 @@ export function createAutoToolsRuntime(deps) {
         };
     }
     function registerRuntimeTool(cfg) {
+        const blocker = getToolNameBlocker(cfg.name);
+        if (blocker)
+            throw new Error(blocker);
         const fingerprint = getToolFingerprint(cfg);
         if (runtimeToolFingerprints.get(cfg.name) !== fingerprint) {
             deps.registerTool(ToolsLocal.createRuntimeToolDefinition(cfg, deps.exec));
             runtimeTools.add(cfg.name);
+            runtimeToolSources.set(cfg.name, deps.getAllTools?.().find((tool) => tool.name === cfg.name)?.sourceInfo?.path);
             runtimeToolFingerprints.set(cfg.name, fingerprint);
         }
         if (deps.getActiveTools && deps.setActiveTools) {
@@ -129,7 +142,7 @@ export function createAutoToolsRuntime(deps) {
             lines.push(...other.map((warning) => `• ${warning}`));
             groups[groups.length] = ["other_diagnostics", start, lines.length];
         }
-        lines.push("Next: inspect target=recipes view=doctor");
+        lines.push("Next: actors_inspect target=recipes view=doctor");
         // Preserve the original layout join/coercion and its faults before projecting owned warning slots.
         void `${lines.join("\n")}\n`;
         let text = ToolsResponse.formatMarkdownField("report", "pi-actors recipe registry warning");
@@ -141,7 +154,7 @@ export function createAutoToolsRuntime(deps) {
                     : "  - warning:\n    - result: unavailable\n    - reason: malformed_selected_text");
             }
         }
-        return text + "\n" + ToolsResponse.formatMarkdownField("instruction", "Next: inspect target=recipes view=doctor") + "\n";
+        return text + "\n" + ToolsResponse.formatMarkdownField("instruction", "Next: actors_inspect target=recipes view=doctor") + "\n";
     }
     function loadTools(ctx, resolutionContext) {
         const warnings = [];
@@ -170,6 +183,7 @@ export function createAutoToolsRuntime(deps) {
             const blocker = getToolNameBlocker(cfg.name);
             if (blocker) {
                 warnings.push(blocker);
+                tools.delete(cfg.name);
                 continue;
             }
             registerRuntimeTool(cfg);
@@ -195,7 +209,7 @@ export function createAutoToolsRuntime(deps) {
         }),
         getToolStatus: (name) => {
             const cfg = tools.get(name);
-            if (!cfg)
+            if (!cfg || getToolNameBlocker(name))
                 return undefined;
             const usage = cfg.sourcePath
                 ? RecipesUsage.readRecipeUsage(cfg.sourcePath)
@@ -217,8 +231,8 @@ export function createAutoToolsRuntime(deps) {
                 next_actions: activation.callable_now
                     ? [`call tool ${name}`]
                     : [
-                        `register_tool name=${name} update=true`,
-                        `inspect target=tool:${name} view=status`,
+                        `actors_tool_register name=${name} update=true`,
+                        `actors_inspect target=tool:${name} view=status`,
                     ],
                 ...(usage?.launch_kind ? { launch_kind: usage.launch_kind } : {}),
                 spawn_calls: Number(usage?.spawn_calls ?? 0),
@@ -271,7 +285,7 @@ export function createRecipeToolReloadWatcher(runtime, deps = {}) {
         failureNotified = true;
         setWatchStatus("failed");
         try {
-            ctx.ui.notify("- report: Recipe live reload watcher failed\n- instruction: restart the session or use register_tool again to refresh recipe tools.", "warning");
+            ctx.ui.notify("- report: Recipe live reload watcher failed\n- instruction: restart the session or use actors_tool_register again to refresh recipe tools.", "warning");
         }
         catch (error) {
             reportCallbackError(error);

package/dist/lib/tool-review-scheduler.js

@@ -264,7 +264,7 @@ export function applyApprovedToolReviewAtSessionBoundary(options = {}) {
                 ...state,
                 failedStage: "approval_state",
                 lastError: "approved review path is unavailable",
-                nextAction: "message target=runtime action=review.retry input={\"scope\":\"tool\"}",
+                nextAction: "actors_control_apply target=runtime action=review.retry input={\"scope\":\"tool\"}",
                 phase: "processing_failed",
                 updatedAt: (options.now ?? (() => new Date()))().toISOString(),
             };
@@ -287,7 +287,7 @@ export function applyApprovedToolReviewAtSessionBoundary(options = {}) {
                     ...state,
                     failedStage: "transaction",
                     lastError: `tool review transaction remained ${transaction.phase}`,
-                    nextAction: "message target=runtime action=review.retry input={\"scope\":\"tool\"}",
+                    nextAction: "actors_control_apply target=runtime action=review.retry input={\"scope\":\"tool\"}",
                     phase: "processing_failed",
                     updatedAt: (options.now ?? (() => new Date()))().toISOString(),
                 };
@@ -316,7 +316,7 @@ export function applyApprovedToolReviewAtSessionBoundary(options = {}) {
                     ...pending,
                     failedStage: "lineage",
                     lastError: error instanceof Error ? error.message : String(error),
-                    nextAction: "message target=runtime action=review.retry input={\"scope\":\"tool\"}",
+                    nextAction: "actors_control_apply target=runtime action=review.retry input={\"scope\":\"tool\"}",
                 };
                 writeJsonAtomic(statePath, failedPending);
                 return { outcome: "lineage_pending", state: failedPending };
@@ -337,7 +337,7 @@ export function applyApprovedToolReviewAtSessionBoundary(options = {}) {
                 ...state,
                 failedStage: "transaction",
                 lastError: error instanceof Error ? error.message : String(error),
-                nextAction: "message target=runtime action=review.retry input={\"scope\":\"tool\"}",
+                nextAction: "actors_control_apply target=runtime action=review.retry input={\"scope\":\"tool\"}",
                 phase: "processing_failed",
                 updatedAt: (options.now ?? (() => new Date()))().toISOString(),
             };
@@ -401,7 +401,7 @@ export function createToolReviewScheduler(deps) {
                             ...existing,
                             failedStage: processed.stage ?? "review_result",
                             lastError: processed.error ?? "automatic tool reviewer failed",
-                            nextAction: "message target=runtime action=review.retry input={\"scope\":\"tool\"}",
+                            nextAction: "actors_control_apply target=runtime action=review.retry input={\"scope\":\"tool\"}",
                             phase: processed.outcome === "processing_failed"
                                 ? "processing_failed"
                                 : "failed",
@@ -437,7 +437,7 @@ export function createToolReviewScheduler(deps) {
                                 attempts: existing.attempts + 1,
                                 failedStage: "review_launch",
                                 lastError: error instanceof Error ? error.message : String(error),
-                                nextAction: "message target=runtime action=review.retry input={\"scope\":\"tool\"}",
+                                nextAction: "actors_control_apply target=runtime action=review.retry input={\"scope\":\"tool\"}",
                                 phase: "failed",
                                 updatedAt: now().toISOString(),
                             });
@@ -471,7 +471,7 @@ export function createToolReviewScheduler(deps) {
                             failedStage: "review_launch",
                             inputPath: batch.inputPath,
                             lastError: error instanceof Error ? error.message : String(error),
-                            nextAction: "message target=runtime action=review.retry input={\"scope\":\"tool\"}",
+                            nextAction: "actors_control_apply target=runtime action=review.retry input={\"scope\":\"tool\"}",
                             phase: "failed",
                             reviewerInputPath: batch.reviewerInputPath,
                             reviewId: batch.reviewId,

package/dist/lib/tools-access.js

@@ -33,7 +33,7 @@ export function sessionMismatchError(input) {
     const actor = input.run ? `run:${input.run}` : (input.target ?? "session");
     return Object.assign(new Error(`${actor} reason=session_mismatch owner_session=${ownerSession} current_session=${currentSession} hint=inspect_runtime_runs`), {
         current_session: input.currentSession,
-        hint: "inspect target=runtime view=runs",
+        hint: "actors_inspect target=runtime view=runs",
         owner_session: input.expectedSession,
         reason: "session_mismatch",
         run: input.run,

package/dist/lib/tools-inspect.js

@@ -145,10 +145,10 @@ function runtimeTriage(ctx, deps) {
         trace_diagnostic_count: traceDiagnostics.length, trace_diagnostics: traceDiagnostics.slice(0, 40),
         attention_events: attentionEvents.slice(-40).reverse(),
         next_actions: [
-            ...(failed.length ? ["inspect target=runtime view=runs status=failed"] : []),
-            ...new Set([...staleControls, ...backpressuredRuns].slice(0, 3).map((entry) => `inspect target=run:${entry.run} view=control`)),
+            ...(failed.length ? ["actors_inspect target=runtime view=runs status=failed"] : []),
+            ...new Set([...staleControls, ...backpressuredRuns].slice(0, 3).map((entry) => `actors_inspect target=run:${entry.run} view=control`)),
             ...(attentionEvents.length
-                ? attentionEvents.slice(-3).map((entry) => `inspect target=run:${String(entry.run)} view=trace source=runtime`)
+                ? attentionEvents.slice(-3).map((entry) => `actors_inspect target=run:${String(entry.run)} view=trace source=runtime`)
                 : []),
         ],
     };
@@ -209,7 +209,7 @@ function formatInspectFailure(fields, next) {
         return { omittable, full, selected };
     });
     // Only producer-known read-only inspect literals become a typed next, never a parsed action.
-    const typedNext = next ? { next: { tool: "inspect", target: next[0], view: next[1] } } : undefined;
+    const typedNext = next ? { next: { tool: "actors_inspect", target: next[0], view: next[1] } } : undefined;
     const nextFallback = { next_action: omitted };
     const document = () => ({ ...Object.assign({}, ...parts.map((part) => part.selected)),
         ...(typedNext ?? nextFallback) });
@@ -336,15 +336,15 @@ function inspectRecipeIdentity(identity, resolutionContext, namespaces, inventor
         ...(rejectedReason ? { rejected_reason: rejectedReason } : {}),
         next_actions: resolvable
             ? [
-                `spawn recipe=${identity}`,
-                `register_tool name=<tool-name> from=${identity}`,
+                `actors_run_spawn recipe=${identity}`,
+                `actors_tool_register name=<tool-name> from=${identity}`,
             ]
             : roots.length === 0 && skill
                 ? [
                     `activate Skill ${skill}`,
-                    `inspect target=recipes view=doctor identity=${identity}`,
+                    `actors_inspect target=recipes view=doctor identity=${identity}`,
                 ]
-                : ["inspect target=recipes view=imports verbose=true"],
+                : ["actors_inspect target=recipes view=imports verbose=true"],
     };
 }
 function inspectRecipes(requestedView, input, deps, context) {
@@ -583,7 +583,7 @@ function compactResult(target, view, details) {
             ? String(details.next_actions[0])
             : details.callable_now === true
                 ? `call tool ${name}`
-                : `register_tool name=${name} update=true`;
+                : `actors_tool_register name=${name} update=true`;
         const hint = ToolsResponse.nextActionMetadata(next, Limits.RUN_DELIVERY_MODEL_MAX_BYTES);
         const required = compactArguments("required_args", details.required_args);
         const optional = compactArguments("optional_args", details.optional_args);
@@ -601,7 +601,7 @@ function compactResult(target, view, details) {
 }
 export function createInspectToolDefinition(deps = {}) {
     return {
-        name: "inspect",
+        name: "actors_inspect",
         label: "Inspect",
         description: "Inspect a Run's Recipe, Trace, or Control evidence, or runtime/recipe/tool diagnostics.",
         parameters: Schema.objectSchema({

package/dist/lib/tools-message.d.ts

@@ -1,5 +1,5 @@
 /**
- * Public Control facade under the stable `message` tool name.
+ * Public Control facade under the stable `actors_control_apply` tool name.
  * Zones: Control request validation, Run/runtime dispatch, recipient-scoped receipts
  * Owns public Control execution; journaling, delivery, and lifecycle mutation stay in Run domains.
  */