agentfootprint 9.32.0 → 9.34.0

package/dist/esm/lib/injection-engine/skillTools.d.ts

@@ -1,27 +1,35 @@
 /**
- * Skill-tool builders — shared source of truth for `list_skills` and
- * `read_skill` tools used by the Agent's auto-attach path AND by
- * `SkillRegistry.toTools()` (explicit composition path).
+ * Skill-tool ADAPTERS — the one place the graph's tool DESCRIPTIONS become
+ * agentfootprint `Tool`s.
  *
- * Both tools work over the SAME catalog (a list of `Injection` skills).
- * Pulling them out of `core/Agent.ts` removes the v2.4 duplication
- * risk: the Agent auto-attaches its own `read_skill`, the registry
- * builds a sibling — they MUST agree on schema + execute semantics.
+ * `list_skills`, `read_skill` and `skip_step` are described — name, schema,
+ * every sentence the model reads — by the pure skill-graph core
+ * (`skillToolDescriptors.ts`, `skillSteps.ts`). This module does the last
+ * step: hands each descriptor to `defineTool`. That split (9.34.0) is what
+ * keeps `read_skill`'s grammar, which is genuinely the graph's — the enum is
+ * the catalog, the description is the reachability offer, the result is what
+ * the model learns about the skill it activated — out of a module that has to
+ * import the framework's tool factory, and therefore out of everything that
+ * factory pulls in (artifacts, credentials, check-in, tool sessions).
  *
- * Pattern: pure builder functions over an `Injection[]` catalog.
- *          Tool execute is identity-style (returns confirmation
- *          string); the agent's tool-calls subflow inspects the
- *          tool name + args and updates `scope.activatedInjectionIds`
- *          so the next iteration's InjectionEngine sees the new
- *          activation.
+ * Both tool pairs work over the SAME catalog (a list of `Injection` skills),
+ * used by the Agent's auto-attach path AND by `SkillRegistry.toTools()`
+ * (explicit composition path). Pulling them out of `core/Agent.ts` removed
+ * the v2.4 duplication risk: the Agent auto-attaches its own `read_skill`,
+ * the registry builds a sibling — they MUST agree on schema + execute
+ * semantics, and now they cannot disagree because neither writes the words.
  *
- * Closes Neo gap #3 (of 8) by making the LLM-facing skill discovery
- * surface composable — consumers can plug `listSkills` / `readSkill`
- * into their own ToolProvider chain (e.g., gatedTools → permission
- * filter → static + skill-tools).
+ * Tool execute is identity-style (returns a confirmation string); the agent's
+ * tool-calls subflow inspects the tool name + args and updates
+ * `scope.activatedInjectionIds` so the next iteration's InjectionEngine sees
+ * the new activation.
+ *
+ * Zone: HOST. Importing `core/tools.js` here is the point of the file.
  */
 import type { Tool } from '../../core/tools.js';
+import { type ReadSkillOffer } from './skillToolDescriptors.js';
 import type { Injection } from './types.js';
+export type { ReadSkillOffer } from './skillToolDescriptors.js';
 /**
  * Build the `list_skills` tool — a no-arg tool that returns the
  * registered skills as `{ id, description }[]`. Lets the LLM discover
@@ -34,68 +42,6 @@ import type { Injection } from './types.js';
  * guard or filter undefined out of their tool list.
  */
 export declare function buildListSkillsTool(skills: readonly Injection[]): Tool | undefined;
