@falai/agent 2.7.0 → 3.1.0

package/src/core/Flow.ts

@@ -13,16 +13,16 @@ import type {
   TemplateContext,
   ConditionEvaluationResult,
   Directive,
-} from "../types";
-import type { SessionState } from "../types/session";
-import type { StepResult } from "../types/flow";
-import type { ConditionWhen, ConditionIf } from "../types/flow";
+} from "../types/index.js";
+import type { SessionState } from "../types/session.js";
+import type { StepResult } from "../types/flow.js";
+import type { ConditionWhen, ConditionIf } from "../types/flow.js";
 
-import { generateFlowId, logger } from "../utils";
-import { splitWhenConditions } from "../utils/condition";
+import { generateFlowId, logger } from "../utils/index.js";
+import { splitWhenConditions } from "../utils/condition.js";
 
-import { Step, FlowConfigurationError } from "./Step";
-import { Agent } from './Agent'
+import { Step, FlowConfigurationError } from "./Step.js";
+import { Agent } from './Agent.js'
 
 /**
  * Represents a conversational flow/journey
@@ -647,7 +647,7 @@ export class Flow<TContext = unknown, TData = unknown> {
         context: context as TContext,
         data: session.data ?? {} as Partial<TData>,
         session: {} as SessionState<TData>,
-        history: [] as import("../types/history").Event[],
+        history: [] as import("../types/history.js").Event[],
         dispatch: () => { },
       };
       const result = await this.hooks.onComplete(hookCtx);

package/src/core/FlowRouter.ts

@@ -5,14 +5,14 @@ import type {
   SessionState,
   AiProvider,
   TemplateContext,
-} from "../types";
-import { MessageRole } from "../types";
-import { enterFlow, mergeCollected, isFlowCompletedThisSession } from "../utils";
-import type { Flow } from "./Flow";
-import type { Step } from "./Step";
-import { PromptComposer } from "./PromptComposer";
-import { PromptSectionCache } from "./PromptSectionCache";
-import { createTemplateContext, getLastMessageFromHistory, logger, eventsToHistory } from "../utils";
+} from "../types/index.js";
+import { MessageRole } from "../types/index.js";
+import { enterFlow, mergeCollected, isFlowCompletedThisSession } from "../utils/index.js";
+import type { Flow } from "./Flow.js";
+import type { Step } from "./Step.js";
+import { PromptComposer } from "./PromptComposer.js";
+import { PromptSectionCache } from "./PromptSectionCache.js";
+import { createTemplateContext, getLastMessageFromHistory, logger, eventsToHistory } from "../utils/index.js";
 
 export interface CandidateStep<TContext = unknown, TData = unknown> {
   step: Step<TContext, TData>;

package/src/core/PersistenceManager.ts

@@ -17,10 +17,10 @@ import type {
   History,
   PersistenceAdapter,
   CollectedStateData,
-} from "../types";
-import { createSession, sessionStepToData, sessionDataToStep, logger } from "../utils";
-import { SessionConflictError } from "../types/errors";
-import { convertMessagesToHistory } from "./Events";
+} from "../types/index.js";
+import { createSession, sessionStepToData, sessionDataToStep, logger } from "../utils/index.js";
+import { SessionConflictError } from "../types/errors.js";
+import { convertMessagesToHistory } from "./Events.js";
 
 /**
  * Manager for handling persistence operations

package/src/core/PromptComposer.ts

@@ -1,10 +1,10 @@
-import type { Event, Term, Instruction, AgentOptions, ScopedInstructions, AppliedInstruction } from "../types";
-import type { Flow } from "./Flow";
-import { render, renderMany, formatKnowledgeBase, createTemplateContext } from "../utils/template";
-import { TemplateContext } from "../types/template";
-import { PromptSectionCache } from "./PromptSectionCache";
-import { logger } from "../utils";
-import { splitWhenConditions } from "../utils/condition";
+import type { Event, Term, Instruction, AgentOptions, ScopedInstructions, AppliedInstruction } from "../types/index.js";
+import type { Flow } from "./Flow.js";
+import { render, renderMany, formatKnowledgeBase, createTemplateContext } from "../utils/template.js";
+import { TemplateContext } from "../types/template.js";
+import { PromptSectionCache } from "./PromptSectionCache.js";
+import { logger } from "../utils/index.js";
+import { splitWhenConditions } from "../utils/condition.js";
 
 export class PromptComposer<TContext = unknown, TData = unknown> {
   private parts: string[] = [];
@@ -168,7 +168,7 @@ export class PromptComposer<TContext = unknown, TData = unknown> {
           const result = await predicate({
             context: (this.renderContext.context ?? {}) as TContext,
             data: (this.renderContext.data || {}),
-            session: (this.renderContext.session ?? { id: '', data: {}, history: [], metadata: {} }) as import("../types/session").SessionState<TData>,
+            session: (this.renderContext.session ?? { id: '', data: {}, history: [], metadata: {} }) as import("../types/session.js").SessionState<TData>,
             history: this.renderContext.history || [],
           });
           if (!result) return false;

package/src/core/PromptSectionCache.ts

@@ -7,8 +7,8 @@
  * directives, available tools) are recomputed on every resolveAll() call.
  */
 
