@roll-agent/runtime 0.26.0 → 1.0.0

package/dist/server/runtime-client-interaction-lifecycle.d.ts

@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 import type { ApprovalId, InteractionId, JsonRpcId, RuntimeInstanceId, RuntimeProtocolVersion, RuntimeServerRequestMethod } from "@roll-agent/protocol";
-declare const logicalInteractionKeySchema: z.core.$ZodBranded<z.ZodString, "LogicalInteractionKey">;
-declare const runtimeDeliveryIdSchema: z.core.$ZodBranded<z.ZodString, "RuntimeDeliveryId">;
+declare const logicalInteractionKeySchema: z.core.$ZodBranded<z.ZodString, "LogicalInteractionKey", "out">;
+declare const runtimeDeliveryIdSchema: z.core.$ZodBranded<z.ZodString, "RuntimeDeliveryId", "out">;
 export type LogicalInteractionKey = z.output<typeof logicalInteractionKeySchema>;
 export type RuntimeDeliveryId = z.output<typeof runtimeDeliveryIdSchema>;
 export interface RuntimeClientInteractionInput<TResponderId extends string> {

package/dist/skills/contracts.d.ts

@@ -0,0 +1,24 @@
+export declare const SKILL_SOURCES: readonly ["agent", "project", "user", "config"];
+export type SkillSource = (typeof SKILL_SOURCES)[number];
+export interface SkillSummary {
+    readonly name: string;
+    readonly description: string;
+    readonly source: SkillSource;
+}
+export interface LoadedSkill {
+    readonly summary: SkillSummary;
+    readonly content: string;
+    readonly referencePaths: readonly string[];
+    readonly skillRoot?: string;
+}
+export interface LoadedSkillReference {
+    readonly content: string;
+    readonly skillRoot?: string;
+}
+export interface SkillLibrary {
+    list(): readonly SkillSummary[];
+    load(name: string): LoadedSkill | undefined;
+    loadReference(name: string, referencePath: string): string | undefined;
+    loadReferenceDocument?(name: string, referencePath: string): LoadedSkillReference | undefined;
+}
+export declare const SKILL_TOOL_ID = "roll__skill";

package/dist/skills/contracts.js

@@ -0,0 +1 @@
+export const SKILL_SOURCES=["agent","project","user","config"];export const SKILL_TOOL_ID="roll__skill";

package/dist/skills/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./contracts.ts";
+export * from "./invocation.ts";

package/dist/skills/index.js

@@ -0,0 +1 @@
+export*from"./contracts.js";export*from"./invocation.js";

package/dist/skills/invocation.d.ts

@@ -0,0 +1,29 @@
+export interface SkillInvocationSummary {
+    readonly name: string;
+    readonly description: string;
+    readonly source: string;
+}
+export interface SkillInvocation {
+    readonly skills: readonly SkillInvocationSummary[];
+    readonly prompt: string;
+}
+export declare const SKILL_INVOCATION_PARSE_KINDS: {
+    readonly none: "none";
+    readonly valid: "valid";
+    readonly unknown: "unknown";
+};
+export type SkillInvocationParseResult = {
+    readonly kind: typeof SKILL_INVOCATION_PARSE_KINDS.none;
+} | {
+    readonly kind: typeof SKILL_INVOCATION_PARSE_KINDS.valid;
+    readonly invocation: SkillInvocation;
+} | {
+    readonly kind: typeof SKILL_INVOCATION_PARSE_KINDS.unknown;
+    readonly token: string;
+};
+export declare function isSlashCommandToken(token: string): boolean;
+export declare function isSlashCommandShaped(input: string): boolean;
+export declare function findSkillBySlashName(token: string, skills: readonly SkillInvocationSummary[]): SkillInvocationSummary | undefined;
+/** Parses one or more known leading /skill tokens without rewriting the user's request. */
+export declare function parseSkillInvocationResult(input: string, skills: readonly SkillInvocationSummary[]): SkillInvocationParseResult;
+export declare function parseSkillInvocation(input: string, skills: readonly SkillInvocationSummary[]): SkillInvocation | undefined;

package/dist/skills/invocation.js

@@ -0,0 +1 @@
+export const SKILL_INVOCATION_PARSE_KINDS={none:"none",valid:"valid",unknown:"unknown"};const n=/^\/[\w-]*$/;export function isSlashCommandToken(o){return n.test(o)}export function isSlashCommandShaped(n){return isSlashCommandToken(n.split(/\s+/,1)[0]??"")}export function findSkillBySlashName(n,o){const t=n.toLowerCase();return o.find(n=>`/${n.name}`.toLowerCase()===t)}export function parseSkillInvocationResult(n,o){let t=n.trimStart();const e=[],i=new Set;for(;;){const n=/^(\/\S+)(\s*)/.exec(t);if(!n)break;const s=n[1]??"";if(!isSlashCommandToken(s))break;const a=findSkillBySlashName(s,o);if(!a)return{kind:SKILL_INVOCATION_PARSE_KINDS.unknown,token:s};const r=a.name.toLowerCase();i.has(r)||(e.push(a),i.add(r)),t=t.slice(n[0].length)}return 0===e.length?{kind:SKILL_INVOCATION_PARSE_KINDS.none}:{kind:SKILL_INVOCATION_PARSE_KINDS.valid,invocation:{skills:e,prompt:t.trim()}}}export function parseSkillInvocation(n,o){const t=parseSkillInvocationResult(n,o);return t.kind===SKILL_INVOCATION_PARSE_KINDS.valid?t.invocation:void 0}

package/dist/store/semantic-ledger.d.ts

@@ -5,16 +5,11 @@ export declare const SEMANTIC_LEDGER_SQL = "\nCREATE TABLE IF NOT EXISTS compact
 export declare const contextRecoveryItemSchema: z.ZodObject<{
     itemId: z.ZodString;
     version: z.ZodNumber;
-    category: z.ZodEnum<["goal", "constraint"]>;
-}, "strip", z.ZodTypeAny, {
-    version: number;
-    itemId: string;
-    category: "goal" | "constraint";
-}, {
-    version: number;
-    itemId: string;
-    category: "goal" | "constraint";
-}>;
+    category: z.ZodEnum<{
+        goal: "goal";
+        constraint: "constraint";
+    }>;
+}, z.core.$strip>;
 export declare const recoveryStateSchema: z.ZodObject<{
     checkpointId: z.ZodString;
     required: z.ZodBoolean;
@@ -23,77 +18,37 @@ export declare const recoveryStateSchema: z.ZodObject<{
     requiredItems: z.ZodDefault<z.ZodArray<z.ZodObject<{
         itemId: z.ZodString;
         version: z.ZodNumber;
-        category: z.ZodEnum<["goal", "constraint"]>;
-    }, "strip", z.ZodTypeAny, {
-        version: number;
-        itemId: string;
-        category: "goal" | "constraint";
-    }, {
-        version: number;
-        itemId: string;
-        category: "goal" | "constraint";
-    }>, "many">>;
-}, "strip", z.ZodTypeAny, {
-    required: boolean;
-    checkpointId: string;
-    unextracted: boolean;
-    memo: string;
-    requiredItems: {
-        version: number;
-        itemId: string;
-        category: "goal" | "constraint";
-    }[];
-}, {
-    required: boolean;
-    checkpointId: string;
-    unextracted: boolean;
-    memo: string;
-    requiredItems?: {
-        version: number;
-        itemId: string;
-        category: "goal" | "constraint";
-    }[] | undefined;
-}>;
+        category: z.ZodEnum<{
+            goal: "goal";
+            constraint: "constraint";
+        }>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>;
 export type ContextRecoveryState = z.infer<typeof recoveryStateSchema>;
 export declare const contextRecoveryNoteSchema: z.ZodObject<{
     checkpointId: z.ZodString;
     notes: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    checkpointId: string;
-    notes: string;
-}, {
-    checkpointId: string;
-    notes: string;
-}>;
+}, z.core.$strip>;
 export type ContextRecoveryNote = z.infer<typeof contextRecoveryNoteSchema>;
 export declare const ledgerRowSchema: z.ZodObject<{
     item_id: z.ZodString;
     generation: z.ZodNumber;
     scope: z.ZodString;
-    category: z.ZodEnum<["goal", "constraint", "decision", "completed_work", "pending_work", "resource", "running_session", "uncertainty"]>;
+    category: z.ZodEnum<{
+        decision: "decision";
+        resource: "resource";
+        running_session: "running_session";
+        goal: "goal";
+        constraint: "constraint";
+        completed_work: "completed_work";
+        pending_work: "pending_work";
+        uncertainty: "uncertainty";
+    }>;
     status: z.ZodString;
     resolution_json: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     first_tool_sequence: z.ZodNumber;
     item_json: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    status: string;
-    generation: number;
-    scope: string;
-    category: "resource" | "decision" | "running_session" | "goal" | "constraint" | "completed_work" | "pending_work" | "uncertainty";
-    item_id: string;
-    first_tool_sequence: number;
-    item_json: string;
-    resolution_json?: string | null | undefined;
-}, {
-    status: string;
-    generation: number;
-    scope: string;
-    category: "resource" | "decision" | "running_session" | "goal" | "constraint" | "completed_work" | "pending_work" | "uncertainty";
-    item_id: string;
-    first_tool_sequence: number;
-    item_json: string;
-    resolution_json?: string | null | undefined;
-}>;
+}, z.core.$strip>;
 export type SemanticLedgerRow = z.infer<typeof ledgerRowSchema>;
 /** Compatibility reader/importer for historical V2 records. New checkpoints never append here. */
 export declare class SemanticLedger {
@@ -102,14 +57,14 @@ export declare class SemanticLedger {
     rows(threadId: string, generation: number, itemId?: string): SemanticLedgerRow[];
     /** Stable ordinals within an immutable checkpoint generation; fetch only the requested page. */
     page(threadId: string, generation: number, afterSequence: number, limit: number): {
-        status: string;
+        item_id: string;
         generation: number;
         scope: string;
-        sequence: number;
-        category: "resource" | "decision" | "running_session" | "goal" | "constraint" | "completed_work" | "pending_work" | "uncertainty";
-        item_id: string;
+        category: "decision" | "resource" | "running_session" | "goal" | "constraint" | "completed_work" | "pending_work" | "uncertainty";
+        status: string;
         first_tool_sequence: number;
         item_json: string;
+        sequence: number;
         resolution_json?: string | null | undefined;
     }[];
     notes(threadId: string): ContextRecoveryNote[];

package/dist/store/thread-origin.d.ts

@@ -9,32 +9,10 @@ export declare const scheduledThreadOriginSchema: z.ZodReadonly<z.ZodObject<{
     cwd: z.ZodString;
     scheduledFor: z.ZodString;
     ledgerDir: z.ZodString;
-}, "strict", z.ZodTypeAny, {
-    kind: "scheduled";
-    name: string;
-    cwd: string;
-    attempt: number;
-    scheduleId: string;
-    invocationId: string;
-    scheduledFor: string;
-    ledgerDir: string;
-}, {
-    kind: "scheduled";
-    name: string;
-    cwd: string;
-    attempt: number;
-    scheduleId: string;
-    invocationId: string;
-    scheduledFor: string;
-    ledgerDir: string;
-}>>;
-export declare const threadOriginSchema: z.ZodReadonly<z.ZodDiscriminatedUnion<"kind", [z.ZodObject<{
+}, z.core.$strict>>;
+export declare const threadOriginSchema: z.ZodReadonly<z.ZodDiscriminatedUnion<[z.ZodObject<{
     kind: z.ZodLiteral<"interactive">;
-}, "strict", z.ZodTypeAny, {
-    kind: "interactive";
-}, {
-    kind: "interactive";
-}>, z.ZodObject<{
+}, z.core.$strict>, z.ZodObject<{
     kind: z.ZodLiteral<"scheduled">;
     scheduleId: z.ZodString;
     invocationId: z.ZodString;
@@ -43,34 +21,12 @@ export declare const threadOriginSchema: z.ZodReadonly<z.ZodDiscriminatedUnion<"
     cwd: z.ZodString;
     scheduledFor: z.ZodString;
     ledgerDir: z.ZodString;
-}, "strict", z.ZodTypeAny, {
-    kind: "scheduled";
-    name: string;
-    cwd: string;
-    attempt: number;
-    scheduleId: string;
-    invocationId: string;
-    scheduledFor: string;
-    ledgerDir: string;
-}, {
-    kind: "scheduled";
-    name: string;
-    cwd: string;
-    attempt: number;
-    scheduleId: string;
-    invocationId: string;
-    scheduledFor: string;
-    ledgerDir: string;
-}>]>>;
+}, z.core.$strict>], "kind">>;
 export declare const threadDerivedFromSchema: z.ZodReadonly<z.ZodObject<{
     threadId: z.ZodString;
-    origin: z.ZodReadonly<z.ZodDiscriminatedUnion<"kind", [z.ZodObject<{
+    origin: z.ZodReadonly<z.ZodDiscriminatedUnion<[z.ZodObject<{
         kind: z.ZodLiteral<"interactive">;
-    }, "strict", z.ZodTypeAny, {
-        kind: "interactive";
-    }, {
-        kind: "interactive";
-    }>, z.ZodObject<{
+    }, z.core.$strict>, z.ZodObject<{
         kind: z.ZodLiteral<"scheduled">;
         scheduleId: z.ZodString;
         invocationId: z.ZodString;
@@ -79,57 +35,9 @@ export declare const threadDerivedFromSchema: z.ZodReadonly<z.ZodObject<{
         cwd: z.ZodString;
         scheduledFor: z.ZodString;
         ledgerDir: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        kind: "scheduled";
-        name: string;
-        cwd: string;
-        attempt: number;
-        scheduleId: string;
-        invocationId: string;
-        scheduledFor: string;
-        ledgerDir: string;
-    }, {
-        kind: "scheduled";
-        name: string;
-        cwd: string;
-        attempt: number;
-        scheduleId: string;
-        invocationId: string;
-        scheduledFor: string;
-        ledgerDir: string;
-    }>]>>;
+    }, z.core.$strict>], "kind">>;
     capturedAt: z.ZodString;
-}, "strict", z.ZodTypeAny, {
-    threadId: string;
-    origin: Readonly<{
-        kind: "scheduled";
-        name: string;
-        cwd: string;
-        attempt: number;
-        scheduleId: string;
-        invocationId: string;
-        scheduledFor: string;
-        ledgerDir: string;
-    }> | Readonly<{
-        kind: "interactive";
-    }>;
-    capturedAt: string;
-}, {
-    threadId: string;
-    origin: Readonly<{
-        kind: "scheduled";
-        name: string;
-        cwd: string;
-        attempt: number;
-        scheduleId: string;
-        invocationId: string;
-        scheduledFor: string;
-        ledgerDir: string;
-    }> | Readonly<{
-        kind: "interactive";
-    }>;
-    capturedAt: string;
-}>>;
+}, z.core.$strict>>;
 export type ThreadOrigin = z.infer<typeof threadOriginSchema>;
 export type ScheduledThreadOrigin = z.infer<typeof scheduledThreadOriginSchema>;
 export type ThreadDerivedFrom = z.infer<typeof threadDerivedFromSchema>;

package/dist/store/thread-store.d.ts

@@ -270,11 +270,11 @@ export declare class ThreadStore {
     getContextRecovery(threadId: string): ContextRecoveryState | undefined;
     /** Historical ledger access; new task summaries do not add semantic facts. */
     getSemanticLedgerRows(threadId: string): {
-        status: string;
+        item_id: string;
         generation: number;
         scope: string;
-        category: "resource" | "decision" | "running_session" | "goal" | "constraint" | "completed_work" | "pending_work" | "uncertainty";
-        item_id: string;
+        category: "decision" | "resource" | "running_session" | "goal" | "constraint" | "completed_work" | "pending_work" | "uncertainty";
+        status: string;
         first_tool_sequence: number;
         item_json: string;
         resolution_json?: string | null | undefined;

package/dist/store/turn-input.d.ts

@@ -5,61 +5,15 @@ export declare const turnInputIdSchema: z.ZodString;
 export declare const turnInputSkillCheckpointSchema: z.ZodReadonly<z.ZodObject<{
     version: z.ZodLiteral<1>;
     kind: z.ZodLiteral<"explicit-skill">;
-} & {
-    snapshot: z.ZodReadonly<z.ZodObject<Pick<{
-        userPrompt: z.ZodString;
-        skillNames: z.ZodArray<z.ZodString, "many">;
+    snapshot: z.ZodReadonly<z.ZodObject<{
         skills: z.ZodOptional<z.ZodArray<z.ZodReadonly<z.ZodObject<{
             name: z.ZodString;
             source: z.ZodString;
             contentSha256: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            name: string;
-            source: string;
-            contentSha256: string;
-        }, {
-            name: string;
-            source: string;
-            contentSha256: string;
-        }>>, "many">>;
-    }, "skills" | "skillNames">, "strip", z.ZodTypeAny, {
-        skillNames: string[];
-        skills?: Readonly<{
-            name: string;
-            source: string;
-            contentSha256: string;
-        }>[] | undefined;
-    }, {
-        skillNames: string[];
-        skills?: Readonly<{
-            name: string;
-            source: string;
-            contentSha256: string;
-        }>[] | undefined;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    kind: "explicit-skill";
-    version: 1;
-    snapshot: Readonly<{
-        skillNames: string[];
-        skills?: Readonly<{
-            name: string;
-            source: string;
-            contentSha256: string;
-        }>[] | undefined;
-    }>;
-}, {
-    kind: "explicit-skill";
-    version: 1;
-    snapshot: Readonly<{
-        skillNames: string[];
-        skills?: Readonly<{
-            name: string;
-            source: string;
-            contentSha256: string;
-        }>[] | undefined;
-    }>;
-}>>;
+        }, z.core.$strip>>>>;
+        skillNames: z.ZodArray<z.ZodString>;
+    }, z.core.$strip>>;
+}, z.core.$strip>>;
 export type TurnInputSkillCheckpoint = z.infer<typeof turnInputSkillCheckpointSchema>;
 export declare const acceptedTurnInputSchema: z.ZodReadonly<z.ZodObject<{
     inputId: z.ZodString;
@@ -68,94 +22,16 @@ export declare const acceptedTurnInputSchema: z.ZodReadonly<z.ZodObject<{
     skillCheckpoint: z.ZodOptional<z.ZodReadonly<z.ZodObject<{
         version: z.ZodLiteral<1>;
         kind: z.ZodLiteral<"explicit-skill">;
-    } & {
-        snapshot: z.ZodReadonly<z.ZodObject<Pick<{
-            userPrompt: z.ZodString;
-            skillNames: z.ZodArray<z.ZodString, "many">;
+        snapshot: z.ZodReadonly<z.ZodObject<{
             skills: z.ZodOptional<z.ZodArray<z.ZodReadonly<z.ZodObject<{
                 name: z.ZodString;
                 source: z.ZodString;
                 contentSha256: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                name: string;
-                source: string;
-                contentSha256: string;
-            }, {
-                name: string;
-                source: string;
-                contentSha256: string;
-            }>>, "many">>;
-        }, "skills" | "skillNames">, "strip", z.ZodTypeAny, {
-            skillNames: string[];
-            skills?: Readonly<{
-                name: string;
-                source: string;
-                contentSha256: string;
-            }>[] | undefined;
-        }, {
-            skillNames: string[];
-            skills?: Readonly<{
-                name: string;
-                source: string;
-                contentSha256: string;
-            }>[] | undefined;
-        }>>;
-    }, "strip", z.ZodTypeAny, {
-        kind: "explicit-skill";
-        version: 1;
-        snapshot: Readonly<{
-            skillNames: string[];
-            skills?: Readonly<{
-                name: string;
-                source: string;
-                contentSha256: string;
-            }>[] | undefined;
-        }>;
-    }, {
-        kind: "explicit-skill";
-        version: 1;
-        snapshot: Readonly<{
-            skillNames: string[];
-            skills?: Readonly<{
-                name: string;
-                source: string;
-                contentSha256: string;
-            }>[] | undefined;
-        }>;
-    }>>>;
-}, "strip", z.ZodTypeAny, {
-    createdAt: string;
-    inputId: string;
-    transcriptSequence: number;
-    skillCheckpoint?: Readonly<{
-        kind: "explicit-skill";
-        version: 1;
-        snapshot: Readonly<{
-            skillNames: string[];
-            skills?: Readonly<{
-                name: string;
-                source: string;
-                contentSha256: string;
-            }>[] | undefined;
-        }>;
-    }> | undefined;
-}, {
-    createdAt: string;
-    inputId: string;
-    transcriptSequence: number;
-    skillCheckpoint?: Readonly<{
-        kind: "explicit-skill";
-        version: 1;
-        snapshot: Readonly<{
-            skillNames: string[];
-            skills?: Readonly<{
-                name: string;
-                source: string;
-                contentSha256: string;
-            }>[] | undefined;
-        }>;
-    }> | undefined;
-}>>;
+            }, z.core.$strip>>>>;
+            skillNames: z.ZodArray<z.ZodString>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>>;
 export type AcceptedTurnInput = z.infer<typeof acceptedTurnInputSchema>;
 /** A transient evidence projection only. Never rewrite raw transcript or load Skill bodies. */
 export declare function projectTurnInputSkillCheckpoint(message: ModelMessage, checkpoint: TurnInputSkillCheckpoint | undefined): ModelMessage;

package/dist/store/turn-input.js

@@ -1 +1 @@
-import{z as t}from"zod";import{SKILL_INVOCATION_PARSE_KINDS as n,parseSkillInvocationResult as e}from"@roll-agent/core/skills/invocation";import{explicitSkillCheckpointV1Schema as o}from"../engine/explicit-skill-context.js";export const turnInputIdSchema=t.string().min(1).max(128);export const turnInputSkillCheckpointSchema=o.unwrap().extend({snapshot:o.unwrap().shape.snapshot.unwrap().pick({skillNames:!0,skills:!0}).readonly()}).readonly();export const acceptedTurnInputSchema=t.object({inputId:turnInputIdSchema,transcriptSequence:t.number().int().nonnegative(),createdAt:t.string().datetime(),skillCheckpoint:turnInputSkillCheckpointSchema.optional()}).readonly();export function projectTurnInputSkillCheckpoint(t,o){if(void 0===o||"user"!==t.role)return t;const r="string"==typeof t.content?t.content:t.content.filter(t=>"text"===t.type).map(t=>t.text).join("\n"),i=e(r,o.snapshot.skillNames.map(t=>({name:t,description:"",source:"project"}))),p=i.kind===n.valid?i.invocation.prompt:r;return{...t,providerOptions:{...t.providerOptions,rollHarness:{...t.providerOptions?.rollHarness,explicitSkillCheckpoint:{...o,snapshot:{...o.snapshot,userPrompt:p}}}}}}
+import{z as t}from"zod";import{SKILL_INVOCATION_PARSE_KINDS as n,parseSkillInvocationResult as e}from"../skills/invocation.js";import{explicitSkillCheckpointV1Schema as o}from"../engine/explicit-skill-context.js";export const turnInputIdSchema=t.string().min(1).max(128);export const turnInputSkillCheckpointSchema=o.unwrap().extend({snapshot:o.unwrap().shape.snapshot.unwrap().pick({skillNames:!0,skills:!0}).readonly()}).readonly();export const acceptedTurnInputSchema=t.object({inputId:turnInputIdSchema,transcriptSequence:t.number().int().nonnegative(),createdAt:t.string().datetime(),skillCheckpoint:turnInputSkillCheckpointSchema.optional()}).readonly();export function projectTurnInputSkillCheckpoint(t,o){if(void 0===o||"user"!==t.role)return t;const i="string"==typeof t.content?t.content:t.content.filter(t=>"text"===t.type).map(t=>t.text).join("\n"),r=e(i,o.snapshot.skillNames.map(t=>({name:t,description:"",source:"project"}))),p=r.kind===n.valid?r.invocation.prompt:i;return{...t,providerOptions:{...t.providerOptions,rollHarness:{...t.providerOptions?.rollHarness,explicitSkillCheckpoint:{...o,snapshot:{...o.snapshot,userPrompt:p}}}}}}

package/dist/tool-bridge/bash-tool.d.ts

@@ -36,19 +36,7 @@ declare const bashToolInputSchema: z.ZodObject<{
     workdir: z.ZodOptional<z.ZodString>;
     timeout_ms: z.ZodOptional<z.ZodNumber>;
     max_output_chars: z.ZodOptional<z.ZodNumber>;
-}, "strip", z.ZodTypeAny, {
-    command: string;
-    explanation?: string | undefined;
-    workdir?: string | undefined;
-    timeout_ms?: number | undefined;
-    max_output_chars?: number | undefined;
-}, {
-    command: string;
-    explanation?: string | undefined;
-    workdir?: string | undefined;
-    timeout_ms?: number | undefined;
-    max_output_chars?: number | undefined;
-}>;
+}, z.core.$strip>;
 export type BashToolInput = z.infer<typeof bashToolInputSchema>;
 export declare function buildBashToolset(settings: SessionBashSettings, registry: ToolRegistry, ctx: BashToolContext, deps?: BashToolDeps): ToolSet;
 export {};

package/dist/tool-bridge/build-tools.d.ts

@@ -1,17 +1,17 @@
-import { type JsonSchemaRefIssue } from "@roll-agent/core/tool-runtime/json-schema-refs";
+import { type JsonSchemaRefIssue } from "../tool-contracts/json-schema-refs.ts";
 import { type ToolSet } from "ai";
 import type { FileChangeDiff } from "@roll-agent/protocol";
 import type { ObservationRetentionDeclaration } from "@roll-agent/protocol/observation-retention";
 import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import type { AgentTool } from "@roll-agent/core/types/agent";
+import type { AgentTool } from "../tool-contracts/agent-types.ts";
 import type { SessionApprovalMemory } from "../approval/approval-memory.ts";
 import type { ApprovalDecision } from "../approval/approval-gate.ts";
 import type { ToolAnnotations, ToolPolicy } from "../types/policy.ts";
 import { ToolRegistry, type ToolRouteMetadata } from "./naming.ts";
 import { type NormalizedToolResult } from "./normalize-result.ts";
 import { type ToolExecutionCoordinator, type ToolResourceHint } from "./tool-execution-coordinator.ts";
-export { readExecutionTimeoutMs, ROLL_EXECUTION_TIMEOUT_META_KEY, } from "@roll-agent/core/tool-runtime/execution-timeout";
-export declare const ROLL_RESOURCE_HINTS_META_KEY = "roll/resourceHints";
+export { readExecutionTimeoutMs, ROLL_EXECUTION_TIMEOUT_META_KEY, } from "../tool-contracts/execution-timeout.ts";
+export { ROLL_RESOURCE_HINTS_META_KEY } from "../tool-contracts/resource-hints.ts";
 export interface SourceTool {
     readonly tool: AgentTool;
     readonly annotations: ToolAnnotations | undefined;
@@ -20,7 +20,7 @@ export interface SourceTool {
 }
 export interface AgentToolSource {
     readonly agentName: string;
-    readonly client: Client;
+    readonly client: Pick<Client, "callTool">;
     readonly tools: readonly SourceTool[];
     readonly agentSource?: ToolRouteMetadata["agentSource"];
     readonly transport?: ToolRouteMetadata["transport"];

package/dist/tool-bridge/build-tools.js

@@ -1 +1 @@
-import{lstatSync as o,readdirSync as t,readlinkSync as e,realpathSync as n,statSync as r}from"node:fs";import{inlineAcyclicLocalJsonSchemaReferences as i}from"@roll-agent/core/tool-runtime/json-schema-refs";import{basename as s,dirname as a,isAbsolute as c,resolve as u}from"node:path";import{jsonSchema as l,tool as f}from"ai";import{preflightToolCall as p}from"@roll-agent/core/tool-runtime/preflight";import{readExecutionTimeoutMs as d,ROLL_EXECUTION_TIMEOUT_META_KEY as m}from"@roll-agent/core/tool-runtime/execution-timeout";import{ToolRegistry as v}from"./naming.js";import{TOOL_OUTCOME_KINDS as g,failedToolResult as y,toolResultToModelOutput as h}from"./normalize-result.js";import{TOOL_RESOURCE_ACCESS_MODES as S,TOOL_RESOURCE_HINT_KINDS as b,executeCoordinatedTool as $}from"./tool-execution-coordinator.js";import{executeWithToolApproval as w}from"./tool-approval-continuation.js";import{currentObservationModelOutput as O}from"../engine/observation-projection.js";export{readExecutionTimeoutMs,ROLL_EXECUTION_TIMEOUT_META_KEY}from"@roll-agent/core/tool-runtime/execution-timeout";export const ROLL_RESOURCE_HINTS_META_KEY="roll/resourceHints";function T(o,t){const e=new Map;for(const n of[...o??[],...t])e.set(`${n.path}\0${n.ref}`,n);return[...e.values()]}function C(o){return"object"!=typeof o||null===o||Array.isArray(o)?{}:o}function x(o){return`参数校验失败: ${o.map(o=>o.message).join("; ")}`}function N(o){return!0===o?.readOnlyHint&&!0!==o.destructiveHint?S.read:S.write}function E(o){return"string"==typeof o||"number"==typeof o?[o]:Array.isArray(o)&&0!==o.length&&o.every(o=>"string"==typeof o||"number"==typeof o)?o:void 0}const j=256,k=new Map;function A(o,t){for(let e=0;e<o.length;e+=1){const n=o.charCodeAt(e),r=n>=65&&n<=90?String.fromCharCode(n+32):n>=97&&n<=122?String.fromCharCode(n-32):void 0;if(void 0===r)continue;const i=`${o.slice(0,e)}${r}${o.slice(e+1)}`;if(!t.has(i))return i}}function I(o){return"object"==typeof o&&null!==o&&"code"in o?o.code:void 0}function M(t,e,n){const r=A(e,n);if(void 0!==r)try{const n=o(u(t,e)),i=o(u(t,r));return n.dev===i.dev&&n.ino===i.ino}catch(o){const t=I(o);return"ENOENT"!==t&&"ENOTDIR"!==t&&void 0}}function L(o,t){if(k.size>=j){const o=k.keys().next().value;void 0!==o&&k.delete(o)}return k.set(o,t),t}function R(e){const n=k.get(e);if(void 0!==n)return n;let r;try{r=o(e).dev}catch{return L(e,!0)}let i=e;for(;;){const n=k.get(i);if(void 0!==n)return L(e,n);try{const o=t(i),n=new Set(o);for(const t of o){const o=M(i,t,n);if(void 0!==o)return L(i,o),L(e,o)}}catch{}const s=a(i);if(s===i)break;try{if(o(s).dev!==r)break}catch{break}i=s}return L(e,!0)}function _(o){let t=o.normalize("NFC");for(let o=0;o<8;o+=1){const o=t.toUpperCase().toLowerCase().normalize("NFC");if(o===t)return t;t=o}return t}function D(o,t){try{const e=r(o,{bigint:!0}),n=t.map(o=>_(o));return`file-unresolved-alias:${e.dev.toString()}:${e.ino.toString()}:${JSON.stringify(n)}`}catch{return}}function K(t,r=new Set){let i=t;const c=[];for(;;)try{const o=n.native(i),t=c.reverse().map(o=>o.normalize("NFC"));if(0===t.length)return{path:o};const e=R(o),r=u(o,...e?t.map(o=>o.toLowerCase()):t),s=e?D(o,t):void 0;return{path:r,...void 0===s?{}:{unresolvedAliasKey:s}}}catch{try{if(o(i).isSymbolicLink()&&!r.has(i)){const o=new Set(r);o.add(i);const t=e(i);return K(u(a(i),t,...[...c].reverse()),o)}}catch{}const n=a(i);if(n===i)return{path:t};c.push(s(i)),i=n}}function z(o){try{const t=r(o,{bigint:!0});return`file-inode:${t.dev.toString()}:${t.ino.toString()}`}catch{return}}function H(o,t,e){const n=String(t).trim();if(0!==n.length)switch(o.kind){case b.file:{if(!c(n)&&void 0===e)return;const o=K(u(e??"/",n)),t=z(o.path);return[`file:${o.path}`,...void 0===o.unresolvedAliasKey?[]:[o.unresolvedAliasKey],...void 0===t?[]:[t]]}case b.browserSession:return[`browser-session:${n}`];case b.conversation:return[`conversation:${n}`];case b.custom:{const t=o.namespace?.trim();return t?[`${t}:${n}`]:void 0}}}function G(o,t,e,n,r){const i=N(n),s=C(e),a=[{key:`agent:${o}`,mode:i}],c=[];for(const o of r??[]){if(!Object.hasOwn(s,o.field))continue;const e=E(s[o.field]);if(void 0===e)return a;for(const n of e){const e=H(o,n,t);if(void 0===e||0===e.length)return a;c.push(...e.map(t=>({key:t,mode:o.mode??i})))}}return 0===c.length?a:[{key:`agent:${o}`,mode:S.read},...c]}export async function gateToolCall(o,t,e,n,r,i){if(!o.policy)return;const s=o.policy.check({agentName:t,toolName:e,input:n,...r?{annotations:r}:{}});if("deny"===s.action)return y(g.policyDenied,"策略拒绝执行"+(s.reason?`: ${s.reason}`:""),s.reason?{reason:s.reason}:{});if("confirm"===s.action){const r=i?.memoryKey;if(void 0!==r&&o.approvalMemory?.isGranted(r))return;const a=await o.requestApproval({agentName:t,toolName:e,input:n,reason:!1===i?.includePolicyReason?void 0:s.reason,...void 0!==i?.explanation?{explanation:i.explanation}:{},...void 0!==i?.diff?{diff:i.diff}:{},...void 0!==i?.fullDiff?{fullDiff:i.fullDiff}:{},...void 0!==r&&void 0!==i?.sessionGrantLabel?{sessionGrantLabel:i.sessionGrantLabel}:{}});if(!a.approved)return y(g.userRejected,"已取消执行"+(a.reason?`: ${a.reason}`:""),a.reason?{reason:a.reason}:{});void 0!==r&&"session"===a.scope&&o.approvalMemory?.grant(r)}}export function buildAgentToolset(o,t,e=new v){const n={},r={},s=new Map;for(const a of o){const{client:o,agentName:c,agentSource:u,transport:v,runtimeOwnership:S,resourceBaseDir:b}=a;for(const{tool:N,annotations:E,resourceHints:j,observationRetention:k}of a.tools){const a=i(N.inputSchema),A=T(N.schemaIssues,a.unresolved),I={...N,inputSchema:a.schema,...A.length>0?{schemaIssues:A}:{}},M=e.register(c,I.name,{...u?{agentSource:u}:{},...v?{transport:v}:{},...S?{runtimeOwnership:S}:{},...E?{annotations:E}:{},...I.appOutput?{appOutput:I.appOutput}:{}});A.length>0&&(r[M]=A),k&&s.set(M,k);const L={prepare:async o=>{const e=C(o),n=p(I,e);return n.ok?gateToolCall(t,c,I.name,e,E):y(g.invalidInput,x(n.issues),{raw:n.issues})},resources:o=>G(c,b,o,E,j)};t.coordinator?.register(M,L),n[M]=f({description:I.description??`${I.name} (via ${c})`,inputSchema:l(I.inputSchema),toModelOutput:({output:o})=>o.outcome.kind===g.success?O(o.raw,k)??h(o):h(o),execute:async(e,n)=>{const r=C(e);return $(t.coordinator,L,M,n.toolCallId,r,n.abortSignal,async()=>{const e=d({[m]:I.executionTimeoutMs}),i=n.abortSignal||void 0!==e?{...n.abortSignal?{signal:n.abortSignal}:{},...void 0===e?{}:{timeout:e}}:void 0;return w({input:r,agentName:c,agentTool:I,annotations:E,ctx:t,signal:n.abortSignal,call:async t=>await o.callTool({name:I.name,arguments:t},void 0,i)})})}})}}return{tools:n,registry:e,schemaIssuesByToolId:r,observationRetentionByToolId:s}}
+import{lstatSync as o,readdirSync as t,readlinkSync as e,realpathSync as n,statSync as r}from"node:fs";import{inlineAcyclicLocalJsonSchemaReferences as i}from"../tool-contracts/json-schema-refs.js";import{basename as s,dirname as a,isAbsolute as c,resolve as u}from"node:path";import{jsonSchema as l,tool as f}from"ai";import{preflightToolCall as p}from"../tool-contracts/preflight.js";import{modelToolInputSchema as d}from"./model-input-schema.js";import{readExecutionTimeoutMs as m,ROLL_EXECUTION_TIMEOUT_META_KEY as v}from"../tool-contracts/execution-timeout.js";import{ToolRegistry as g}from"./naming.js";import{TOOL_OUTCOME_KINDS as h,failedToolResult as y,toolResultToModelOutput as S}from"./normalize-result.js";import{TOOL_RESOURCE_ACCESS_MODES as b,TOOL_RESOURCE_HINT_KINDS as $,executeCoordinatedTool as w}from"./tool-execution-coordinator.js";import{executeWithToolApproval as j}from"./tool-approval-continuation.js";import{currentObservationModelOutput as O}from"../engine/observation-projection.js";export{readExecutionTimeoutMs,ROLL_EXECUTION_TIMEOUT_META_KEY}from"../tool-contracts/execution-timeout.js";export{ROLL_RESOURCE_HINTS_META_KEY}from"../tool-contracts/resource-hints.js";function T(o,t){const e=new Map;for(const n of[...o??[],...t])e.set(`${n.path}\0${n.ref}`,n);return[...e.values()]}function C(o){return"object"!=typeof o||null===o||Array.isArray(o)?{}:o}function x(o){return`参数校验失败: ${o.map(o=>o.message).join("; ")}`}function N(o){return!0===o?.readOnlyHint&&!0!==o.destructiveHint?b.read:b.write}function E(o){return"string"==typeof o||"number"==typeof o?[o]:Array.isArray(o)&&0!==o.length&&o.every(o=>"string"==typeof o||"number"==typeof o)?o:void 0}const k=256,A=new Map;function I(o,t){for(let e=0;e<o.length;e+=1){const n=o.charCodeAt(e),r=n>=65&&n<=90?String.fromCharCode(n+32):n>=97&&n<=122?String.fromCharCode(n-32):void 0;if(void 0===r)continue;const i=`${o.slice(0,e)}${r}${o.slice(e+1)}`;if(!t.has(i))return i}}function M(o){return"object"==typeof o&&null!==o&&"code"in o?o.code:void 0}function L(t,e,n){const r=I(e,n);if(void 0!==r)try{const n=o(u(t,e)),i=o(u(t,r));return n.dev===i.dev&&n.ino===i.ino}catch(o){const t=M(o);return"ENOENT"!==t&&"ENOTDIR"!==t&&void 0}}function R(o,t){if(A.size>=k){const o=A.keys().next().value;void 0!==o&&A.delete(o)}return A.set(o,t),t}function _(e){const n=A.get(e);if(void 0!==n)return n;let r;try{r=o(e).dev}catch{return R(e,!0)}let i=e;for(;;){const n=A.get(i);if(void 0!==n)return R(e,n);try{const o=t(i),n=new Set(o);for(const t of o){const o=L(i,t,n);if(void 0!==o)return R(i,o),R(e,o)}}catch{}const s=a(i);if(s===i)break;try{if(o(s).dev!==r)break}catch{break}i=s}return R(e,!0)}function D(o){let t=o.normalize("NFC");for(let o=0;o<8;o+=1){const o=t.toUpperCase().toLowerCase().normalize("NFC");if(o===t)return t;t=o}return t}function K(o,t){try{const e=r(o,{bigint:!0}),n=t.map(o=>D(o));return`file-unresolved-alias:${e.dev.toString()}:${e.ino.toString()}:${JSON.stringify(n)}`}catch{return}}function z(t,r=new Set){let i=t;const c=[];for(;;)try{const o=n.native(i),t=c.reverse().map(o=>o.normalize("NFC"));if(0===t.length)return{path:o};const e=_(o),r=u(o,...e?t.map(o=>o.toLowerCase()):t),s=e?K(o,t):void 0;return{path:r,...void 0===s?{}:{unresolvedAliasKey:s}}}catch{try{if(o(i).isSymbolicLink()&&!r.has(i)){const o=new Set(r);o.add(i);const t=e(i);return z(u(a(i),t,...[...c].reverse()),o)}}catch{}const n=a(i);if(n===i)return{path:t};c.push(s(i)),i=n}}function G(o){try{const t=r(o,{bigint:!0});return`file-inode:${t.dev.toString()}:${t.ino.toString()}`}catch{return}}function H(o,t,e){const n=String(t).trim();if(0!==n.length)switch(o.kind){case $.file:{if(!c(n)&&void 0===e)return;const o=z(u(e??"/",n)),t=G(o.path);return[`file:${o.path}`,...void 0===o.unresolvedAliasKey?[]:[o.unresolvedAliasKey],...void 0===t?[]:[t]]}case $.browserSession:return[`browser-session:${n}`];case $.conversation:return[`conversation:${n}`];case $.custom:{const t=o.namespace?.trim();return t?[`${t}:${n}`]:void 0}}}function U(o,t,e,n,r){const i=N(n),s=C(e),a=[{key:`agent:${o}`,mode:i}],c=[];for(const o of r??[]){if(!Object.hasOwn(s,o.field))continue;const e=E(s[o.field]);if(void 0===e)return a;for(const n of e){const e=H(o,n,t);if(void 0===e||0===e.length)return a;c.push(...e.map(t=>({key:t,mode:o.mode??i})))}}return 0===c.length?a:[{key:`agent:${o}`,mode:b.read},...c]}export async function gateToolCall(o,t,e,n,r,i){if(!o.policy)return;const s=o.policy.check({agentName:t,toolName:e,input:n,...r?{annotations:r}:{}});if("deny"===s.action)return y(h.policyDenied,"策略拒绝执行"+(s.reason?`: ${s.reason}`:""),s.reason?{reason:s.reason}:{});if("confirm"===s.action){const r=i?.memoryKey;if(void 0!==r&&o.approvalMemory?.isGranted(r))return;const a=await o.requestApproval({agentName:t,toolName:e,input:n,reason:!1===i?.includePolicyReason?void 0:s.reason,...void 0!==i?.explanation?{explanation:i.explanation}:{},...void 0!==i?.diff?{diff:i.diff}:{},...void 0!==i?.fullDiff?{fullDiff:i.fullDiff}:{},...void 0!==r&&void 0!==i?.sessionGrantLabel?{sessionGrantLabel:i.sessionGrantLabel}:{}});if(!a.approved)return y(h.userRejected,"已取消执行"+(a.reason?`: ${a.reason}`:""),a.reason?{reason:a.reason}:{});void 0!==r&&"session"===a.scope&&o.approvalMemory?.grant(r)}}export function buildAgentToolset(o,t,e=new g){const n={},r={},s=new Map;for(const a of o){const{client:o,agentName:c,agentSource:u,transport:g,runtimeOwnership:b,resourceBaseDir:$}=a;for(const{tool:N,annotations:E,resourceHints:k,observationRetention:A}of a.tools){const a=i(N.inputSchema),I=T(N.schemaIssues,a.unresolved),M={...N,inputSchema:a.schema,...I.length>0?{schemaIssues:I}:{}},L=e.register(c,M.name,{...u?{agentSource:u}:{},...g?{transport:g}:{},...b?{runtimeOwnership:b}:{},...E?{annotations:E}:{},...M.appOutput?{appOutput:M.appOutput}:{}});I.length>0&&(r[L]=I),A&&s.set(L,A);const R={prepare:async o=>{const e=C(o),n=p(M,e);return n.ok?gateToolCall(t,c,M.name,e,E):y(h.invalidInput,x(n.issues),{raw:n.issues})},resources:o=>U(c,$,o,E,k)};t.coordinator?.register(L,R),n[L]=f({description:M.description??`${M.name} (via ${c})`,inputSchema:d(l(M.inputSchema)),toModelOutput:({output:o})=>o.outcome.kind===h.success?O(o.raw,A)??S(o):S(o),execute:async(e,n)=>{const r=C(e);return w(t.coordinator,R,L,n.toolCallId,r,n.abortSignal,async()=>{const e=m({[v]:M.executionTimeoutMs}),i=n.abortSignal||void 0!==e?{...n.abortSignal?{signal:n.abortSignal}:{},...void 0===e?{}:{timeout:e}}:void 0;return j({input:r,agentName:c,agentTool:M,annotations:E,ctx:t,signal:n.abortSignal,call:async t=>await o.callTool({name:M.name,arguments:t},void 0,i)})})}})}}return{tools:n,registry:e,schemaIssuesByToolId:r,observationRetentionByToolId:s}}