-/**
- * What the gate will ACTUALLY grant right now — the ids `read_skill` should be
- * offering, as opposed to the ids it can dispatch (8.5.0).
- *
- * Without this the tool enumerated every registered skill while the skill-graph gate
- * admitted only `reachableSkills(cursor) ∪ open`, so a route target the cursor cannot
- * reach was advertised on every iteration and refused on every call. The model was
- * being asked to choose from a menu the library knew it would reject.
- */
-export interface ReadSkillOffer {
-    /**
-     * Ids the gate will grant from the current cursor. Omit when there is no
-     * graph — then the description is the plain catalog it has always been,
-     * minus anything {@link ReadSkillOffer.hiddenIds} removes.
-     */
-    readonly grantable?: readonly string[];
-    /** Say the rest are refusable rather than hiding them. Hiding a skill it can see
-     *  in `list_skills` (and in the enum) would just move the confusion; naming the
-     *  boundary lets the model route around it in one step instead of guessing. */
-    readonly showRefusable?: boolean;
-    /**
-     * Ids removed from the description ENTIRELY — not listed as reachable, not
-     * listed as refusable, not named at all (9.11.0).
-     *
-     * The opposite treatment from the graph's `shut` set above, and deliberately
-     * so. A graph refusal is about WHERE THE CURSOR IS: the skill exists for this
-     * caller, it is simply not reachable from here, so naming it lets the model
-     * route to it in one step. A hidden skill is about WHO IS ASKING: no cursor
-     * move makes it available, and naming it would tell a role about a capability
-     * it will never be allowed to use — leaking the shape of somebody else's
-     * permissions into this model's prompt.
-     *
-     * The ENUM keeps the full catalog either way (see below). Narrowing it would
-     * turn a policy refusal into a generic schema error, and the model would
-     * never read the policy's own message.
-     */
-    readonly hiddenIds?: readonly string[];
-    /**
-     * Turn-start MENU (SG-C): when set, the description LEADS with these
-     * candidates (id + one-line description; advisory relevance %s beside
-     * near-tie candidates), names the cursor, and states STAY as a first-class
-     * option ("answer without calling read_skill to stay in '<cursor>'").
-     *
-     * Set only while the turn's menu verdict is outstanding (turn start, before
-     * any accepted pick) — the tools slot reads it off the SAME verdict the
-     * record carries, so the offer can never drift from `turn_routed.offered`.
-     * The enum stays the full catalog (the 8.5.0 law below — narrowing it would
-     * retire four honesty mechanisms), and {@link ReadSkillOffer.hiddenIds}
-     * filters menu rows exactly as it filters every other list: a role-hidden
-     * skill is never NAMED, menu or no menu.
-     */
-    readonly menu?: {
-        readonly candidates: ReadonlyArray<{
-            readonly id: string;
-            readonly relevance?: number;
-        }>;
-        /** Names the cursor the STAY sentence refers to ("you are in billing"). */
-        readonly cursorId?: string;
-        /** STAY spelled out as a first-class option (mid-conversation menus). */
-        readonly stay?: boolean;
-    };
-}
 /**
  * Build the `read_skill` tool — activates a skill for the next
  * iteration. The LLM picks WHICH skill via the `id` argument.
@@ -123,6 +69,22 @@ export interface ReadSkillOffer {
  * way. Omit it and the tool is byte-identical to what it has always been.
  */
 export declare function buildReadSkillTool(skills: readonly Injection[], offer?: ReadSkillOffer): Tool | undefined;