-import type { PromptSectionType, PromptCacheConfig, SectionCompute } from "../types/prompt-cache";
-export type { PromptSectionType, PromptCacheConfig, SectionCompute } from "../types/prompt-cache";
+import type { PromptSectionType, PromptCacheConfig, SectionCompute } from "../types/prompt-cache.js";
+export type { PromptSectionType, PromptCacheConfig, SectionCompute } from "../types/prompt-cache.js";
 
 /** Internal entry tracking a registered section */
 interface PromptSectionEntry {

package/src/core/ResponseEngine.ts

@@ -7,12 +7,12 @@ import type {
   Template,
   ScopedInstructions,
   AppliedInstruction,
-} from "../types";
-import type { Flow } from "./Flow";
-import type { Step } from "./Step";
-import { PromptComposer } from "./PromptComposer";
-import { PromptSectionCache } from "./PromptSectionCache";
-import { createTemplateContext, render } from "../utils/template";
+} from "../types/index.js";
+import type { Flow } from "./Flow.js";
+import type { Step } from "./Step.js";
+import { PromptComposer } from "./PromptComposer.js";
+import { PromptSectionCache } from "./PromptSectionCache.js";
+import { createTemplateContext, render } from "../utils/template.js";
 
 export interface BuildResponsePromptParams<
   TContext = unknown,

package/src/core/ResponseModal.ts

