@noetic-tools/core 0.2.1 → 1.0.0

package/dist/harness/model-schema.d.ts

@@ -1,12 +1,18 @@
-import type { ItemSchemaRegistry } from '../schemas/item.js';
-import type { Item } from '../types/items.js';
-import type { MemoryLayer } from '../types/memory.js';
-import type { Tool } from '../types/tool.js';
+import type { MemoryLayer } from '@noetic-tools/memory';
+import type { Item, ItemSchemaRegistry, Tool } from '@noetic-tools/types';
 export declare function buildItemSchemaRegistry({ base, layers, tools, }: {
     base: ItemSchemaRegistry;
     layers?: ReadonlyArray<MemoryLayer>;
     tools?: ReadonlyArray<Tool>;
 }): ItemSchemaRegistry;
+/**
+ * Build and validate a `function_call_output` item for a tool result.
+ *
+ * `roundItemSchemas` must be the OWNER-SCOPED registry for the called tool
+ * (harness base extended with only that tool's `itemSchemas`), so one tool's
+ * `toolResults` schemas never reject a sibling tool's result items. Tools
+ * without `itemSchemas` fall back to the base structural parse.
+ */
 export declare function createToolResultItem({ output, callId, roundItemSchemas, tool, callItem, args, result, error, }: {
     output: string;
     callId: string;

package/dist/harness/model-schema.js

@@ -1,4 +1,4 @@
-import { mergeExtensions } from '../schemas/item.js';
+import { mergeExtensions } from '@noetic-tools/types';
 function mergeItemSchemaExtensions(extensions) {
     let result = {
         items: [],
@@ -24,6 +24,14 @@ export function buildItemSchemaRegistry({ base, layers, tools, }) {
         .extend(collectLayerItemSchemaExtensions(layers))
         .extend(collectToolItemSchemaExtensions(tools));
 }
+/**
+ * Build and validate a `function_call_output` item for a tool result.
+ *
+ * `roundItemSchemas` must be the OWNER-SCOPED registry for the called tool
+ * (harness base extended with only that tool's `itemSchemas`), so one tool's
+ * `toolResults` schemas never reject a sibling tool's result items. Tools
+ * without `itemSchemas` fall back to the base structural parse.
+ */
 export function createToolResultItem({ output, callId, roundItemSchemas, tool, callItem, args, result, error, }) {
     const baseItem = {
         id: crypto.randomUUID(),

package/dist/index.d.ts

@@ -41,9 +41,8 @@ export { aiCondition, allCondition, anyCondition, embeddingMatch, otherwise, sem
 /** @public */
 export { cosineSimilarity } from './conditions/cosine-similarity.js';
 /** @public */
-export { isNoeticConfigError, NoeticConfigError } from './errors/noetic-config-error.js';
 /** @public */
-export { isNoeticError, NoeticErrorImpl } from './errors/noetic-error.js';
+export { isNoeticConfigError, isNoeticError, NoeticConfigError, NoeticErrorImpl, } from '@noetic-tools/types';
 /** @public */
 export type { AskUserAnnotation, AskUserInput, AskUserOption, AskUserOutput, AskUserQuestion, } from './types/ask-user-types.js';
 /** @public */
@@ -51,43 +50,27 @@ export { AskUserAnnotationSchema, AskUserInputSchema, AskUserOptionSchema, AskUs
 /** @public */
 export { execute } from './interpreter/execute.js';
 /** @public */
-export { findFunctionCall } from './memory/function-call-utils.js';
 /** @public */
-export type { DurableTaskState, DurableTaskStateConfig } from './memory/layers/durable-task-state.js';
 /** @public */
-export { durableTaskState } from './memory/layers/durable-task-state.js';
 /** @public */
-export { fileReference } from './memory/layers/file-reference.js';
 /** @public */
-export type { HistoryWindowConfig } from './memory/layers/history-window.js';
 /** @public */
-export { historyWindow } from './memory/layers/history-window.js';
+export type { DurableTaskState, FactExtractor, FactSearcher, HistoryWindowConfig, ObservationalMemoryConfig, ObservationalState, PlanEnterSessionCallback, PlanExecutionEntry, PlanExitCallback, PlanMemoryConfig, PlanState, TemporalFact, TemporalMemoryConfig, TemporalSearchResult, WorkingMemoryConfig, WorkingMemoryState, } from '@noetic-tools/memory';
 /** @public */
-export type { ObservationalMemoryConfig, ObservationalState, } from './memory/layers/observational-memory.js';
 /** @public */
-export { observationalMemory } from './memory/layers/observational-memory.js';
 /** @public */
-export type { PlanEnterSessionCallback, PlanExecutionEntry, PlanExitCallback, PlanMemoryConfig, PlanState, } from './memory/layers/plan.js';
 /** @public */
-export { PlanPhase, planMemory } from './memory/layers/plan.js';
 /** @public */
-export { staticContent } from './memory/layers/static-content.js';
 /** @public */
-export { steering } from './memory/layers/steering.js';
 /** @public */
-export type { FactExtractor, FactSearcher, TemporalFact, TemporalMemoryConfig, TemporalSearchResult, } from './memory/layers/temporal.js';
 /** @public */
-export { temporalMemory } from './memory/layers/temporal.js';
 /** @public */
-export { toolMemoryLayer } from './memory/layers/tool-memory-layer.js';
 /** @public */
-export type { WorkingMemoryConfig, WorkingMemoryState } from './memory/layers/working-memory.js';
 /** @public */
-export { workingMemory } from './memory/layers/working-memory.js';
 /** @public */
-export { stripUnresolvedToolCalls } from './memory/strip-unresolved.js';
+export { durableTaskState, fileReference, findFunctionCall, historyWindow, observationalMemory, PlanPhase, planMemory, staticContent, steering, stripUnresolvedToolCalls, temporalMemory, toolMemoryLayer, workingMemory, } from '@noetic-tools/memory';
 /** @public */
-export { createMessage, estimateTokens } from './util/message-helpers.js';
+export { createMessage, estimateTokens } from '@noetic-tools/types';
 /** @public */
 export { GenAI, ToolAttr } from './observability/genai-attributes.js';
 /** @public */
@@ -123,29 +106,26 @@ export { CheckpointKeys, createCheckpointStore, createDetachedSignal, createNudg
 /** @public */
 export { getRegistry, lookupStep, registerStep } from './runtime/step-registry.js';
 /** @public */
-export { defaultItemSchemaRegistry, ItemSchema, ItemSchemaRegistry } from './schemas/item.js';
+export { defaultItemSchemaRegistry, ItemSchema, ItemSchemaRegistry } from '@noetic-tools/types';
 /** @public */
 export type { BranchRoute, BranchWorkflowNode, EveryWorkflowNode, ForkWorkflowNode, LlmWorkflowNode, LoopWorkflowNode, MergeStrategy, ProvideWorkflowNode, SequenceWorkflowNode, SpawnWorkflowNode, ToolWorkflowNode, UntilPredicate, WorkflowDocument, WorkflowNode, } from './schemas/workflow.js';
 /** @public */
 export { MergeStrategySchema, UntilPredicateSchema, validateWorkflow, WorkflowDocumentSchema, WorkflowNodeSchema, walkWorkflow, workflowDepth, } from './schemas/workflow.js';
 /** @public */
-export type { Channel, ChannelHandle, ExternalChannel } from './types/channel.js';
+export type { Channel, ChannelHandle, ExternalChannel } from '@noetic-tools/types';
 /** @public */
-export type { LLMResponse, LlmProviderConfig, ModelParams, RetryPolicy, StepMeta, TokenUsage, } from './types/common.js';
 /** @public */
-export type { Tool, ToolMemoryDeclaration } from './types/tool.js';
+export type { LLMResponse, LlmProviderConfig, ModelParams, RetryPolicy, StepMeta, TokenUsage, Tool, ToolMemoryDeclaration, } from '@noetic-tools/types';
 /** @public */
-export { getToolCwd, setToolCwd, snapshotCwdState } from './runtime/cwd-helpers.js';
 /** @public */
-export type { Context, ContextHarness, CwdState, } from './types/context.js';
 /** @public */
-export type { ItemLog } from './types/context-parts/item-log.js';
+export type { Context, ContextHarness, CwdState, ItemLog, LastLayerUsage, LayerUsageEntry, } from '@noetic-tools/types';
 /** @public */
-export type { LastLayerUsage, LayerUsageEntry } from './types/context-parts/layer-usage.js';
+export { getToolCwd, setToolCwd, snapshotCwdState } from './runtime/cwd-helpers.js';
 /** @public */
-export type { DetachedHandle } from './types/detached.js';
+export type { DetachedHandle } from '@noetic-tools/types';
 /** @public */
-export { DetachedStatus } from './types/detached.js';
+export { DetachedStatus } from '@noetic-tools/types';
 /** @public */
 export type { EmbedFn } from './types/embed.js';
 /** @public */
@@ -153,39 +133,38 @@ export type { CheckpointSnapshot, CwdSnapshot, FrontierFrame, ItemLogSnapshot, P
 /** @public */
 export { CheckpointSchemaVersion, CheckpointSnapshotSchema, CwdSnapshotSchema, FrontierFrameSchema, ItemLogSnapshotSchema, PendingAskUserSnapshotSchema, } from './types/checkpoint.js';
 /** @public */
-export type { NoeticError } from './types/error.js';
+export type { NoeticError } from '@noetic-tools/types';
 /** @public */
-export type { ContentPart, DeveloperMessageExtensionItem, ExecuteInput, ExtendedItem, ExtensionItem, FileSearchItem, FunctionCallItem, FunctionCallOutputItem, ImageGenerationItem, InferExtendedItem, InputContentPart, InputFilePart, InputImagePart, InputMessageItem, InputTextPart, Item, ItemBase, ItemSchemaExtensions, MessageItem, OutputItem, OutputTextPart, ReasoningItem, ReasoningTextPart, RefusalPart, ServerToolItem, SummaryTextPart, WebSearchItem, } from './types/items.js';
+export type { ContentPart, DeveloperMessageExtensionItem, ExecuteInput, ExtendedItem, ExtensionItem, FileSearchItem, FunctionCallItem, FunctionCallOutputItem, ImageGenerationItem, InferExtendedItem, InputContentPart, InputFilePart, InputImagePart, InputMessageItem, InputTextPart, Item, ItemBase, ItemSchemaExtensions, MessageItem, OutputItem, OutputTextPart, ReasoningItem, ReasoningTextPart, RefusalPart, ServerToolItem, SummaryTextPart, WebSearchItem, } from '@noetic-tools/types';
 /** @public */
-export type { BudgetConfig, CompleteParams, ContextMemory, DisposeParams, InferMemory, InferMemoryShape, InitParams, InitResult, LayerDataDecl, LayerFunctionDecl, LayerProvides, LayerTimeouts, MemoryConfig, MemoryHooks, MemoryLayer, ProjectionPolicy, RecallParams, RecallResult, ReturnParams, ReturnResult, ScopedStorage, SpawnParams, SpawnResult, StorageAdapter, StoreParams, StoreResult, } from './types/memory.js';
+export type { BudgetConfig, CompleteParams, ContextMemory, DisposeParams, InferMemory, InferMemoryShape, InitParams, InitResult, LayerDataDecl, LayerFunctionDecl, LayerProvides, LayerTimeouts, MemoryConfig, MemoryHooks, MemoryLayer, ProjectionPolicy, RecallParams, RecallResult, ReturnParams, ReturnResult, ScopedStorage, SpawnParams, SpawnResult, StorageAdapter, StoreParams, StoreResult, } from '@noetic-tools/memory';
 /** @public */
-export { Slot } from './types/memory.js';
+export { Slot } from '@noetic-tools/memory';
 /** @public */
-export type { ExecutionContext, ExecutionOutcome, MemoryCallModelRequest, MemoryScope, } from './types/memory-context.js';
+export type { ExecutionContext, ExecutionOutcome, MemoryCallModelRequest, MemoryScope, } from '@noetic-tools/types';
 /** @public */
-export type { MemoryTraceSpan, Span, TraceExporter } from './types/observability.js';
+export type { MemoryTraceSpan, Span, TraceExporter } from '@noetic-tools/types';
 /** @public */
-export type { FrameworkStreamEvent, HarnessResponse, SdkStreamEvent, StreamEvent, StreamingItem, } from './types/harness-result.js';
+export type { FrameworkStreamEvent, HarnessResponse, SdkStreamEvent, StreamEvent, StreamingItem, } from '@noetic-tools/types';
 /** @public */
-export type { AgentConfig, AgentHarnessContract, AgentHooks, CallModelRequest, DeliveryMode, ExecuteOptions, HarnessStatus, RecallLayerOutput, SessionScope, } from './types/runtime.js';
+export type { AgentConfig, AgentHarnessContract, AgentHooks, CallModelRequest, DeliveryMode, ExecuteOptions, HarnessStatus, RecallLayerOutput, SessionScope, } from '@noetic-tools/types';
 /** @public */
-export type { AfterModelCallParams, AfterModelCallResult, BeforeToolCallParams, BeforeToolCallResult, LedgerEntry, SteeringConfig, SteeringDecision, SteeringRule, SteeringState, } from './types/steering.js';
+export type { AfterModelCallParams, AfterModelCallResult, BeforeToolCallParams, BeforeToolCallResult, LedgerEntry, SteeringConfig, SteeringDecision, SteeringRule, SteeringState, } from '@noetic-tools/types';
 /** @public */
-export { LedgerEntryKind, SteeringAction } from './types/steering.js';
+export { LedgerEntryKind, SteeringAction } from '@noetic-tools/types';
 /** @public */
-export type { ExecuteStepFn, SettleResult, Snapshot, Step, StepBranch, StepFork, StepForkAll, StepForkRace, StepForkSettle, StepLLM, StepLoop, StepProvide, StepRun, StepSpawn, StepTool, Until, Verdict, } from './types/step.js';
+export type { ExecuteStepFn, SettleResult, Snapshot, Step, StepBranch, StepFork, StepForkAll, StepForkRace, StepForkSettle, StepLLM, StepLoop, StepProvide, StepRun, StepSpawn, StepTool, Until, Verdict, } from '@noetic-tools/types';
 /** @public */
-export type { FsAdapter, FsStats } from './types/fs-adapter.js';
-/** @public Reusable error-serialiser used by custom SubprocessAdapter implementations. */
-export { serializeError } from './adapters/in-memory-subprocess/metadata.js';
+export type { FsAdapter, FsStats } from '@noetic-tools/types';
 /** @public */
-export type { ShellAdapter, ShellExecOptions, ShellExecResult } from './types/shell-adapter.js';
 /** @public */
-export { TIMEOUT_ERROR_PREFIX } from './types/shell-adapter.js';
+export type { ProcessSubprocessRequest, SerializedError, ShellAdapter, ShellExecOptions, ShellExecResult, StepSubprocessOverrides, StepSubprocessRequest, SubprocessAdapter, SubprocessControlResult, SubprocessHandle, SubprocessHandleMetadata, SubprocessRequest, SubprocessStatus, SubprocessStopResult, } from '@noetic-tools/types';
 /** @public */
-export type { ProcessSubprocessRequest, SerializedError, StepSubprocessOverrides, StepSubprocessRequest, SubprocessAdapter, SubprocessControlResult, SubprocessHandle, SubprocessHandleMetadata, SubprocessRequest, SubprocessStatus, SubprocessStopResult, } from './types/subprocess-adapter.js';
+export { TIMEOUT_ERROR_PREFIX } from '@noetic-tools/types';
+/** @public Reusable error-serialiser used by custom SubprocessAdapter implementations. */
+export { serializeError } from './adapters/in-memory-subprocess/metadata.js';
 /** @public */
-export type { ToolExecutionContext, ToolMemory } from './types/tool-context.js';
+export type { ToolExecutionContext, ToolMemory } from '@noetic-tools/types';
 /** @public */
 export { all, any } from './until/combinators.js';
 /** @public */

package/dist/index.js

@@ -38,45 +38,31 @@ export { cosineSimilarity } from './conditions/cosine-similarity.js';
 //#endregion
 //#region Errors
 /** @public */
-export { isNoeticConfigError, NoeticConfigError } from './errors/noetic-config-error.js';
 /** @public */
-export { isNoeticError, NoeticErrorImpl } from './errors/noetic-error.js';
+export { isNoeticConfigError, isNoeticError, NoeticConfigError, NoeticErrorImpl, } from '@noetic-tools/types';
 /** @public */
 export { AskUserAnnotationSchema, AskUserInputSchema, AskUserOptionSchema, AskUserOutputSchema, AskUserQuestionSchema, } from './types/ask-user-types.js';
 //#endregion
 //#region Execution
 /** @public */
 export { execute } from './interpreter/execute.js';
-//#endregion
-//#region Memory Layers
 /** @public */
-export { findFunctionCall } from './memory/function-call-utils.js';
 /** @public */
-export { durableTaskState } from './memory/layers/durable-task-state.js';
 /** @public */
-export { fileReference } from './memory/layers/file-reference.js';
 /** @public */
-export { historyWindow } from './memory/layers/history-window.js';
 /** @public */
-export { observationalMemory } from './memory/layers/observational-memory.js';
 /** @public */
-export { PlanPhase, planMemory } from './memory/layers/plan.js';
 /** @public */
-export { staticContent } from './memory/layers/static-content.js';
 /** @public */
-export { steering } from './memory/layers/steering.js';
 /** @public */
-export { temporalMemory } from './memory/layers/temporal.js';
 /** @public */
-export { toolMemoryLayer } from './memory/layers/tool-memory-layer.js';
 /** @public */
-export { workingMemory } from './memory/layers/working-memory.js';
 /** @public */
-export { stripUnresolvedToolCalls } from './memory/strip-unresolved.js';
+export { durableTaskState, fileReference, findFunctionCall, historyWindow, observationalMemory, PlanPhase, planMemory, staticContent, steering, stripUnresolvedToolCalls, temporalMemory, toolMemoryLayer, workingMemory, } from '@noetic-tools/memory';
 //#endregion
 //#region Message Utilities
 /** @public */
-export { createMessage, estimateTokens } from './util/message-helpers.js';
+export { createMessage, estimateTokens } from '@noetic-tools/types';
 //#endregion
 //#region Observability
 /** @public */
@@ -108,27 +94,23 @@ export { getRegistry, lookupStep, registerStep } from './runtime/step-registry.j
 //#endregion
 //#region Schemas
 /** @public */
-export { defaultItemSchemaRegistry, ItemSchema, ItemSchemaRegistry } from './schemas/item.js';
+export { defaultItemSchemaRegistry, ItemSchema, ItemSchemaRegistry } from '@noetic-tools/types';
 /** @public */
 export { MergeStrategySchema, UntilPredicateSchema, validateWorkflow, WorkflowDocumentSchema, WorkflowNodeSchema, walkWorkflow, workflowDepth, } from './schemas/workflow.js';
-//#endregion
-//#region Types — Context
 /** @public */
 export { getToolCwd, setToolCwd, snapshotCwdState } from './runtime/cwd-helpers.js';
 /** @public */
-export { DetachedStatus } from './types/detached.js';
+export { DetachedStatus } from '@noetic-tools/types';
 /** @public */
 export { CheckpointSchemaVersion, CheckpointSnapshotSchema, CwdSnapshotSchema, FrontierFrameSchema, ItemLogSnapshotSchema, PendingAskUserSnapshotSchema, } from './types/checkpoint.js';
 /** @public */
-export { Slot } from './types/memory.js';
+export { Slot } from '@noetic-tools/memory';
 /** @public */
-export { LedgerEntryKind, SteeringAction } from './types/steering.js';
-//#endregion
-//#region Types — Shell
+export { LedgerEntryKind, SteeringAction } from '@noetic-tools/types';
+/** @public */
+export { TIMEOUT_ERROR_PREFIX } from '@noetic-tools/types';
 /** @public Reusable error-serialiser used by custom SubprocessAdapter implementations. */
 export { serializeError } from './adapters/in-memory-subprocess/metadata.js';
-/** @public */
-export { TIMEOUT_ERROR_PREFIX } from './types/shell-adapter.js';
 //#endregion
 //#region Until
 /** @public */

package/dist/interpreter/action-deps.d.ts

@@ -1,12 +1,8 @@
-export { contextToExecCtx } from '../memory/exec-context-factory.js';
-export { resolveLayerTools } from '../memory/layer-api.js';
-export type { LayerStateStore } from '../memory/layer-lifecycle.js';
-export { returnLayers, spawnLayers } from '../memory/layer-lifecycle.js';
-export { commitLayerUsage, computeLayerUsage } from '../memory/layer-usage.js';
-export { assembleView } from '../memory/projector.js';
+export type { LayerStateStore } from '@noetic-tools/memory';
+export { allocateBudgets, assembleView, commitLayerUsage, computeLayerUsage, contextToExecCtx, DEFAULT_PROJECTION, resolveLayerTools, returnLayers, spawnLayers, } from '@noetic-tools/memory';
+export type { ItemSchemaRegistry } from '@noetic-tools/types';
+export { defaultItemSchemaRegistry } from '@noetic-tools/types';
 export { emitFrameworkEvent, getBroadcaster } from '../runtime/broadcaster-utils.js';
 export { ContextImpl } from '../runtime/context-impl.js';
 export { snapshotCwdState } from '../runtime/cwd-helpers.js';
 export { buildToolExecutionContext } from '../runtime/tool-memory.js';
-export type { ItemSchemaRegistry } from '../schemas/item.js';
-export { defaultItemSchemaRegistry } from '../schemas/item.js';

package/dist/interpreter/action-deps.js

@@ -1,10 +1,6 @@
-export { contextToExecCtx } from '../memory/exec-context-factory.js';
-export { resolveLayerTools } from '../memory/layer-api.js';
-export { returnLayers, spawnLayers } from '../memory/layer-lifecycle.js';
-export { commitLayerUsage, computeLayerUsage } from '../memory/layer-usage.js';
-export { assembleView } from '../memory/projector.js';
+export { allocateBudgets, assembleView, commitLayerUsage, computeLayerUsage, contextToExecCtx, DEFAULT_PROJECTION, resolveLayerTools, returnLayers, spawnLayers, } from '@noetic-tools/memory';
+export { defaultItemSchemaRegistry } from '@noetic-tools/types';
 export { emitFrameworkEvent, getBroadcaster } from '../runtime/broadcaster-utils.js';
 export { ContextImpl } from '../runtime/context-impl.js';
 export { snapshotCwdState } from '../runtime/cwd-helpers.js';
 export { buildToolExecutionContext } from '../runtime/tool-memory.js';
-export { defaultItemSchemaRegistry } from '../schemas/item.js';

package/dist/interpreter/action-types.d.ts

@@ -1,8 +1,3 @@
-export type { RetryPolicy, StepMeta } from '../types/common.js';
-export type { Context } from '../types/context.js';
-export type { FunctionCallItem, Item } from '../types/items.js';
-export type { ContextMemory, ExecutionContext, MemoryConfig, MemoryLayer } from '../types/memory.js';
-export type { AgentHarnessContract, RecallLayerOutput } from '../types/runtime.js';
-export { SteeringAction } from '../types/steering.js';
-export type { ExecuteStepFn, StepLLM, StepProvide, StepRun, StepSpawn, StepTool, } from '../types/step.js';
-export type { Tool } from '../types/tool.js';
+export type { ContextMemory, ExecutionContext, MemoryConfig, MemoryLayer, } from '@noetic-tools/memory';
+export type { AgentHarnessContract, Context, ContextRerenderRequest, ExecuteStepFn, FunctionCallItem, Item, ProjectionPolicy, RecallLayerOutput, RetryPolicy, StepLLM, StepMeta, StepProvide, StepRun, StepSpawn, StepTool, Tool, } from '@noetic-tools/types';
+export { SteeringAction } from '@noetic-tools/types';

package/dist/interpreter/action-types.js

@@ -1 +1 @@
-export { SteeringAction } from '../types/steering.js';
+export { SteeringAction } from '@noetic-tools/types';

package/dist/interpreter/collect-tools.d.ts

@@ -1,5 +1,4 @@
-import type { Step } from '../types/step.js';
-import type { Tool } from '../types/tool.js';
+import type { Step, Tool } from '@noetic-tools/types';
 /**
  * Recursively walks a step tree and collects all Tool instances
  * declared on LLM steps. Used to build the unified tool set

package/dist/interpreter/collect-tools.js

@@ -1,4 +1,4 @@
-import { frameworkCast } from '../util/framework-cast.js';
+import { frameworkCast } from '@noetic-tools/types';
 /**
  * Recursively walks a step tree and collects all Tool instances
  * declared on LLM steps. Used to build the unified tool set

package/dist/interpreter/execute-action.js

@@ -1,12 +1,9 @@
 /**
  * Action step handlers: run, llm, spawn, provide, tool.
  */
+import { createMessage, estimateTokens, extractAssistantText, frameworkCast, isNoeticError, NoeticConfigError, NoeticErrorImpl, } from '@noetic-tools/types';
 import { ZodError } from 'zod';
-import { NoeticConfigError } from '../errors/noetic-config-error.js';
-import { NoeticErrorImpl } from '../errors/noetic-error.js';
-import { frameworkCast } from '../util/framework-cast.js';
-import { createMessage, extractAssistantText } from '../util/message-helpers.js';
-import { assembleView, buildToolExecutionContext, ContextImpl, commitLayerUsage, computeLayerUsage, contextToExecCtx, defaultItemSchemaRegistry, emitFrameworkEvent, getBroadcaster, resolveLayerTools, returnLayers, snapshotCwdState, spawnLayers, } from './action-deps.js';
+import { allocateBudgets, assembleView, buildToolExecutionContext, ContextImpl, commitLayerUsage, computeLayerUsage, contextToExecCtx, DEFAULT_PROJECTION, defaultItemSchemaRegistry, emitFrameworkEvent, getBroadcaster, resolveLayerTools, returnLayers, snapshotCwdState, spawnLayers, } from './action-deps.js';
 import { SteeringAction } from './action-types.js';
 import { cloneWithGuard } from './clone-guard.js';
 import { collectAllTools, deduplicateTools } from './collect-tools.js';
@@ -18,10 +15,23 @@ export async function executeRun(step, input, ctx) {
     const maxAttempts = retry?.maxAttempts ?? 1;
     let lastError = new Error('No attempts executed');
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        // Cancellation is not a retriable error (spec 09) — an abort that
+        // arrived between attempts must stop the loop before re-executing.
+        if (ctx.aborted) {
+            throw new NoeticErrorImpl({
+                kind: 'cancelled',
+                reason: ctx.abortReason ?? 'context aborted',
+            });
+        }
         try {
             return await step.execute(input, ctx);
         }
         catch (e) {
+            // Rethrow cancellation immediately — retrying it would re-run side
+            // effects after abort and bury the 'cancelled' kind under step_failed.
+            if (isNoeticError(e) && e.noeticError.kind === 'cancelled') {
+                throw e;
+            }
             lastError = e instanceof Error ? e : new Error(String(e));
             if (attempt < maxAttempts - 1 && retry) {
                 const delay = computeDelay(retry, attempt);
@@ -55,6 +65,27 @@ function computeDelay(retry, attempt) {
 //#region llm
 const MAX_STEERING_RETRIES = 3;
 const emptyRecall = [];
+/**
+ * Merge re-render recall outputs over the base recall results, replacing entries
+ * for the same layer and keeping slot order. New layer entries are appended.
+ */
+function mergeRecallResults(base, overrides, slotOf) {
+    if (overrides.length === 0) {
+        return base;
+    }
+    const byId = new Map(overrides.map((r) => [
+        r.layerId,
+        r,
+    ]));
+    const merged = base.map((r) => byId.get(r.layerId) ?? r);
+    const seen = new Set(base.map((r) => r.layerId));
+    for (const o of overrides) {
+        if (!seen.has(o.layerId)) {
+            merged.push(o);
+        }
+    }
+    return merged.sort((a, b) => (slotOf.get(a.layerId) ?? 0) - (slotOf.get(b.layerId) ?? 0));
+}
 /**
  * Resolves a `Lazy<T>` step field. If the value is a function, it is invoked
  * with the current context; otherwise the value is returned as-is. Supports
@@ -123,14 +154,15 @@ function resolveToolsAndRestrictions(stepTools, layers, ctx) {
         allowedToolNames: undefined,
     };
 }
-async function runInputPipeline({ ctx, layers, input }) {
+async function runInputPipeline({ ctx, layers, input, }) {
     const userItem = createMessage(input, 'user');
-    const { items: finalItems } = await ctx.harness.runAppendPipeline(layers, [
+    const { items: finalItems, rerenderRequests } = await ctx.harness.runAppendPipeline(layers, [
         userItem,
     ], ctx);
     for (const item of finalItems) {
         ctx.itemLog.append(item);
     }
+    return rerenderRequests;
 }
 export async function executeLLM(step, input, ctx, layers) {
     const baseCtx = frameworkCast(ctx);
@@ -149,9 +181,12 @@ export async function executeLLM(step, input, ctx, layers) {
     const resolvedInstructions = await resolveLazy(step.instructions, ctx);
     const resolvedStepTools = await resolveLazy(step.tools, ctx);
     // Append user input — through layer pipeline if layers exist, otherwise direct.
+    // The append pipeline may request a context re-render (e.g. a layer that
+    // expanded an input reference into new content); applied after recall below.
+    let rerenderRequests = [];
     if (typeof input === 'string' && input.length > 0) {
         if (hasLayers) {
-            await runInputPipeline({
+            rerenderRequests = await runInputPipeline({
                 ctx: baseCtx,
                 layers,
                 input,
@@ -162,14 +197,55 @@ export async function executeLLM(step, input, ctx, layers) {
         }
     }
     const { tools: resolvedTools, allowedToolNames } = resolveToolsAndRestrictions(resolvedStepTools, layers, baseCtx);
-    // Recall once per LLM step: every layer with a recall hook contributes its
-    // current view. Results drive both the assembled context window and the
-    // per-layer usage breakdown (ctx.lastLayerUsage). Recall fires before the
+    // Resolve the projection policy (step override > harness default > fallback)
+    // and split the context budget across layers via allocateBudgets.
+    const policy = step.projection ?? baseCtx.harness.config.projection ?? DEFAULT_PROJECTION;
+    // `instructions` are sent to the model as a separate field, outside the
+    // assembled view. Reserve their tokens from the projection budget so the
+    // view + instructions together stay within the policy's token budget.
+    const systemPromptTokens = resolvedInstructions ? estimateTokens(resolvedInstructions) : 0;
+    const viewPolicy = {
+        ...policy,
+        tokenBudget: Math.max(0, policy.tokenBudget - systemPromptTokens),
+    };
+    let budgetMap = new Map();
+    if (hasLayers) {
+        const { allocations } = allocateBudgets({
+            layers,
+            totalBudget: policy.tokenBudget,
+            systemPromptTokens,
+            responseReserve: policy.responseReserve,
+        });
+        budgetMap = new Map(allocations.map((a) => [
+            a.layerId,
+            a.allocated,
+        ]));
+    }
+    // Recall once per LLM step: atomic layers run in the hot path; eventual layers
+    // are served from cache. Results drive both the assembled context window and
+    // the per-layer usage breakdown (ctx.lastLayerUsage). Recall fires before the
     // steering retry loop because retries replay the same context.
     const recallQuery = typeof input === 'string' ? input : '';
-    const recallResults = hasLayers
-        ? await baseCtx.harness.recallLayers(layers, recallQuery, baseCtx)
-        : emptyRecall;
+    const slotOf = new Map((layers ?? []).map((l) => [
+        l.id,
+        l.slot,
+    ]));
+    let recallResults = emptyRecall;
+    if (hasLayers) {
+        const atomic = await baseCtx.harness.recallLayersAtomic(layers, recallQuery, baseCtx, budgetMap);
+        const eventual = await baseCtx.harness.recallLayersEventual(layers, recallQuery, baseCtx, budgetMap);
+        recallResults = [
+            ...atomic,
+            ...eventual,
+        ].sort((a, b) => (slotOf.get(a.layerId) ?? 0) - (slotOf.get(b.layerId) ?? 0));
+        // Apply re-render requests collected from the input-append pipeline.
+        if (rerenderRequests.length > 0) {
+            const rerendered = await baseCtx.harness.executeRerender(rerenderRequests, layers, baseCtx, budgetMap, recallQuery);
+            recallResults = mergeRecallResults([
+                ...recallResults,
+            ], rerendered, slotOf);
+        }
+    }
     const layerOutputItems = recallResults.flatMap((r) => r.items);
     let retries = 0;
     while (retries <= MAX_STEERING_RETRIES) {
@@ -177,19 +253,34 @@ export async function executeLLM(step, input, ctx, layers) {
         const projectedHistoryItems = hasLayers
             ? await baseCtx.harness.projectHistory(layers, rawHistoryItems, baseCtx)
             : rawHistoryItems;
-        const assembledItems = layerOutputItems.length > 0
-            ? assembleView({
-                systemPromptItems: [],
+        let assembledItems;
+        if (hasLayers) {
+            // Keep system messages at the front; the projector enforces the token
+            // budget (drops highest-slot layer output, then oldest history).
+            const systemItems = [];
+            const nonSystemHistory = [];
+            for (const item of projectedHistoryItems) {
+                if (item.type === 'message' && item.role === 'system') {
+                    systemItems.push(item);
+                    continue;
+                }
+                nonSystemHistory.push(item);
+            }
+            assembledItems = assembleView({
+                systemPromptItems: systemItems,
                 layerOutputItems,
-                historyItems: [
-                    ...projectedHistoryItems,
-                ],
-            })
-            : projectedHistoryItems === rawHistoryItems
-                ? rawHistoryItems
-                : [
-                    ...projectedHistoryItems,
-                ];
+                historyItems: nonSystemHistory,
+                policy: viewPolicy,
+            });
+        }
+        else {
+            assembledItems =
+                projectedHistoryItems === rawHistoryItems
+                    ? rawHistoryItems
+                    : [
+                        ...projectedHistoryItems,
+                    ];
+        }
         const request = resolvedTools
             ? {
                 model: resolvedModel,
@@ -212,6 +303,11 @@ export async function executeLLM(step, input, ctx, layers) {
                 emit: step.emit,
             };
         const response = await baseCtx.harness.callModel(request);
+        // Track tokens/cost for EVERY model call, including responses steering
+        // subsequently rejects (Deny throw / Guide retry below) — the spend is
+        // real, and until.maxCost / HarnessResponse.usage must see it (spec 07:
+        // tokens accumulate across all LLM calls).
+        trackUsage(baseCtx, response);
         if (hasLayers) {
             const decision = await baseCtx.harness.afterModelCall(layers, response, baseCtx);
             if (decision.action === SteeringAction.Deny) {
@@ -242,7 +338,6 @@ export async function executeLLM(step, input, ctx, layers) {
         if (isMutableContext(baseCtx)) {
             baseCtx.lastStepMeta = meta;
         }
-        trackUsage(baseCtx, response);
         commitLayerUsage(baseCtx, computeLayerUsage({
             ctx: baseCtx,
             modelId: resolvedModel,

package/dist/interpreter/execute-control.d.ts

@@ -1,8 +1,7 @@
 /**
  * Control-flow step handlers: branch, fork, loop, every.
  */
-import type { Context } from '../types/context.js';
-import type { ExecuteStepFn, StepBranch, StepEvery, StepFork, StepLoop } from '../types/step.js';
+import type { Context, ExecuteStepFn, StepBranch, StepEvery, StepFork, StepLoop } from '@noetic-tools/types';
 export declare function executeBranch<TMemory, I, O>(step: StepBranch<TMemory, I, O>, input: I, ctx: Context<TMemory>, executeStep: ExecuteStepFn): Promise<O>;
 export declare function executeFork<TMemory, I, O>(step: StepFork<TMemory, I, O>, input: I, ctx: Context<TMemory>, executeStep: ExecuteStepFn): Promise<O>;
 export declare function executeLoop<TMemory, I, O>(step: StepLoop<TMemory, I, O>, input: I, ctx: Context<TMemory>, executeStep: ExecuteStepFn): Promise<O>;