+/**
+ * Build the `skip_step` tool. Auto-attached to the dispatch registry when
+ * ≥1 registered skill declares steps (the `read_skill` auto-attach seam) —
+ * always dispatchable, but OFFERED (schema in the request) only while a
+ * stepped tenure is active and unfinished. Its execute returns a
+ * placeholder; the tool-calls stage overwrites the model-visible result
+ * with the authoritative sentence, exactly as the skill-graph gate
+ * overwrites `read_skill` refusals — bookkeeping lives where the batch
+ * order lives.
+ *
+ * Lived in `skillSteps.ts` through 9.33.x; moved here in 9.34.0 so that
+ * module — the procedure GRAMMAR — stops importing the tool factory. The
+ * sentences it speaks are still `skillSteps.ts`'s
+ * ({@link skipStepDescriptor}); only the wrapping moved.
+ */
+export declare function buildSkipStepTool(): Tool;
 /**
  * The pair returned by `SkillRegistry.toTools()`. Either entry may be
  * undefined when the registry is empty. Consumers typically destructure:

package/dist/esm/lib/injection-engine/skillTools.js

@@ -1,26 +1,34 @@
 /**
- * Skill-tool builders — shared source of truth for `list_skills` and
- * `read_skill` tools used by the Agent's auto-attach path AND by
- * `SkillRegistry.toTools()` (explicit composition path).
+ * Skill-tool ADAPTERS — the one place the graph's tool DESCRIPTIONS become
+ * agentfootprint `Tool`s.
  *
- * Both tools work over the SAME catalog (a list of `Injection` skills).
- * Pulling them out of `core/Agent.ts` removes the v2.4 duplication
- * risk: the Agent auto-attaches its own `read_skill`, the registry
- * builds a sibling — they MUST agree on schema + execute semantics.
+ * `list_skills`, `read_skill` and `skip_step` are described — name, schema,
+ * every sentence the model reads — by the pure skill-graph core
+ * (`skillToolDescriptors.ts`, `skillSteps.ts`). This module does the last
+ * step: hands each descriptor to `defineTool`. That split (9.34.0) is what
+ * keeps `read_skill`'s grammar, which is genuinely the graph's — the enum is
+ * the catalog, the description is the reachability offer, the result is what
+ * the model learns about the skill it activated — out of a module that has to
+ * import the framework's tool factory, and therefore out of everything that
+ * factory pulls in (artifacts, credentials, check-in, tool sessions).
  *
- * Pattern: pure builder functions over an `Injection[]` catalog.
- *          Tool execute is identity-style (returns confirmation
- *          string); the agent's tool-calls subflow inspects the
- *          tool name + args and updates `scope.activatedInjectionIds`
- *          so the next iteration's InjectionEngine sees the new
- *          activation.
+ * Both tool pairs work over the SAME catalog (a list of `Injection` skills),
+ * used by the Agent's auto-attach path AND by `SkillRegistry.toTools()`
+ * (explicit composition path). Pulling them out of `core/Agent.ts` removed
+ * the v2.4 duplication risk: the Agent auto-attaches its own `read_skill`,
+ * the registry builds a sibling — they MUST agree on schema + execute
+ * semantics, and now they cannot disagree because neither writes the words.
  *
- * Closes Neo gap #3 (of 8) by making the LLM-facing skill discovery
- * surface composable — consumers can plug `listSkills` / `readSkill`
- * into their own ToolProvider chain (e.g., gatedTools → permission
- * filter → static + skill-tools).
+ * Tool execute is identity-style (returns a confirmation string); the agent's
+ * tool-calls subflow inspects the tool name + args and updates
+ * `scope.activatedInjectionIds` so the next iteration's InjectionEngine sees
+ * the new activation.
+ *
+ * Zone: HOST. Importing `core/tools.js` here is the point of the file.
  */
 import { defineTool } from '../../core/tools.js';