@@ -23,30 +23,30 @@ import type {
     Term,
     StructuredSchema,
     CompactionOptions,
-} from "../types";
-import type { SignalFiring } from "../types/signals";
-import type { SessionManager } from "./SessionManager";
-import type { SignalProcessor } from "./SignalProcessor";
-import type { PromptSectionCache } from "./PromptSectionCache";
-import type { FlowRouter } from "./FlowRouter";
-import type { PersistenceManager } from "./PersistenceManager";
-import type { Flow } from "./Flow";
-import { Step } from "./Step";
-import { ResponseEngine } from "./ResponseEngine";
-import { ResponsePipeline } from "./ResponsePipeline";
-import { AutoChainExecutor, type AutoChainResult } from "./AutoChainExecutor";
-import { StepLifecycle } from "./StepLifecycle";
-import { SessionFinalizer } from "./SessionFinalizer";
-import { ToolLoopExecutor } from "./ToolLoopExecutor";
-import { flow } from "./flow-namespace";
-import { SignalCoordinator } from "./SignalCoordinator";
-import { ResponseGenerationError } from "./ResponseGenerationError";
-import { ProviderError, SessionConflictError } from "../types/errors";
-import { cloneDeep, mergeCollected, logger, historyToEvents, completeCurrentFlow, render, userMessage, assistantMessage } from "../utils";
-import { createTemplateContext } from "../utils/template";
-import { StreamingMessageDecoder } from "../utils/streamingMessage";
-import { tryParseJSONResponse } from "../utils/json";
-import type { ToolManager } from "./ToolManager";
+} from "../types/index.js";
+import type { SignalFiring } from "../types/signals.js";
+import type { SessionManager } from "./SessionManager.js";
+import type { SignalProcessor } from "./SignalProcessor.js";
+import type { PromptSectionCache } from "./PromptSectionCache.js";
+import type { FlowRouter } from "./FlowRouter.js";
+import type { PersistenceManager } from "./PersistenceManager.js";
+import type { Flow } from "./Flow.js";
+import { Step } from "./Step.js";
+import { ResponseEngine } from "./ResponseEngine.js";
+import { ResponsePipeline } from "./ResponsePipeline.js";
+import { AutoChainExecutor, type AutoChainResult } from "./AutoChainExecutor.js";
+import { StepLifecycle } from "./StepLifecycle.js";
+import { SessionFinalizer } from "./SessionFinalizer.js";
+import { ToolLoopExecutor } from "./ToolLoopExecutor.js";
+import { flow } from "./flow-namespace.js";
+import { SignalCoordinator } from "./SignalCoordinator.js";
+import { ResponseGenerationError } from "./ResponseGenerationError.js";
+import { ProviderError, SessionConflictError } from "../types/errors.js";
+import { cloneDeep, mergeCollected, logger, historyToEvents, completeCurrentFlow, render, userMessage, assistantMessage } from "../utils/index.js";
+import { createTemplateContext } from "../utils/template.js";
+import { StreamingMessageDecoder } from "../utils/streamingMessage.js";
+import { tryParseJSONResponse } from "../utils/json.js";
+import type { ToolManager } from "./ToolManager.js";
 
 /**
  * The narrow surface ResponseModal (and its collaborators) need from the

package/src/core/ResponsePipeline.ts

@@ -8,8 +8,8 @@ import type { EndedFlow,
   SessionState,
   Directive,
   StructuredSchema,
-} from "../types";
-import type { SignalFiring } from "../types/signals";
+} from "../types/index.js";
+import type { SignalFiring } from "../types/signals.js";
 import {
   createSession,
   enterStep,
@@ -18,16 +18,16 @@ import {
   historyToEvents,
   eventsToHistory,
   getLastMessageFromHistory,
-} from "../utils";
-import { enterFlow } from "../utils/session";
-import { createTemplateContext } from "../utils/template";
-import { Flow } from "./Flow";
-import { Step, FlowConfigurationError } from "../core/Step";
-import { FlowRouter } from "./FlowRouter";
-import { evaluateBranches, createAiConditionEvaluator } from "./BranchEvaluator";
-import { DirectiveChainTracker } from "./DirectiveChainTracker";
-import { ResponseGenerationError } from "./ResponseGenerationError";
-import type { SignalCoordinator } from "./SignalCoordinator";
+} from "../utils/index.js";
+import { enterFlow } from "../utils/session.js";
+import { createTemplateContext } from "../utils/template.js";
+import { Flow } from "./Flow.js";
+import { Step, FlowConfigurationError } from "../core/Step.js";
+import { FlowRouter } from "./FlowRouter.js";
+import { evaluateBranches, createAiConditionEvaluator } from "./BranchEvaluator.js";
+import { DirectiveChainTracker } from "./DirectiveChainTracker.js";
+import { ResponseGenerationError } from "./ResponseGenerationError.js";
+import type { SignalCoordinator } from "./SignalCoordinator.js";
 
 /**
  * Position fields on a Directive that represent a navigation decision.
@@ -454,11 +454,23 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
     context: TContext;
     /** Merged directive from the directive bus (pre-LLM + post-LLM phases). */
     busDirective?: Directive<TContext, TData>;
