@rowan-agent/agent 0.9.1 → 0.9.3

package/dist/index.d.ts

@@ -611,6 +611,8 @@ type AgentDefinition = Readonly<{
     prompt: string;
     tools?: readonly string[];
     skills?: readonly string[];
+    /** Host-supplied Skills private to this Agent Definition/Bundle. */
+    bundledSkills?: readonly Skill[];
     phases?: PhaseRegistrySelection;
     contexts?: readonly string[];
     model?: ModelRef;
@@ -787,6 +789,7 @@ type UserMessage = MessageBase & Readonly<{
 type AssistantMessage = MessageBase & Readonly<{
     role: "assistant";
     content: AssistantContent;
+    interrupted?: boolean;
 }>;
 type ToolMessage = MessageBase & Readonly<{
     role: "tool";
@@ -1340,6 +1343,11 @@ type AgentRecord = Readonly<{
     activatedAt?: string;
     updatedAt: string;
 }>;
+type AgentDeletionRequest = Readonly<{
+    agentId: AgentId;
+    expectedRunIds: readonly RunId[];
+    confirmation: "conversation-delete-v1";
+}>;
 type ExecutionToken = Readonly<{
     runId: RunId;
     ownerEpoch: number;
@@ -1520,6 +1528,7 @@ interface OwnedStore {
         configIdentity?: string;
         idempotencyKey: string;
     }): Promise<AgentRecord>;
+    deleteAgent(input: AgentDeletionRequest): Promise<void>;
     createRun(input: {
         agentId: AgentId;
         input: UserInput;
@@ -1598,6 +1607,7 @@ interface OwnedStore {
         runId: RunId;
         expectedRevision?: number;
         reason?: string;
+        output?: AssistantMessage;
     }): Promise<RunRecord>;
     snapshotRun(runId: RunId): Promise<RunSnapshot>;
     listAgents(): Promise<readonly AgentRecord[]>;
@@ -1668,6 +1678,7 @@ interface AgentRuntime$1 {
     updateAgentConfig(agentId: AgentId, config: AgentConfigRequest, options: {
         idempotencyKey: string;
     }): Promise<void>;
+    deleteAgent(input: AgentDeletionRequest): Promise<void>;
     start(agentId: AgentId, input: UserInput, options: {
         idempotencyKey: string;
         metadata?: Metadata;
@@ -1704,6 +1715,9 @@ declare class AgentRuntime implements AgentRuntime$1 {
     private readonly storeIncarnation;
     private readonly activeAgents;
     private readonly executions;
+    private readonly executionDone;
+    private readonly cancellationRequested;
+    private readonly cancellationReasons;
     private readonly consumers;
     private readonly transientEvents;
     private readonly resources;
@@ -1730,6 +1744,7 @@ declare class AgentRuntime implements AgentRuntime$1 {
     updateAgentConfig(agentId: AgentId, config: AgentConfigRequest, options: {
         idempotencyKey: string;
     }): Promise<void>;
+    deleteAgent(input: AgentDeletionRequest): Promise<void>;
     start(agentId: AgentId, input: UserInput, options: {
         idempotencyKey: string;
         metadata?: Metadata;
@@ -1838,6 +1853,7 @@ declare class InMemoryStore implements DurableStore {
         configIdentity?: string;
         idempotencyKey: string;
     }): AgentRecord;
+    deleteAgent(lease: OwnerLease, input: AgentDeletionRequest): void;
     createRun(lease: OwnerLease, input: {
         agentId: AgentId;
         input: UserInput;
@@ -1923,6 +1939,7 @@ declare class InMemoryStore implements DurableStore {
         runId: RunId;
         expectedRevision?: number;
         reason?: string;
+        output?: AssistantMessage;
     }): RunRecord;
     snapshotRun(lease: OwnerLease, runId: RunId): RunSnapshot;
     listAgents(lease: OwnerLease): readonly AgentRecord[];
@@ -1985,6 +2002,7 @@ declare class SqliteStore implements DurableStore {
         configIdentity?: string;
         idempotencyKey: string;
     }): Promise<AgentRecord>;
+    deleteAgent(lease: OwnerLease, input: AgentDeletionRequest): Promise<void>;
     createRun(lease: OwnerLease, input: {
         agentId: AgentId;
         input: UserInput;
@@ -2070,6 +2088,7 @@ declare class SqliteStore implements DurableStore {
         runId: RunId;
         expectedRevision?: number;
         reason?: string;
+        output?: AssistantMessage;
     }): Promise<RunRecord>;
     snapshotRun(lease: OwnerLease, runId: RunId): Promise<RunSnapshot>;
     listAgents(lease: OwnerLease): Promise<readonly AgentRecord[]>;

package/dist/index.js

@@ -1046,6 +1046,7 @@ function assertAgentDefinition(value) {
   requiredString(value.prompt, "definition.prompt");
   optionalStringList(value.tools, "definition.tools");
   optionalStringList(value.skills, "definition.skills");
+  optionalBundledSkills(value.bundledSkills, "definition.bundledSkills");
   optionalPhaseRegistrySelection(value.phases, "definition.phases");
   optionalStringList(value.contexts, "definition.contexts");
   if ("extensions" in value) throw new TypeError("definition.extensions is not supported; Extensions are Runtime-global");
@@ -1117,6 +1118,19 @@ function optionalStringList(value, field) {
   }
   return names;
 }
+function optionalBundledSkills(value, field) {
+  if (value === void 0) return;
+  if (!Array.isArray(value)) throw new TypeError(`${field} must be an array of Skills`);
+  const names = /* @__PURE__ */ new Set();
+  for (const [index, item] of value.entries()) {
+    if (!isRecord(item) || typeof item.name !== "string" || item.name.trim() === "" || typeof item.description !== "string" || typeof item.filePath !== "string" || typeof item.baseDir !== "string" || typeof item.content !== "string" || typeof item.disableModelInvocation !== "boolean") {
+      throw new TypeError(`${field}[${index}] is invalid`);
+    }
+    if (names.has(item.name)) throw new TypeError(`Duplicate bundled Skill "${item.name}".`);
+    names.add(item.name);
+  }
+  return value;
+}
 function optionalPhaseRegistrySelection(value, field) {
   if (value === void 0) return void 0;
   if (!isRecord(value)) throw new TypeError(`${field} must be an object`);
@@ -1511,6 +1525,13 @@ function selectNamedResources(candidates, names, kind) {
   }
   return selected;
 }
+function mergeSkills(...layers) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const layer of layers) {
+    for (const skill of layer ?? []) byName.set(skill.name, skill);
+  }
+  return [...byName.values()];
+}
 
 // src/harness/context/system-prompt.ts
 function buildSystemPrompt(options) {
@@ -2040,7 +2061,7 @@ async function runPhaseLoop(config, state, registry) {
     const toolExecutionManager = createToolExecutionManager();
     const execution = createPhaseExecution(config, state, phase, messageManager, toolExecutionManager, registry);
     const phaseTools = selectPhaseTools(allTools, phase.tools);
-    const phaseSkills = phase.name === DEFAULT_PHASE_ID ? config.context.skills : phase.skills ?? [];
+    const phaseSkills = mergeSkills(config.context.skills, phase.skills);
     let phaseContext = {
       systemPrompt: config.context.systemPrompt,
       messages: messageManager.visible(),
@@ -2531,7 +2552,7 @@ async function executeParallelPhase(config, state, registry, phase, payload, con
   const messages = [...context];
   const allTools = buildToolsWithRouting(config, availablePhases);
   const phaseTools = selectPhaseTools(allTools, phase.tools);
-  const phaseSkills = phase.name === DEFAULT_PHASE_ID ? config.context.skills : phase.skills ?? [];
+  const phaseSkills = mergeSkills(config.context.skills, phase.skills);
   const systemPrompt = config.context.systemPrompt;
   const phaseContext = {
     systemPrompt,
@@ -2858,6 +2879,14 @@ function isImage(value) {
 function isUserContent(value) {
   return typeof value === "string" || Array.isArray(value) && value.every((part) => isText(part) || isImage(part));
 }
+function isAssistantContent(value) {
+  return typeof value === "string" || Array.isArray(value) && value.every((part) => {
+    if (isText(part)) return true;
+    if (!isRecord3(part)) return false;
+    if (part.type === "thinking") return typeof part.thinking === "string" && (part.signature === void 0 || typeof part.signature === "string");
+    return part.type === "tool_use" && typeof part.toolCallId === "string" && typeof part.name === "string" && isJsonValue(part.input);
+  });
+}
 function normalizeUserInput(input) {
   const normalized = typeof input === "string" ? { content: input } : input;
   if (!isRecord3(normalized) || !hasOnlyKeys(normalized, ["content", "metadata"]) || !isUserContent(normalized.content)) throw new TypeError("input must contain only valid UserContent");
@@ -2865,6 +2894,9 @@ function normalizeUserInput(input) {
   assertJsonValue(normalized, "input");
   return normalized;
 }
+function isAssistantMessage(value) {
+  return isRecord3(value) && hasOnlyKeys(value, ["id", "agentId", "runId", "role", "content", "metadata", "sequenceWithinRun", "createdAt", "interrupted"]) && typeof value.id === "string" && typeof value.agentId === "string" && typeof value.runId === "string" && value.role === "assistant" && Number.isInteger(value.sequenceWithinRun) && value.sequenceWithinRun >= 0 && typeof value.createdAt === "string" && isAssistantContent(value.content) && (value.metadata === void 0 || isMetadata(value.metadata)) && (value.interrupted === void 0 || typeof value.interrupted === "boolean");
+}
 function isToolResult(value) {
   if (!isRecord3(value) || !isJsonValue(value.content) || typeof value.ok !== "boolean") return false;
   const expected = value.ok ? ["content", "ok"] : ["content", "error", "ok"];
@@ -3013,6 +3045,9 @@ function snapshotConfig(config) {
     ...config.definition,
     ...config.definition.tools ? { tools: Object.freeze([...config.definition.tools]) } : {},
     ...config.definition.skills ? { skills: Object.freeze([...config.definition.skills]) } : {},
+    ...config.definition.bundledSkills ? {
+      bundledSkills: Object.freeze(config.definition.bundledSkills.map((skill) => Object.freeze({ ...skill })))
+    } : {},
     ...config.definition.phases ? {
       phases: Object.freeze({
         entryPhaseId: config.definition.phases.entryPhaseId,
@@ -3378,18 +3413,23 @@ function projectModelContext(input) {
     ...input.context.phases ? { phases: input.context.phases } : {}
   };
 }
-function projectAssistantMessage(message, agentId, runId, sequenceWithinRun) {
+function projectAssistantMessage(message, agentId, runId, sequenceWithinRun, options = {}) {
   return {
     id: message.id,
     agentId,
     runId,
     role: "assistant",
-    content: durableAssistantContent(message.content),
+    content: options.interrupted ? durableInterruptedAssistantContent(message.content) : durableAssistantContent(message.content),
     sequenceWithinRun,
     createdAt: message.createdAt,
-    ...message.metadata ? { metadata: message.metadata } : {}
+    ...message.metadata ? { metadata: message.metadata } : {},
+    ...options.interrupted ? { interrupted: true } : {}
   };
 }
+function durableInterruptedAssistantContent(content) {
+  if (typeof content === "string") return content;
+  return content.filter((part) => part.type === "text").map((part) => ({ type: "text", text: part.text }));
+}
 function projectMessage(message) {
   switch (message.role) {
     case "user":
@@ -3491,10 +3531,9 @@ function resolveDefinitionContext(config, assembled = {}) {
     config.definition.tools,
     "Tool"
   );
-  const skills = selectNamedResources(
-    config.resources.skills,
-    config.definition.skills,
-    "Skill"
+  const skills = mergeSkills(
+    selectNamedResources(config.resources.skills, config.definition.skills, "Skill"),
+    config.definition.bundledSkills
   );
   const contexts = selectNamedResources(
     config.resources.contexts ?? [],
@@ -4688,6 +4727,13 @@ var ResourceRegistry = class {
   }
 };
 function snapshotResourceValue(kind, value) {
+  if (kind === "agent") {
+    const agent = value;
+    return Object.freeze({
+      ...agent,
+      ...agent.bundledSkills ? { bundledSkills: Object.freeze(agent.bundledSkills.map((skill) => Object.freeze({ ...skill }))) } : {}
+    });
+  }
   if (kind !== "phase") return value;
   const phase = value;
   const snapshot = {
@@ -4961,7 +5007,10 @@ function resolveConfigurationSnapshot(registry, input) {
   const layer = input.definition.layer;
   const definition = applyDefinitionLayer(base, layer);
   const tools = selectNamedResources(resolved.tools, definition.tools, "Tool");
-  const skills = selectNamedResources(resolved.skills, definition.skills, "Skill");
+  const skills = mergeSkills(
+    selectNamedResources(resolved.skills, definition.skills, "Skill"),
+    definition.bundledSkills
+  );
   const phases = resolvePhases(resolved.phases, definition.phases);
   const contexts = selectNamedResources(input.contexts ?? [], base.contexts, "Context");
   return {
@@ -5070,6 +5119,9 @@ var AgentRuntime = class _AgentRuntime {
   storeIncarnation;
   activeAgents = /* @__PURE__ */ new Set();
   executions = /* @__PURE__ */ new Map();
+  executionDone = /* @__PURE__ */ new Map();
+  cancellationRequested = /* @__PURE__ */ new Set();
+  cancellationReasons = /* @__PURE__ */ new Map();
   consumers = /* @__PURE__ */ new Map();
   transientEvents = new TransientRunEventHub();
   resources;
@@ -5134,6 +5186,16 @@ var AgentRuntime = class _AgentRuntime {
     this.assertOpen();
     await this.commands.updateAgentConfig({ agentId, config, idempotencyKey: options.idempotencyKey });
   }
+  async deleteAgent(input) {
+    this.assertOpen();
+    const runs = await this.owned.listRuns({ agentId: input.agentId });
+    for (const run of runs) {
+      if (["queued", "running", "input_required"].includes(run.state)) {
+        await this.cancel(run.id, "Conversation deleted.");
+      }
+    }
+    await this.owned.deleteAgent(input);
+  }
   async start(agentId, input, options) {
     this.assertOpen();
     const agent = await this.requireAgent(agentId);
@@ -5198,6 +5260,14 @@ var AgentRuntime = class _AgentRuntime {
   }
   async cancel(runId, reason) {
     this.assertOpen();
+    const done = this.executionDone.get(runId);
+    if (done) {
+      this.cancellationRequested.add(runId);
+      this.cancellationReasons.set(runId, reason ?? "Agent run stopped.");
+      this.executions.get(runId)?.controller.abort();
+      await done;
+      return boundaryFromSnapshot(await this.owned.snapshotRun(runId));
+    }
     const snapshot = await this.owned.snapshotRun(runId);
     await this.owned.cancelRun({ runId, expectedRevision: snapshot.revision, ...reason === void 0 ? {} : { reason } });
     const active = this.executions.get(runId);
@@ -5219,8 +5289,12 @@ var AgentRuntime = class _AgentRuntime {
           if (execution) this.transientEvents.clear(next.id, execution.executionId);
           this.activeAgents.delete(next.agentId);
           this.executions.delete(next.id);
+          this.cancellationRequested.delete(next.id);
+          this.cancellationReasons.delete(next.id);
+          this.executionDone.delete(next.id);
           void this.pump();
         });
+        this.executionDone.set(next.id, task);
         void task;
       }
     } catch (error) {
@@ -5278,6 +5352,7 @@ var AgentRuntime = class _AgentRuntime {
       executionRevision = claim.run.revision;
       const controller = new AbortController();
       this.executions.set(run.id, { controller, executionId });
+      if (this.cancellationRequested.has(run.id)) controller.abort();
       const config = resolvedConfig;
       const assembly = assembleRegisteredExtensions(config, this.resources.extensionRunner);
       let toolQueue = Promise.resolve();
@@ -5366,6 +5441,18 @@ var AgentRuntime = class _AgentRuntime {
           }
         }
       });
+      if (this.cancellationRequested.has(run.id) || controller.signal.aborted) {
+        const output = latestAssistant(run, result.messages, claim.history.length, true);
+        const reason = this.cancellationReasons.get(run.id) ?? "Agent run stopped.";
+        await this.owned.cancelRun({
+          runId: run.id,
+          expectedRevision: executionRevision,
+          reason,
+          ...output && hasVisibleAssistantText(output) ? { output } : {}
+        });
+        this.transientEvents.clear(run.id, claim.execution.executionId);
+        return;
+      }
       if (result.type === "input_required") {
         const prompt = promptMessage(run, result.request.prompt, result.messages.length);
         await this.owned.commitInputRequired({ runId: run.id, execution: claim.execution, expectedRevision: executionRevision, requestId: createId("input"), phase: result.request.phase, prompt, checkpoint: result.checkpoint });
@@ -5384,6 +5471,14 @@ var AgentRuntime = class _AgentRuntime {
     } catch (error) {
       if (!claim && error instanceof RuntimeError && ["run_state_conflict", "runtime_ownership_lost", "run_not_found"].includes(error.code)) return;
       if (claim) {
+        if (this.cancellationRequested.has(run.id)) {
+          await this.owned.cancelRun({
+            runId: run.id,
+            expectedRevision: executionRevision,
+            reason: this.cancellationReasons.get(run.id) ?? "Agent run stopped."
+          }).catch(() => void 0);
+          return;
+        }
         await this.owned.commitOutcome({
           runId: run.id,
           execution: claim.execution,
@@ -5630,10 +5725,13 @@ var DurableRun = class {
 function promptMessage(run, prompt, sequence) {
   return { id: createId("msg"), agentId: run.agentId, runId: run.id, role: "assistant", content: prompt, sequenceWithinRun: sequence, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
-function latestAssistant(run, messages, sequence) {
+function latestAssistant(run, messages, sequence, interrupted = false) {
   const message = [...messages].reverse().find((candidate) => candidate.role === "assistant");
   if (!message) return void 0;
-  return projectAssistantMessage(message, run.agentId, run.id, sequence);
+  return projectAssistantMessage(message, run.agentId, run.id, sequence, { interrupted });
+}
+function hasVisibleAssistantText(message) {
+  return typeof message.content === "string" ? message.content.length > 0 : message.content.some((part) => part.type === "text" && part.text.length > 0);
 }
 function durableOutcome(outcome) {
   return {
@@ -5857,6 +5955,43 @@ var InMemoryStore = class _InMemoryStore {
     this.writeReceipt(scope, payload, agent);
     return clone(agent);
   }
+  deleteAgent(lease, input) {
+    this.assertOwner(lease);
+    if (input.confirmation !== "conversation-delete-v1") {
+      throw new TypeError("Agent deletion requires the conversation deletion confirmation token");
+    }
+    const agent = this.requireAgent(input.agentId);
+    const runs = [...this.runs.values()].filter((run) => run.agentId === agent.id);
+    const expected = new Set(input.expectedRunIds.map(String));
+    const actual = new Set(runs.map((run) => String(run.id)));
+    if (expected.size !== actual.size || [...actual].some((runId) => !expected.has(runId))) {
+      throw new RuntimeError("run_state_conflict", {
+        runId: runs[0]?.id ?? input.expectedRunIds[0] ?? "unknown",
+        expected: [],
+        actual: "cancelled"
+      });
+    }
+    const runIds = new Set(runs.map((run) => run.id));
+    this.agents.delete(agent.id);
+    this.nextAgentSequence.delete(agent.id);
+    this.nextReadySequence.delete(agent.id);
+    for (const run of runs) this.runs.delete(run.id);
+    for (const [messageId, message] of this.messages) {
+      if (runIds.has(message.runId)) this.messages.delete(messageId);
+    }
+    for (const [toolCallId, toolCall] of this.toolCalls) {
+      if (runIds.has(toolCall.runId)) this.toolCalls.delete(toolCallId);
+    }
+    for (let index = this.events.length - 1; index >= 0; index -= 1) {
+      if (this.events[index].agentId === agent.id) this.events.splice(index, 1);
+    }
+    for (const [key] of this.idempotency) {
+      if (key.includes(String(agent.id)) || [...runIds].some((runId) => key.includes(String(runId)))) this.idempotency.delete(key);
+    }
+    for (const [key] of this.operationReceipts) {
+      if (key.includes(String(agent.id)) || [...runIds].some((runId) => key.includes(String(runId)))) this.operationReceipts.delete(key);
+    }
+  }
   createRun(lease, input) {
     this.assertOwner(lease);
     this.requireAgent(input.agentId);
@@ -6225,11 +6360,16 @@ var InMemoryStore = class _InMemoryStore {
   cancelRun(lease, input) {
     this.assertOwner(lease);
     const operationKey = `cancel:${input.runId}:${input.expectedRevision ?? "current"}`;
-    const operationPayload = canonicalJson(input.reason ?? null);
+    const operationPayload = canonicalJson([input.reason ?? null, input.output ?? null]);
     const replay = this.replayOperation(operationKey, operationPayload);
     if (replay) return clone(replay);
     const run = this.requireRun(input.runId);
     if (input.expectedRevision !== void 0) this.assertRevision(run, input.expectedRevision);
+    if (input.output !== void 0) {
+      if (!isAssistantMessage(input.output) || input.output.agentId !== run.agentId || input.output.runId !== run.id || input.output.interrupted !== true) {
+        throw new TypeError("cancelled output must be an interrupted AssistantMessage from this Run");
+      }
+    }
     if (["completed", "failed", "cancelled"].includes(run.state)) {
       const result2 = clone(run);
       if (input.expectedRevision !== void 0) this.writeOperationReceipt(operationKey, operationPayload, result2);
@@ -6239,6 +6379,11 @@ var InMemoryStore = class _InMemoryStore {
     const activeToolCalls = run.execution ? [...this.toolCalls.values()].filter((toolCall) => toolCall.runId === run.id && toolCall.executionId === run.execution?.executionId && (toolCall.state === "pending" || toolCall.state === "running")) : [];
     const indeterminateToolCallIds = activeToolCalls.filter((toolCall) => toolCall.state === "running").map((toolCall) => toolCall.id);
     for (const toolCall of activeToolCalls) this.interruptToolCall(run, toolCall, input.reason ?? "The Run was cancelled.");
+    if (input.output && (typeof input.output.content === "string" ? input.output.content.length > 0 : input.output.content.length > 0)) {
+      const output = { ...clone(input.output), sequenceWithinRun: this.nextMessageSequence(run.id) };
+      this.messages.set(output.id, output);
+      this.appendMessage(run, output);
+    }
     if (indeterminateToolCallIds.length > 0) {
       const failure = {
         code: "tool_indeterminate",
@@ -6502,6 +6647,9 @@ var MemoryOwnedStore = class {
   async updateAgentConfigToken(input) {
     return this.store.updateAgentConfigToken(this.lease, input);
   }
+  async deleteAgent(input) {
+    this.store.deleteAgent(this.lease, input);
+  }
   async createRun(input) {
     return this.store.createRun(this.lease, input);
   }
@@ -6758,6 +6906,9 @@ var SqliteStore = class {
   async updateAgentConfigToken(lease, input) {
     return this.invoke(lease, (store, current) => store.updateAgentConfigToken(current, input));
   }
+  async deleteAgent(lease, input) {
+    return this.invoke(lease, (store, current) => store.deleteAgent(current, input));
+  }
   async createRun(lease, input) {
     return this.invoke(lease, (store, current) => store.createRun(current, input));
   }
@@ -6819,9 +6970,9 @@ var SqliteStore = class {
         if (after === waterline) return [];
       }
       const rows = this.database.query(
-        "SELECT payload_json FROM run_events ORDER BY sequence LIMIT -1 OFFSET ?"
-      ).all(after);
-      return rows.map((row) => JSON.parse(row.payload_json));
+        "SELECT payload_json FROM run_events ORDER BY sequence"
+      ).all();
+      return rows.map((row) => JSON.parse(row.payload_json)).filter((event) => parseEventCursor(lease, event.cursor) > after);
     });
   }
   async openConsumer(lease, consumerId) {
@@ -7045,6 +7196,9 @@ var SqliteOwnedStore = class {
   updateAgentConfigToken(input) {
     return this.store.updateAgentConfigToken(this.lease, input);
   }
+  deleteAgent(input) {
+    return this.store.deleteAgent(this.lease, input);
+  }
   createRun(input) {
     return this.store.createRun(this.lease, input);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "license": "MIT",
   "repository": {
     "type": "git",