+import { skipStepDescriptor } from './skillSteps.js';
+import { listSkillsDescriptor, readSkillDescriptor, } from './skillToolDescriptors.js';
 /**
  * Build the `list_skills` tool — a no-arg tool that returns the
  * registered skills as `{ id, description }[]`. Lets the LLM discover
@@ -33,80 +41,15 @@ import { defineTool } from '../../core/tools.js';
  * guard or filter undefined out of their tool list.
  */
 export function buildListSkillsTool(skills) {
-    if (skills.length === 0)
+    const d = listSkillsDescriptor(skills);
+    if (!d)
         return undefined;
-    // Capture a stable snapshot — the registry/agent calls this at
-    // build time, so the tool reflects the catalog as of registration.
-    const catalog = skills.map((s) => ({
-        id: s.id,
-        description: s.description ?? '(no description)',
-    }));
     return defineTool({
-        name: 'list_skills',
-        description: 'List all available skills with their ids and descriptions. ' +
-            'Use this to discover what skills exist before calling read_skill.',
-        inputSchema: { type: 'object', properties: {}, additionalProperties: false },
-        execute: () => {
-            // Return as a JSON-serialized string so the LLM can parse easily.
-            return JSON.stringify(catalog, null, 2);
-        },
-    });
-}
-/** Compose the tool description: one catalog, or the offer split in two. */
-function describeOffer(allSkills, line, fullCatalog, offer) {
-    const tail = `Pass the skill's id. The skill's body becomes part of the system prompt and any ` +
-        `gated tools become available on the next call.`;
-    if (!offer) {
-        return `Activate a skill for the next iteration. Available skills:\n${fullCatalog}\n\n${tail}`;
-    }
-    // Hidden first, so nothing below can name one — the menu, the graph split,
-    // the "not reachable" list and the plain catalog all read from this.
-    const hidden = new Set(offer.hiddenIds ?? []);
-    const skills = hidden.size > 0 ? allSkills.filter((s) => !hidden.has(s.id)) : allSkills;
-    // The turn-start MENU leads (SG-C) — rendered from the turn verdict, ids
-    // resolved against the (hidden-filtered) catalog so an id this description
-    // may not name, or one that is not a skill here, is silently skipped rather
-    // than fabricated into a row.
-    const byId = new Map(skills.map((s) => [s.id, s]));
-    const menuRows = (offer.menu?.candidates ?? [])
-        .filter((c) => byId.has(c.id))
-        .map((c) => {
-        const pct = c.relevance !== undefined ? ` (relevance ~${Math.round(c.relevance * 100)}%)` : '';
-        return `${line(byId.get(c.id))}${pct}`;
+        name: d.name,
+        description: d.description,
+        inputSchema: d.inputSchema,
+        execute: (args) => d.execute(args),
     });
-    const menuLead = offer.menu !== undefined && menuRows.length > 0
-        ? `This turn needs a routing choice — no declared rule or intent decisively matched. ` +
-            `Closest candidates (advisory; an offline scorer ranked them and cannot see the ` +
-            `conversation):\n${menuRows.join('\n')}\n` +
-            (offer.menu.stay === true && offer.menu.cursorId !== undefined
-                ? `You are in '${offer.menu.cursorId}'. Staying is a first-class option: answer ` +
-                    `WITHOUT calling read_skill to stay in '${offer.menu.cursorId}'.\n\n`
-                : `Answering WITHOUT calling read_skill is also allowed.\n\n`)
-        : '';
-    if (offer.grantable === undefined) {
-        // No graph — the plain catalog, filtered. A role with nothing left is told
-        // plainly rather than handed an empty list to interpret.
-        return skills.length === 0
-            ? `Activate a skill for the next iteration. No skills are available to you — ` +
-                `answer without one, or say what you are unable to do.\n\n${tail}`
-            : `${menuLead}Activate a skill for the next iteration. Available skills:\n${skills
-                .map(line)
-                .join('\n')}\n\n${tail}`;
-    }
-    const grantable = new Set(offer.grantable);
-    const open = skills.filter((s) => grantable.has(s.id));
-    const shut = skills.filter((s) => !grantable.has(s.id));
-    const parts = [
-        open.length > 0
-            ? `Reachable from here:\n${open.map(line).join('\n')}`
-            : 'Nothing is reachable from here — answer with the skill you are in, or finish.',
-    ];
-    if (offer.showRefusable !== false && shut.length > 0) {
-        parts.push(`Not reachable from here (read_skill for these will be refused):\n${shut
-            .map(line)
-            .join('\n')}`);
-    }
-    return `${menuLead}Activate a skill for the next iteration.\n\n${parts.join('\n\n')}\n\n${tail}`;
 }
 /**
  * Build the `read_skill` tool — activates a skill for the next
@@ -135,57 +78,38 @@ function describeOffer(allSkills, line, fullCatalog, offer) {
  * way. Omit it and the tool is byte-identical to what it has always been.
  */
 export function buildReadSkillTool(skills, offer) {
-    if (skills.length === 0)
+    const d = readSkillDescriptor(skills, offer);
+    if (!d)
         return undefined;
-    const skillIds = skills.map((s) => s.id);
-    const line = (s) => `  - ${s.id}: ${s.description ?? '(no description)'}`;
-    const skillCatalog = skills.map(line).join('\n');
-    const byId = new Map();
-    for (const s of skills) {
-        const meta = s.metadata;
-        byId.set(s.id, {
-            body: s.inject.systemPrompt ?? '',
-            surfaceMode: meta?.surfaceMode ?? 'auto',
-        });
-    }
     return defineTool({
-        name: 'read_skill',
-        description: describeOffer(skills, line, skillCatalog, offer),
-        inputSchema: {
-            type: 'object',
-            properties: {
-                id: {
-                    type: 'string',
-                    // The FULL catalog, always — deliberately NOT narrowed to the reachable
-                    // set (8.5.0). `toolArgValidation` defaults to `'enforce'` and runs BEFORE
-                    // the skill-graph gate, rejecting an off-enum id with a generic schema
-                    // error and `error = true`, which the gate then skips. Narrowing this
-                    // would silently retire the gate's teaching refusal, the
-                    // `agentfootprint.skill.rejected` event, `routeRecorder`'s rejection hops
-                    // and the rejected-cap governor's only input — four honesty mechanisms
-                    // traded for one. The OFFER is narrowed in the description instead, which
-                    // is what the model actually reads to choose.
-                    enum: skillIds,
-                    description: 'The skill id to activate.',
-                },
-            },
-            required: ['id'],
-        },
-        execute: ({ id }) => {
-            const entry = byId.get(id);
-            if (!entry) {
-                return `Unknown skill '${id}'. Available: ${skillIds.join(', ')}`;
-            }
-            // Block C — per-mode tool-result dispatch:
-            //   - 'tool-only' / 'both' → return body verbatim (recency-first
-            //     delivery; LLM sees it as the most recent tool result).
-            //   - 'system-prompt' / 'auto' / unspecified → return confirmation
-            //     only; body lands via system slot on the next iteration.
-            if ((entry.surfaceMode === 'tool-only' || entry.surfaceMode === 'both') && entry.body) {
-                return entry.body;
-            }
-            return `Skill '${id}' activated for the next iteration.`;
-        },
+        name: d.name,
+        description: d.description,
+        inputSchema: d.inputSchema,
+        execute: (args) => d.execute(args),
+    });
+}
+/**
+ * Build the `skip_step` tool. Auto-attached to the dispatch registry when
+ * ≥1 registered skill declares steps (the `read_skill` auto-attach seam) —
+ * always dispatchable, but OFFERED (schema in the request) only while a
+ * stepped tenure is active and unfinished. Its execute returns a
+ * placeholder; the tool-calls stage overwrites the model-visible result
+ * with the authoritative sentence, exactly as the skill-graph gate
+ * overwrites `read_skill` refusals — bookkeeping lives where the batch
+ * order lives.
+ *
+ * Lived in `skillSteps.ts` through 9.33.x; moved here in 9.34.0 so that
+ * module — the procedure GRAMMAR — stops importing the tool factory. The
+ * sentences it speaks are still `skillSteps.ts`'s
+ * ({@link skipStepDescriptor}); only the wrapping moved.
+ */
+export function buildSkipStepTool() {
+    const d = skipStepDescriptor();
+    return defineTool({
+        name: d.name,
+        description: d.description,
+        inputSchema: d.inputSchema,
+        execute: (args) => d.execute(args),
     });
 }
 //# sourceMappingURL=skillTools.js.map