-  }): Promise<{ nextStep: Step<TContext, TData> | undefined; session: SessionState<TData>; flowChanged?: Flow<TContext, TData> }> {
+  }): Promise<{
+    nextStep: Step<TContext, TData> | undefined;
+    session: SessionState<TData>;
+    flowChanged?: Flow<TContext, TData>;
+    /**
+     * The turn's authoritative completion verdict — callers must use this, not
+     * the `isFlowComplete` they passed in. The router derives its verdict from
+     * the LINEAR chain alone (the current step has no successor), before
+     * branches run, so what it returns is only a proposal. Branches win over
+     * flow completion (Algorithm 1, STEP 1) and this is where that resolves.
+     */
+    isFlowComplete: boolean;
+  }> {
     const { selectedFlow, selectedStep, session, isFlowComplete, context, busDirective } = params;
 
     if (!selectedFlow) {
-      return { nextStep: undefined, session };
+      return { nextStep: undefined, session, isFlowComplete };
     }
 
     // ─── GUARD: directive bus winner with a position field preempts branches ───
@@ -470,7 +482,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
       logger.debug(
         `[ResponsePipeline] Directive bus winner has position field — skipping branch evaluation and linear/AI selection`,
       );
-      return { nextStep: undefined, session };
+      return { nextStep: undefined, session, isFlowComplete };
     }
 
     // STEP 1 (Algorithm 1): branches win over linear chain AND flow completion.
@@ -486,14 +498,21 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
           currentStep, selectedFlow, session, context
         );
         if (branchResult) {
-          return branchResult;
+          // A branch that resolved a position overrides the router's completion
+          // proposal. Without this, a branch that parks on a step of its own
+          // flow (`then: '<stepId>'`, `then: { reset: true }`) keeps
+          // isFlowComplete=true, the caller drops the step it just resolved,
+          // and the turn ends as a silent completion — no LLM call, empty
+          // reply, flow marked completed for the rest of the session.
+          const resolvedPosition = Boolean(branchResult.nextStep || branchResult.flowChanged);
+          return { ...branchResult, isFlowComplete: resolvedPosition ? false : isFlowComplete };
         }
         // undefined → fall through to linear/AI selection or flow completion
       }
     }
 
     if (isFlowComplete) {
-      return { nextStep: undefined, session };
+      return { nextStep: undefined, session, isFlowComplete: true };
     }
 
     let nextStep: Step<TContext, TData>;
@@ -546,7 +565,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
             nextStep = currentStepInstance;
           }
         }
-        return { nextStep, session };
+        return { nextStep, session, isFlowComplete: false };
       }
     }
 
@@ -558,7 +577,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
     );
     logger.debug(`[ResponsePipeline] Entered step: ${nextStep.id}`);
 
-    return { nextStep, session: updatedSession };
+    return { nextStep, session: updatedSession, isFlowComplete: false };
   }
 
   /**
@@ -928,7 +947,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
           selectedStep: stepResult.nextStep,
           responseDirectives: routingResult.responseDirectives,
           session: stepResult.session,
-          isFlowComplete: stepResult.flowChanged ? false : isFlowComplete,
+          isFlowComplete: stepResult.isFlowComplete,
           signalFirings: signalResult.firings,
           signalPreDirective: signalResult.mergedDirective || undefined,
           endedFlows: routingResult.endedFlows,
@@ -997,8 +1016,9 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
         selectedStep: stepResult.nextStep, // Use the determined next step
         responseDirectives: routingResult.responseDirectives,
         session: stepResult.session,
-        // If a branch changed the flow, the original isFlowComplete no longer applies
-        isFlowComplete: stepResult.flowChanged ? false : isFlowComplete,
+        // determineNextStep owns the verdict: a branch that resolved a position
+        // (new flow, or a step of this one) overrides the router's proposal.
+        isFlowComplete: stepResult.isFlowComplete,
         endedFlows: routingResult.endedFlows,
       };
     } catch (error) {
@@ -1247,7 +1267,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
         selectedStep: stepResult.nextStep,
         responseDirectives: undefined,
         session: stepResult.session,
-        isFlowComplete: false,
+        isFlowComplete: stepResult.isFlowComplete,
       },
     };
   }

package/src/core/SessionFinalizer.ts

@@ -11,13 +11,13 @@
  * yield sites.
  */
 
