@rowan-agent/agent 0.9.12 → 0.9.14

package/dist/index.d.ts

@@ -1380,7 +1380,7 @@ type AgentConfiguration = Readonly<{
     }>;
     resourceView: ResourceView;
     contexts?: readonly ContextCandidate[];
-    /** Trusted Host-owned Contexts appended after Definition selection. */
+    /** Trusted Host-owned Contexts rendered as durable user messages. */
     additionalContexts?: readonly ContextCandidate[];
     cwd?: string;
     maxAttempts?: number;
@@ -1398,6 +1398,7 @@ type ConfigurationSnapshot = Readonly<{
         refs: Readonly<Record<ResourceKind, readonly ResourceRef[]>>;
     }>;
     contexts: readonly ContextCandidate[];
+    additionalContexts: readonly ContextCandidate[];
     resourceView: ResourceView;
     cwd?: string;
     maxAttempts?: number;
@@ -1506,6 +1507,8 @@ type AgentConfig = Readonly<{
     identity: string;
     definition: AgentDefinition;
     resources: AgentResources;
+    /** Host-owned Contexts are rendered as durable user messages for a Run. */
+    additionalContexts?: readonly ContextCandidate[];
     cwd?: string;
     maxAttempts?: number;
     beforeToolCall?: BeforeToolCall;
@@ -1770,6 +1773,7 @@ interface OwnedStore {
         executionId?: ExecutionId;
         messageId?: MessageId;
         configToken?: ConfigToken;
+        inputContext?: UserInput;
     }): Promise<RunClaim>;
     failQueuedRun(input: {
         runId: RunId;
@@ -2184,6 +2188,7 @@ declare class InMemoryStore implements DurableStore {
         executionId?: ExecutionId;
         messageId?: MessageId;
         configToken?: ConfigToken;
+        inputContext?: UserInput;
     }): RunClaim;
     failQueuedRun(lease: OwnerLease, input: {
         runId: RunId;
@@ -2367,6 +2372,7 @@ declare class SqliteStore implements DurableStore {
         executionId?: ExecutionId;
         messageId?: MessageId;
         configToken?: ConfigToken;
+        inputContext?: UserInput;
     }): Promise<RunClaim>;
     failQueuedRun(lease: OwnerLease, input: {
         runId: RunId;

package/dist/index.js

@@ -46,6 +46,9 @@ function buildContextDescription(contexts) {
   lines.push("</agent_context>");
   return lines.join("\n");
 }
+function buildAdditionalContextMessage(contexts) {
+  return buildContextDescription(contexts);
+}
 function formatResourceOutput(resource) {
   const parts = [`<${resource.type} name="${escapeXml(resource.name)}" location="${escapeXml(resource.location)}">`];
   if (resource.baseDir) {
@@ -2123,7 +2126,7 @@ function findLatestUserInputMessage(messages) {
   for (let index = messages.length - 1; index >= 0; index -= 1) {
     const message = messages[index];
     const kind = message.metadata?.kind;
-    if (message.role === "user" && kind !== "phase_prompt" && kind !== "phase_input") {
+    if (message.role === "user" && kind !== "phase_prompt" && kind !== "phase_input" && kind !== "host_context") {
       return message;
     }
   }
@@ -3276,6 +3279,7 @@ function isContinuation(value) {
 }
 
 // src/runtime/contracts.ts
+var HOST_CONTEXT_MESSAGE_KIND = "host_context";
 var THINKING_LEVELS = [
   "off",
   "minimal",
@@ -3298,7 +3302,7 @@ function thinkingLevelFromMessages(messages) {
     if (message?.role !== "user") continue;
     const metadata = message.metadata;
     const kind = isRecord3(metadata) && typeof metadata.kind === "string" ? metadata.kind : void 0;
-    if (kind === "phase_prompt" || kind === "phase_input") continue;
+    if (kind === "phase_prompt" || kind === "phase_input" || kind === HOST_CONTEXT_MESSAGE_KIND) continue;
     return thinkingLevelFromMetadata(metadata);
   }
   return void 0;
@@ -3352,6 +3356,9 @@ function normalizeUserInput(input) {
   assertJsonValue(normalized, "input");
   return normalized;
 }
+function canonicalUserInput(input) {
+  return canonicalJson(normalizeUserInput(input));
+}
 function isAssistantMessage(value) {
   return isRecord3(value) && hasOnlyKeys(value, ["id", "agentId", "runId", "messageRevision", "role", "content", "metadata", "sequenceWithinRun", "createdAt", "interrupted"]) && typeof value.id === "string" && typeof value.agentId === "string" && typeof value.runId === "string" && value.role === "assistant" && (value.messageRevision === void 0 || Number.isInteger(value.messageRevision) && value.messageRevision >= 0) && 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");
 }
@@ -3378,6 +3385,12 @@ function assertAgentConfig(config) {
     names.add(context.name);
     assertJsonValue(context.value, `Context candidate "${context.name}" value`);
   }
+  for (const context of config.additionalContexts ?? []) {
+    if (typeof context.name !== "string" || context.name.trim() === "") {
+      throw new TypeError("Additional Context candidate name must be non-empty");
+    }
+    assertJsonValue(context.value, `Additional Context candidate "${context.name}" value`);
+  }
 }
 function assertAgentConfigRequest(config) {
   if (!isAgentConfiguration(config)) {
@@ -3545,7 +3558,17 @@ function snapshotConfig(config) {
       })))
     } : {}
   });
-  return Object.freeze({ ...config, definition, resources });
+  return Object.freeze({
+    ...config,
+    definition,
+    resources,
+    ...config.additionalContexts ? {
+      additionalContexts: Object.freeze(config.additionalContexts.map((context) => Object.freeze({
+        name: context.name,
+        value: snapshotJsonValue(context.value)
+      })))
+    } : {}
+  });
 }
 function snapshotPhaseRegistry(registry) {
   const phases = /* @__PURE__ */ new Map();
@@ -5512,11 +5535,8 @@ function resolveConfigurationSnapshot(registry, input) {
   }
   const layer = input.definition.layer;
   const selectedContexts = selectNamedResources(input.contexts ?? [], base.contexts, "Context");
-  const contexts = appendAdditionalContexts(selectedContexts, input.additionalContexts ?? []);
-  const definition = addAdditionalContextNames(
-    applyDefinitionLayer(base, layer),
-    contexts.slice(selectedContexts.length).map(({ name }) => name)
-  );
+  const additionalContexts = deduplicateContexts(input.additionalContexts ?? [], selectedContexts);
+  const definition = applyDefinitionLayer(base, layer);
   const tools = selectNamedResources(resolved.tools, definition.tools, "Tool");
   const skills = mergeSkills(
     selectNamedResources(resolved.skills, definition.skills, "Skill"),
@@ -5538,7 +5558,8 @@ function resolveConfigurationSnapshot(registry, input) {
         phase: selectedRefs(resolved.refs.phase, [...phases?.phases.keys() ?? []])
       }
     },
-    contexts,
+    contexts: selectedContexts,
+    additionalContexts,
     resourceView: input.resourceView,
     ...input.cwd === void 0 ? {} : { cwd: input.cwd },
     ...input.maxAttempts === void 0 ? {} : { maxAttempts: input.maxAttempts },
@@ -5563,6 +5584,7 @@ function materializeConfigurationSnapshot(snapshot) {
       ],
       resourceRevisions: snapshot.resources.revisions
     },
+    ...snapshot.additionalContexts.length > 0 ? { additionalContexts: snapshot.additionalContexts } : {},
     ...snapshot.cwd === void 0 ? {} : { cwd: snapshot.cwd },
     ...snapshot.maxAttempts === void 0 ? {} : { maxAttempts: snapshot.maxAttempts },
     ..."stream" in snapshot && snapshot.stream ? { model: snapshot.model, stream: snapshot.stream } : { model: snapshot.model }
@@ -5580,9 +5602,9 @@ function applyDefinitionLayer(base, layer) {
     ...layer.phases === void 0 ? {} : { phases: intersectPhaseSelection(base.phases, layer.phases) }
   };
 }
-function appendAdditionalContexts(selected, additional) {
-  const contexts = [...selected];
-  const seen = new Set(contexts.map(({ name }) => name));
+function deduplicateContexts(additional, existing = []) {
+  const contexts = [];
+  const seen = new Set(existing.map(({ name }) => name));
   for (const context of additional) {
     if (seen.has(context.name)) continue;
     seen.add(context.name);
@@ -5590,12 +5612,6 @@ function appendAdditionalContexts(selected, additional) {
   }
   return contexts;
 }
-function addAdditionalContextNames(definition, names) {
-  if (definition.contexts === void 0 || names.length === 0) return definition;
-  const existing = new Set(definition.contexts);
-  const additions = names.filter((name) => !existing.has(name));
-  return additions.length === 0 ? definition : { ...definition, contexts: [...definition.contexts, ...additions] };
-}
 function intersectNames(parent, layer, kind) {
   if (parent === void 0) return [...layer];
   const parentNames = new Set(parent);
@@ -6033,7 +6049,13 @@ var AgentRuntime = class _AgentRuntime {
         }
       }
       const executionId = createId("exec");
-      claim = await this.owned.claimRun({ runId: run.id, expectedRevision: run.revision, executionId, configToken: token });
+      claim = await this.owned.claimRun({
+        runId: run.id,
+        expectedRevision: run.revision,
+        executionId,
+        configToken: token,
+        ...controlKind ? {} : { inputContext: additionalContextInput(config) }
+      });
       executionRevision = claim.run.revision;
       const controller = new AbortController();
       this.executions.set(run.id, { controller, executionId });
@@ -6502,6 +6524,12 @@ var AgentRuntime = class _AgentRuntime {
     this.heartbeat.unref?.();
   }
 };
+function additionalContextInput(config) {
+  const contexts = config.additionalContexts ?? [];
+  if (contexts.length === 0) return void 0;
+  const content = buildAdditionalContextMessage(contexts);
+  return content.length === 0 ? void 0 : { content, metadata: { kind: HOST_CONTEXT_MESSAGE_KIND } };
+}
 var DurableRun = class {
   constructor(runtime, id) {
     this.runtime = runtime;
@@ -7050,7 +7078,14 @@ var InMemoryStore = class _InMemoryStore {
     this.assertOwner(lease);
     const executionId = input.executionId ?? createId("exec");
     const operationKey = `claim:${executionId}`;
-    const operationPayload = canonicalJson([input.runId, input.expectedRevision, input.messageId ?? null, input.configToken ?? null]);
+    const inputContext = input.inputContext === void 0 ? void 0 : normalizeUserInput(input.inputContext);
+    const operationPayload = canonicalJson([
+      input.runId,
+      input.expectedRevision,
+      input.messageId ?? null,
+      input.configToken ?? null,
+      inputContext ?? null
+    ]);
     const replay = this.replayOperation(operationKey, operationPayload);
     if (replay) return clone(replay);
     const run = this.requireRun(input.runId);
@@ -7066,10 +7101,25 @@ var InMemoryStore = class _InMemoryStore {
       throw new RuntimeError("run_state_conflict", { runId: run.id, expected: ["queued"], actual: run.state });
     }
     if (!run.pinnedConfigToken && input.configToken) run.pinnedConfigToken = input.configToken;
-    let message;
+    const committedMessages = [];
+    const existingMessages = this.messagesForRun(run.id);
+    if (inputContext && hasUserInput(inputContext) && !isControlRun(run) && !existingMessages.some((message) => message.role === "user" && message.metadata?.kind === HOST_CONTEXT_MESSAGE_KIND && canonicalUserInput({ content: message.content, metadata: message.metadata }) === canonicalUserInput(inputContext))) {
+      const contextMessage = {
+        id: createId("msg"),
+        agentId: run.agentId,
+        runId: run.id,
+        role: "user",
+        content: userInputContent(inputContext),
+        ...userInputMetadata(inputContext) ? { metadata: clone(userInputMetadata(inputContext)) } : {},
+        sequenceWithinRun: this.nextMessageSequence(run.id),
+        createdAt: createTimestamp()
+      };
+      this.messages.set(contextMessage.id, contextMessage);
+      committedMessages.push(contextMessage);
+    }
     if (!run.checkpoint && !run.initialMessageId && (!isControlRun(run) || hasUserInput(run.input))) {
       const userInput = normalizeUserInput(run.input);
-      message = {
+      const message = {
         id: input.messageId ?? createId("msg"),
         agentId: run.agentId,
         runId: run.id,
@@ -7080,6 +7130,7 @@ var InMemoryStore = class _InMemoryStore {
         createdAt: createTimestamp()
       };
       this.messages.set(message.id, message);
+      committedMessages.push(message);
     }
     const execution = {
       runId: run.id,
@@ -7090,7 +7141,7 @@ var InMemoryStore = class _InMemoryStore {
     run.execution = execution;
     run.revision += 1;
     run.updatedAt = createTimestamp();
-    if (message) this.appendMessage(run, message);
+    for (const message of committedMessages) this.appendMessage(run, message);
     this.appendTransition(run, "queued", "running");
     const result = { run: clone(run), execution: clone(execution), history: this.activeHistory(run.agentId, run.agentSequence) };
     this.writeOperationReceipt(operationKey, operationPayload, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.9.12",
+  "version": "0.9.14",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "build": "tsup && bun scripts/check-public-interface.ts"
   },
   "dependencies": {
-    "@rowan-agent/models": "0.6.6",
+    "@rowan-agent/models": "0.6.7",
     "jiti": "2.7.0",
     "typebox": "^1.0.0",
     "yaml": "^2.7.0"