package/dist/esm/lib/injection-engine/skillTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"skillTools.js","sourceRoot":"","sources":["../../../../src/lib/injection-engine/skillTools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skillTools.js","sourceRoot":"","sources":["../../../../src/lib/injection-engine/skillTools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EACL,oBAAoB,EACpB,mBAAmB,GAEpB,MAAM,2BAA2B,CAAC;AAOnC;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAA4B;IAC9D,MAAM,CAAC,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,OAAO,UAAU,CAAgC;QAC/C,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;KACnC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAA4B,EAC5B,KAAsB;IAEtB,MAAM,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,OAAO,UAAU,CAAyB;QACxC,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;KACnC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,CAAC,GAAG,kBAAkB,EAAE,CAAC;IAC/B,OAAO,UAAU,CAA6B;QAC5C,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;KACnC,CAAoB,CAAC;AACxB,CAAC"}

package/dist/esm/lib/injection-engine/toolOutcome.d.ts

@@ -0,0 +1,30 @@
+/**
+ * toolOutcome — the normalized tool-outcome vocabulary, as a PURE leaf
+ * (9.34.0).
+ *
+ * WHY IT LIVES HERE. A skill-graph route edge can key on what a tool
+ * DECLARED happened (`onToolStatus`), so this vocabulary is part of the
+ * graph's own reading of a turn — `InjectionContext.toolResults[].status`
+ * is typed by it. It used to be declared inside `core/agent/toolEffects.ts`,
+ * which meant the graph's context type reached into the agent loop's
+ * tool-effects module for one string union: the loop's vocabulary embedded
+ * in the graph's contract, pointing the dependency the wrong way.
+ *
+ * So the six words moved DOWN here — a module with zero imports that both
+ * sides read. `core/agent/toolEffects.ts` re-exports them under the same
+ * names, so every existing import path is unchanged; that module remains
+ * the owner of the ENVELOPE grammar (the two effect kinds, the recognizer,
+ * the lease shapes), which is genuinely loop-side.
+ *
+ * Zone: PURE CORE. Pinned by
+ * `test/lib/injection-engine/skill-graph-fence.test.ts`.
+ */
+/**
+ * Normalized outcome of one tool call, declared by the tool itself. Six
+ * values, deliberately closed: routing keyed on meaning needs a vocabulary
+ * both sides spell identically. A string outside this set makes the value
+ * NOT an envelope (data path, unchanged).
+ */
+export type ToolResultStatus = 'success' | 'failure' | 'denied' | 'invalid' | 'partial' | 'pending';
+/** The closed set, as data — validators and docs read one list. */
+export declare const TOOL_RESULT_STATUSES: readonly ToolResultStatus[];

package/dist/esm/lib/injection-engine/toolOutcome.js

@@ -0,0 +1,31 @@
+/**
+ * toolOutcome — the normalized tool-outcome vocabulary, as a PURE leaf
+ * (9.34.0).
+ *
+ * WHY IT LIVES HERE. A skill-graph route edge can key on what a tool
+ * DECLARED happened (`onToolStatus`), so this vocabulary is part of the
+ * graph's own reading of a turn — `InjectionContext.toolResults[].status`
+ * is typed by it. It used to be declared inside `core/agent/toolEffects.ts`,
+ * which meant the graph's context type reached into the agent loop's
+ * tool-effects module for one string union: the loop's vocabulary embedded
+ * in the graph's contract, pointing the dependency the wrong way.
+ *
+ * So the six words moved DOWN here — a module with zero imports that both
+ * sides read. `core/agent/toolEffects.ts` re-exports them under the same
+ * names, so every existing import path is unchanged; that module remains
+ * the owner of the ENVELOPE grammar (the two effect kinds, the recognizer,
+ * the lease shapes), which is genuinely loop-side.
+ *
+ * Zone: PURE CORE. Pinned by
+ * `test/lib/injection-engine/skill-graph-fence.test.ts`.
+ */
+/** The closed set, as data — validators and docs read one list. */
+export const TOOL_RESULT_STATUSES = [
+    'success',
+    'failure',
+    'denied',
+    'invalid',
+    'partial',
+    'pending',
+];
+//# sourceMappingURL=toolOutcome.js.map

package/dist/esm/lib/injection-engine/toolOutcome.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toolOutcome.js","sourceRoot":"","sources":["../../../../src/lib/injection-engine/toolOutcome.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAUH,mEAAmE;AACnE,MAAM,CAAC,MAAM,oBAAoB,GAAgC;IAC/D,SAAS;IACT,SAAS;IACT,QAAQ;IACR,SAAS;IACT,SAAS;IACT,SAAS;CACV,CAAC"}

package/dist/esm/lib/injection-engine/types.d.ts

@@ -16,8 +16,9 @@
  *          iteration. Slot subflows emit `agentfootprint.context.injected`
  *          for each InjectionRecord they place.
  */
-import type { Tool } from '../../core/tools.js';
 import type { ContextRole, ContextSource } from '../../events/types.js';
+import type { SkillCachePolicy, SkillTool, SkillToolSchema } from './hostContract.js';
+import type { ToolResultStatus } from './toolOutcome.js';
 /**
  * Discriminated union — exactly one of four kinds. Adding a new
  * trigger kind is one new variant; engine evaluator + Lens chip
@@ -89,8 +90,15 @@ export interface InjectionContent {
      * and are visible to the model from iteration 1 — activation adds the body,
      * not the tools. Only a Skill with `autoActivate: 'currentSkill'` has its
      * tools held back and readmitted through the tools slot while it is active.
+     *
+     * Typed as the NARROW {@link SkillTool} — a schema and something to run —
+     * rather than agentfootprint's own `Tool` (9.34.0). Every other member of
+     * `Tool` is optional, so a `Tool` satisfies this and this is accepted
+     * everywhere a `Tool` is; what changes is that DECLARING a skill no longer
+     * needs the framework's tool type, which is what lets this engine be read
+     * by a host that has its own.
      */
-    readonly tools?: readonly Tool[];
+    readonly tools?: readonly SkillTool[];
 }
 /**
  * Context passed to `rule` predicates. Read-only snapshot of the
@@ -142,7 +150,7 @@ export interface InjectionContext {
          *  tool returned a result envelope carrying `status`. `onToolStatus`
          *  route edges key on it; a result without one can never match a
          *  status edge (an undeclared outcome is not evidence). */