-import type { AgentOptions, SessionState } from "../types";
-import type { CompactionOptions } from "../types/compaction";
-import type { PersistenceManager } from "./PersistenceManager";
-import type { StepLifecycle } from "./StepLifecycle";
-import { flow } from "./flow-namespace";
-import { CompactionEngine } from "./CompactionEngine";
-import { boundConversationHistory, DEFAULT_MAX_HISTORY_MESSAGES, logger } from "../utils";
+import type { AgentOptions, SessionState } from "../types/index.js";
+import type { CompactionOptions } from "../types/compaction.js";
+import type { PersistenceManager } from "./PersistenceManager.js";
+import type { StepLifecycle } from "./StepLifecycle.js";
+import { flow } from "./flow-namespace.js";
+import { CompactionEngine } from "./CompactionEngine.js";
+import { boundConversationHistory, DEFAULT_MAX_HISTORY_MESSAGES, logger } from "../utils/index.js";
 
 export class SessionFinalizer<TContext = unknown, TData = unknown> {
     constructor(

package/src/core/SessionManager.ts

@@ -6,13 +6,13 @@
  */
 
 import log from "loglevel";
-import type { SessionState } from "../types/session";
-import type { History, HistoryItem } from "../types/history";
-import { PersistenceManager } from "./PersistenceManager";
-import { CompactionEngine } from "./CompactionEngine";
-import type { PersistenceAdapter } from "../types/persistence";
-import type { Agent } from "./Agent";
-import { boundConversationHistory, createSession, DEFAULT_MAX_HISTORY_MESSAGES } from "../utils";
+import type { SessionState } from "../types/session.js";
+import type { History, HistoryItem } from "../types/history.js";
+import { PersistenceManager } from "./PersistenceManager.js";
+import { CompactionEngine } from "./CompactionEngine.js";
+import type { PersistenceAdapter } from "../types/persistence.js";
+import type { Agent } from "./Agent.js";
+import { boundConversationHistory, createSession, DEFAULT_MAX_HISTORY_MESSAGES } from "../utils/index.js";
 
 /**
  * SessionManager handles session lifecycle and conversation history

package/src/core/SignalCoordinator.ts

@@ -12,13 +12,13 @@
  *   of the user-visible message.
  */
 
-import type { Directive, Event, SessionState } from "../types";
-import type { SignalFiring } from "../types/signals";
-import type { SignalProcessor } from "./SignalProcessor";
-import type { Flow } from "./Flow";
-import type { Step } from "./Step";
-import { hasDirectivePositionField } from "./ResponsePipeline";
-import { enterFlow, enterStep, mergeCollected, logger } from "../utils";
+import type { Directive, Event, SessionState } from "../types/index.js";
+import type { SignalFiring } from "../types/signals.js";
+import type { SignalProcessor } from "./SignalProcessor.js";
+import type { Flow } from "./Flow.js";
+import type { Step } from "./Step.js";
+import { hasDirectivePositionField } from "./ResponsePipeline.js";
+import { enterFlow, enterStep, mergeCollected, logger } from "../utils/index.js";
 
 /** Result of a signal phase run (pre or post). */
 export interface SignalPhaseResult<TContext = unknown, TData = unknown> {

package/src/core/SignalEvaluator.ts

@@ -9,16 +9,16 @@
  * @module SignalEvaluator
  */
 
-import type { AiProvider } from "../types/ai";
-import type { Event } from "../types/history";
-import type { SessionState } from "../types/session";
+import type { AiProvider } from "../types/ai.js";
+import type { Event } from "../types/history.js";
+import type { SessionState } from "../types/session.js";
 import type {
     Signal,
     SignalPredicate,
     SignalPredicateContext,
-} from "../types/signals";
-import { eventsToHistory, logger } from "../utils";
-import { splitWhenConditions, evaluateIfPredicates } from "../utils/condition";
+} from "../types/signals.js";
+import { eventsToHistory, logger } from "../utils/index.js";
+import { splitWhenConditions, evaluateIfPredicates } from "../utils/condition.js";
 
 // ──────────────────────────────────────────────────────────────────────────────
 // Types

package/src/core/SignalProcessor.ts

@@ -11,11 +11,11 @@
  * @module SignalProcessor
  */
 
-import type { AiProvider } from "../types/ai";
-import type { Event } from "../types/history";
-import { MessageRole as MessageRoleEnum } from "../types/history";
-import type { SessionState } from "../types/session";
-import type { Directive } from "../types/flow";
+import type { AiProvider } from "../types/ai.js";
+import type { Event } from "../types/history.js";
+import { MessageRole as MessageRoleEnum } from "../types/history.js";
+import type { SessionState } from "../types/session.js";
+import type { Directive } from "../types/flow.js";
 import type {
     Signal,
     SignalContext,
@@ -23,10 +23,10 @@ import type {
     SignalFiring,
     SignalPredicateContext,
     SignalTriggerState,
-} from "../types/signals";
-import type { SignalEvaluator } from "./SignalEvaluator";
-import { flow } from "./flow-namespace";
-import { logger } from "../utils";
+} from "../types/signals.js";
+import type { SignalEvaluator } from "./SignalEvaluator.js";
+import { flow } from "./flow-namespace.js";
+import { logger } from "../utils/index.js";
 
 /** Recorded on `SignalFiring.extractionError` when a matched extraction-mode
  * signal yields no payload (model omitted the field or returned null). */

package/src/core/Step.ts

@@ -9,15 +9,15 @@ import type {
   Instruction,
   Tool,
   PrepareResult,
-} from "../types";
-import type { SessionState } from "../types/session";
-import type { StepResult, BranchSpec, BranchResult } from "../types/flow";
-import { ToolScope, Template, TemplateContext } from "../types";
-import type { ConditionWhen, ConditionIf } from "../types/flow";
-import { generateStepId, logger } from "../utils";
-import { splitWhenConditions } from "../utils/condition";
-import { Agent } from './Agent'
-import { flow } from "./flow-namespace";
+} from "../types/index.js";
+import type { SessionState } from "../types/session.js";
+import type { StepResult, BranchSpec, BranchResult } from "../types/flow.js";
+import { ToolScope, Template, TemplateContext } from "../types/index.js";
+import type { ConditionWhen, ConditionIf } from "../types/flow.js";
+import { generateStepId, logger } from "../utils/index.js";
+import { splitWhenConditions } from "../utils/condition.js";
+import { Agent } from './Agent.js'
+import { flow } from "./flow-namespace.js";
 
 /**
  * Error thrown when a step's configuration violates auto-step constraints.

package/src/core/StepLifecycle.ts

@@ -14,12 +14,12 @@
  * verbatim replies, halts) are returned to the caller to act on.
  */
 
-import type { Directive, PrepareResult, SessionState, Tool } from "../types";
-import type { Flow } from "./Flow";
-import type { Step } from "./Step";
-import type { ToolManager } from "./ToolManager";
-import { flow } from "./flow-namespace";
-import { logger } from "../utils";
+import type { Directive, PrepareResult, SessionState, Tool } from "../types/index.js";
+import type { Flow } from "./Flow.js";
+import type { Step } from "./Step.js";
+import type { ToolManager } from "./ToolManager.js";
+import { flow } from "./flow-namespace.js";
+import { logger } from "../utils/index.js";
 
 /** Fields a caller can still act on after state writes have been applied. */
 const CONTROL_FIELDS = [

package/src/core/StreamingToolExecutor.ts

@@ -11,7 +11,7 @@
  */
 
 import log from "loglevel";
-import type { Directive } from "../types";
+import type { Directive } from "../types/index.js";
 import type {
     ToolCallRequest,
     ToolExecutionUpdate,
@@ -19,9 +19,9 @@ import type {
     ToolContext,
     Tool,
     TrackedTool,
-} from "../types/tool";
-import { evaluateToolGates } from "./toolGates";
-import { isToolResultLike, extractResultDirectives } from "../utils";
+} from "../types/tool.js";
+import { evaluateToolGates } from "./toolGates.js";
+import { isToolResultLike, extractResultDirectives } from "../utils/index.js";
 
 /** Options for the StreamingToolExecutor */
 interface StreamingToolExecutorOptions {

package/src/core/ToolLoopExecutor.ts

@@ -22,13 +22,13 @@ import type {
     HistoryItem,
     SessionState,
     ToolCallRequest,
-} from "../types";
-import type { Flow } from "./Flow";
-import type { Step } from "./Step";
-import type { ToolManager } from "./ToolManager";
-import { ResponseGenerationError } from "./ResponseGenerationError";
-import { flow } from "./flow-namespace";
-import { historyToEvents, logger, serializeToolResult, assistantMessage, toolMessage } from "../utils";
+} from "../types/index.js";
+import type { Flow } from "./Flow.js";
+import type { Step } from "./Step.js";
+import type { ToolManager } from "./ToolManager.js";
+import { ResponseGenerationError } from "./ResponseGenerationError.js";
+import { flow } from "./flow-namespace.js";
+import { historyToEvents, logger, serializeToolResult, assistantMessage, toolMessage } from "../utils/index.js";
 
 /**
  * One attempted tool execution, keyed by CALL (not tool name): parallel or

package/src/core/ToolManager.ts

@@ -15,16 +15,16 @@ import type {
   ToolCallRequest,
   ToolExecutionUpdate,
   Event,
-} from "../types";
-import type { Directive } from "../types/flow";
-import { ToolScope } from "../types";
-import { logger, isToolResultLike, extractResultDirectives } from "../utils";
+} from "../types/index.js";
+import type { Directive } from "../types/flow.js";
+import { ToolScope } from "../types/index.js";
+import { logger, isToolResultLike, extractResultDirectives } from "../utils/index.js";
 // Type-only import: ToolManager must not create a runtime cycle with Agent
-import type { Agent } from "./Agent";
-import { Flow } from "./Flow";
-import { Step } from "./Step";
-import { StreamingToolExecutor } from "./StreamingToolExecutor";
-import { evaluateToolGates } from "./toolGates";
+import type { Agent } from "./Agent.js";
+import { Flow } from "./Flow.js";
+import { Step } from "./Step.js";
+import { StreamingToolExecutor } from "./StreamingToolExecutor.js";
+import { evaluateToolGates } from "./toolGates.js";
 
 /**
  * Error thrown when tool creation fails

package/src/core/createAgent.ts

@@ -18,8 +18,8 @@
  * **Validates: Requirements 14.1–14.7**
  */
 
-import { Agent } from "./Agent";
-import type { AgentOptions } from "../types";
+import { Agent } from "./Agent.js";
+import type { AgentOptions } from "../types/index.js";
 
 /**
  * Create an Agent from a single options object.

package/src/core/flow-namespace.ts

@@ -5,9 +5,9 @@
  * Directives are plain object literals; this namespace provides runtime utilities only.
  */
 
-import type { Directive } from "../types/flow";
-import type { SessionState } from "../types/session";
-import { FlowConfigurationError } from "./Step";
+import type { Directive } from "../types/flow.js";
+import type { SessionState } from "../types/session.js";
+import { FlowConfigurationError } from "./Step.js";
 
 // ─── Position field metadata ─────────────────────────────────────────────────
 

package/src/core/toolGates.ts

@@ -9,8 +9,8 @@
  * ("when denied, handler is NOT invoked") was silently a no-op on one
  * transport. Centralizing the logic here keeps both executors in lockstep.
  */
-import type { Tool, ToolContext, ToolExecutionResult } from "../types/tool";
-import { logger } from "../utils";
+import type { Tool, ToolContext, ToolExecutionResult } from "../types/tool.js";
+import { logger } from "../utils/index.js";
 
 /**
  * Run a tool's pre-execution gates in order: `validateInput`, then