-        readonly status?: import('../../core/agent/toolEffects.js').ToolResultStatus;
+        readonly status?: ToolResultStatus;
     }>;
     /**
      * IDs of LLM-activated injections that the LLM has activated this
@@ -258,7 +266,7 @@ export declare function toolResultsOf(ctx: InjectionContext): ReadonlyArray<{
     readonly toolName: string;
     readonly result: string;
     readonly toolCallId?: string;
-    readonly status?: import('../../core/agent/toolEffects.js').ToolResultStatus;
+    readonly status?: ToolResultStatus;
 }>;
 /**
  * THE primitive. Five fields. Four trigger kinds. Three slot targets.
@@ -325,17 +333,33 @@ export interface InjectionEvaluation {
     }>;
 }
 /**
- * POJO projection of an active Injection — flows through footprintjs
- * scope (which cannot serialize functions) so that slot subflows can
- * read it across the subflow boundary.
+ * THE BOUNDARY CONTRACT — an active Injection as plain, serializable data.
+ *
+ * POJO projection of an active Injection: it flows through footprintjs scope
+ * (which cannot serialize functions) so that slot subflows can read it across
+ * the subflow boundary. It drops the `trigger` (already evaluated) and
+ * projects `inject.tools` to SCHEMAS ONLY — the tool's `execute` lives on the
+ * host's closure-held registry, looked up by injection id at exec time.
  *
- * Drops the `trigger` (already evaluated) and projects `inject.tools`
- * to schemas only (the Tool's `execute` function lives on the Agent's
- * closure-held registry, looked up by injection id at exec time).
+ * That description is also, exactly, what a host on ANOTHER framework needs
+ * (9.34.0). This is the shape the injection engine hands out: no predicates,
+ * no closures, no framework tool objects, nothing that has to survive a
+ * `structuredClone` and doesn't. A host reads `inject.systemPrompt` into its
+ * own system message, `inject.messages` into its own history, and
+ * `inject.tools[].schema` into its own tool list — resolving `execute` by
+ * `injectionId` in whatever registry it keeps. Which is why the two fields
+ * that used to name our own layers by inline import — the tool schema and the
+ * cache directive — are now the structural {@link SkillToolSchema} and
+ * {@link SkillCachePolicy} from `hostContract.ts`: the same shapes, spelled
+ * without reaching for an adapter or a cache implementation.
+ *
+ * It is a PROJECTION, not a second source of truth. `projectActiveInjection`
+ * below is the only thing that builds one, and a field that is not on its
+ * copy list does not cross — see `cache` for what that cost once.
  */
 export interface ActiveInjection {
     readonly id: string;
-    readonly flavor: import('../../events/types.js').ContextSource;
+    readonly flavor: ContextSource;
     readonly description?: string;
     /**
      * The DECLARED surfaceMode (Skill flavor only), copied through as written.
@@ -373,7 +397,7 @@ export interface ActiveInjection {
      * Absent when the injection declared none (hand-built Injections); the
      * decision's own `?? 'never'` default then applies, as it always did.
      */
-    readonly cache?: import('../../cache/types.js').CachePolicy;
+    readonly cache?: SkillCachePolicy;
     /**
      * Why THIS piece of retrieved content earned its place (8.8.0).
      *
@@ -394,12 +418,12 @@ export interface ActiveInjection {
     readonly inject: {
         readonly systemPrompt?: string;
         readonly messages?: ReadonlyArray<{
-            readonly role: import('../../events/types.js').ContextRole;
+            readonly role: ContextRole;
             readonly content: string;
         }>;
         /** Tool schemas only — `execute` lives on Agent's closure registry. */
         readonly tools?: ReadonlyArray<{
-            readonly schema: import('../../adapters/types.js').LLMToolSchema;
+            readonly schema: SkillToolSchema;
             readonly injectionId: string;
         }>;
     };

package/dist/esm/lib/injection-engine/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/lib/injection-engine/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA6OH;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,GAAqB;IAMjD,OAAO,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC7E,CAAC;AAyJD,wEAAwE;AACxE,MAAM,UAAU,sBAAsB,CAAC,GAAc;IACnD,qEAAqE;IACrE,+DAA+D;IAC/D,0EAA0E;IAC1E,2EAA2E;IAC3E,sBAAsB;IACtB,MAAM,IAAI,GAAG,GAAG,CAAC,QAEJ,CAAC;IACd,MAAM,GAAG,GAAoB;QAC3B,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;QACxD,GAAG,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAA6C,EAAE,CAAC;QAC7F,GAAG,CAAC,IAAI,EAAE,YAAY,IAAI;YACxB,YAAY,EAAE,IAAI,CAAC,YAA+C;SACnE,CAAC;QACF,0EAA0E;QAC1E,2EAA2E;QAC3E,yEAAyE;QACzE,GAAG,CAAC,IAAI,EAAE,KAAK,KAAK,SAAS,IAAI;YAC/B,KAAK,EAAE,IAAI,CAAC,KAAiC;SAC9C,CAAC;QACF,MAAM,EAAE;YACN,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YACzE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACpF,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI;gBACtB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAClC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE;oBACvB,WAAW,EAAE,GAAG,CAAC,EAAE;iBACpB,CAAC,CAAC;aACJ,CAAC;SACH;KACF,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/lib/injection-engine/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAqPH;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,GAAqB;IAMjD,OAAO,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC7E,CAAC;AAyKD,wEAAwE;AACxE,MAAM,UAAU,sBAAsB,CAAC,GAAc;IACnD,qEAAqE;IACrE,+DAA+D;IAC/D,0EAA0E;IAC1E,2EAA2E;IAC3E,sBAAsB;IACtB,MAAM,IAAI,GAAG,GAAG,CAAC,QAEJ,CAAC;IACd,MAAM,GAAG,GAAoB;QAC3B,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;QACxD,GAAG,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAA6C,EAAE,CAAC;QAC7F,GAAG,CAAC,IAAI,EAAE,YAAY,IAAI;YACxB,YAAY,EAAE,IAAI,CAAC,YAA+C;SACnE,CAAC;QACF,0EAA0E;QAC1E,2EAA2E;QAC3E,yEAAyE;QACzE,GAAG,CAAC,IAAI,EAAE,KAAK,KAAK,SAAS,IAAI;YAC/B,KAAK,EAAE,IAAI,CAAC,KAAiC;SAC9C,CAAC;QACF,MAAM,EAAE;YACN,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YACzE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACpF,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI;gBACtB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAClC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE;oBACvB,WAAW,EAAE,GAAG,CAAC,EAAE;iBACpB,CAAC,CAAC;aACJ,CAAC;SACH;KACF,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC"}