@standardagents/builder 0.39.0 → 0.40.0

package/dist/runtime.js

@@ -1489,6 +1489,9 @@ function normalizeToolCallMessageSequence(messages) {
   for (const message of messages) {
     const isAssistantToolCallMessage = message.role === "assistant" && Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
     if (!pending) {
+      if (message.role === "tool") {
+        continue;
+      }
       if (!isAssistantToolCallMessage) {
         normalized.push(message);
         continue;
@@ -6797,125 +6800,667 @@ var init_context = __esm({
   }
 });
 
-// src/agents/FlowEngine.ts
-var FlowEngine_exports = {};
-__export(FlowEngine_exports, {
-  FlowEngine: () => FlowEngine,
-  HookBlockedExecutionError: () => HookBlockedExecutionError
-});
-var IMMEDIATE_BOOTSTRAP_TOOL_NAME, HookBlockedExecutionError, FlowEngine;
-var init_FlowEngine = __esm({
-  "src/agents/FlowEngine.ts"() {
-    init_types();
-    init_StreamManager();
-    init_LLMRequest();
-    init_ToolExecutor();
-    init_context();
-    init_sessionTools();
-    init_ThreadStateImpl();
-    IMMEDIATE_BOOTSTRAP_TOOL_NAME = "bootstrap_immediate_subagent";
-    HookBlockedExecutionError = class extends Error {
-      constructor(message) {
-        super(message);
-        this.name = "HookBlockedExecutionError";
-      }
-    };
-    FlowEngine = class _FlowEngine {
-      static IMMEDIATE_SCOPED_ENV_CONTEXT_KEY = "__immediate_scoped_env_by_call_id";
-      /**
-       * Main execution entry point
-       * Executes an agent conversation until stopped or max steps reached
-       *
-       * By default, returns immediately with the stream while execution continues in background.
-       * Set awaitCompletion: true to wait for all steps and database writes to complete (required for sub-prompts).
-       *
-       * @param stateInput - Partial FlowState object with required fields
-       * @param awaitCompletion - If true, awaits full execution completion before returning (default: false)
-       */
-      static async execute(stateInput, awaitCompletion = false) {
-        const state = await this.initializeState(stateInput);
-        if (awaitCompletion) {
-          try {
-            await this.executeAsync(state, state.threadId);
-          } catch (error) {
-            console.error("Fatal error in executeAsync:", error);
-            await this.logError(state, error, "fatal_execution_error", "FlowEngine.executeAsync");
-            await this.settleTerminalFailure(state, error);
-            throw error;
-          }
-        } else {
-          this.executeAsync(state, state.threadId).catch(async (error) => {
-            console.error("Fatal error in executeAsync:", error);
-            await this.logError(state, error, "fatal_execution_error", "FlowEngine.executeAsync");
-            await this.settleTerminalFailure(state, error);
-          });
-        }
-        return {
-          messages: state.messageHistory,
-          stopped: state.stopped,
-          stoppedBy: state.stoppedBy,
-          stopReason: state.stopReason,
-          stopReasonCode: state.stopReasonCode,
-          sessionStopped: state.sessionStopped,
-          sessionStopResult: state.sessionStopResult,
-          stepCount: state.stepCount,
-          stream: state.stream.httpStream
-        };
-      }
-      /**
-       * Execute the agentic loop asynchronously
-       * This runs in the background while the stream is being consumed
-       */
-      /**
-       * Finalize logs left incomplete by a previous, abandoned execution.
-       *
-       * A log row is created with is_complete=0 the moment a request is sent and is
-       * only flipped complete by logSuccess/logError. If the Durable Object is
-       * evicted (or crashes) while awaiting a hung provider, neither runs and the row
-       * is stranded incomplete forever — which downstream reads as "the agent is
-       * still running". A fresh top-level execution proves the prior request is no
-       * longer in flight, so we mark any lingering incomplete logs as failed and tell
-       * connected clients so their "running" state clears. Best-effort: never let
-       * this cleanup block or fail the execution.
-       */
-      static async finalizeOrphanedLogs(state) {
-        try {
-          const rows = (await state.storage.sql.exec(
-            `SELECT id FROM logs WHERE is_complete = 0`
-          )).toArray();
-          if (rows.length === 0) return;
-          const error = "Request did not complete \u2014 the response was interrupted (the worker was evicted or the provider stalled) before it finished.";
-          const errorType = "interrupted_incomplete";
-          await state.storage.sql.exec(
-            `UPDATE logs SET is_complete = 1, error = ?1, error_type = ?2 WHERE is_complete = 0`,
-            error,
-            errorType
-          );
-          for (const row of rows) {
-            state.emitLog?.({
-              type: "log_data",
-              log_id: row.id,
-              data: { id: row.id, is_complete: true, error, error_type: errorType }
-            });
-          }
-          console.warn(
-            `[FlowEngine] Finalized ${rows.length} orphaned incomplete log(s) for thread ${state.threadId}`
-          );
-          await state.thread.instance.failPendingMessagesAndBroadcast?.();
-        } catch (err) {
-          console.error("[FlowEngine] Failed to finalize orphaned logs (non-fatal):", err);
-        }
+// src/packing/resolver.ts
+function parseQualifiedName(name) {
+  if (name.startsWith("@")) {
+    const firstSlash = name.indexOf("/");
+    if (firstSlash === -1) {
+      return [null, name];
+    }
+    const secondSlash = name.indexOf("/", firstSlash + 1);
+    if (secondSlash === -1) {
+      return [null, name];
+    }
+    return [name.substring(0, secondSlash), name.substring(secondSlash + 1)];
+  }
+  const separatorIndex = name.indexOf("/");
+  if (separatorIndex === -1) {
+    return [null, name];
+  }
+  return [name.substring(0, separatorIndex), name.substring(separatorIndex + 1)];
+}
+function qualifyName(packageId, shortName) {
+  return `${packageId}/${shortName}`;
+}
+function getShortName(name) {
+  const [, shortName] = parseQualifiedName(name);
+  return shortName;
+}
+function resolveTool(registry, name, namespace) {
+  const [pkgId, shortName] = parseQualifiedName(name);
+  if (pkgId !== null) {
+    const pkg = registry.packages[pkgId];
+    if (!pkg) {
+      throw new NamespaceResolutionError(
+        "tool",
+        name,
+        namespace,
+        `Package "${pkgId}" not found`
+      );
+    }
+    throw new NamespaceResolutionError(
+      "tool",
+      name,
+      namespace,
+      `Cannot access tool "${shortName}" from package "${pkgId}". Only entry point agents are accessible cross-package.`
+    );
+  }
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    if (!pkg) {
+      throw new NamespaceResolutionError(
+        "tool",
+        name,
+        namespace,
+        `Package "${namespace.packageId}" not found`
+      );
+    }
+    const loader2 = pkg.tools[shortName];
+    if (!loader2) {
+      throw new NamespaceResolutionError(
+        "tool",
+        name,
+        namespace,
+        `Tool "${shortName}" not found in package "${namespace.packageId}"`
+      );
+    }
+    return loader2;
+  }
+  const loader = registry.global.tools[shortName];
+  if (!loader) {
+    throw new NamespaceResolutionError(
+      "tool",
+      name,
+      namespace,
+      `Tool "${shortName}" not found in global namespace`
+    );
+  }
+  return loader;
+}
+function resolvePrompt(registry, name, namespace) {
+  const [pkgId, shortName] = parseQualifiedName(name);
+  if (pkgId !== null) {
+    throw new NamespaceResolutionError(
+      "prompt",
+      name,
+      namespace,
+      `Cannot access prompt "${shortName}" from package "${pkgId}". Prompts are package-internal.`
+    );
+  }
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    if (!pkg) {
+      throw new NamespaceResolutionError(
+        "prompt",
+        name,
+        namespace,
+        `Package "${namespace.packageId}" not found`
+      );
+    }
+    const loader2 = pkg.prompts[shortName];
+    if (!loader2) {
+      throw new NamespaceResolutionError(
+        "prompt",
+        name,
+        namespace,
+        `Prompt "${shortName}" not found in package "${namespace.packageId}"`
+      );
+    }
+    return loader2;
+  }
+  const loader = registry.global.prompts[shortName];
+  if (!loader) {
+    throw new NamespaceResolutionError(
+      "prompt",
+      name,
+      namespace,
+      `Prompt "${shortName}" not found in global namespace`
+    );
+  }
+  return loader;
+}
+function resolveModel(registry, name, namespace) {
+  const [possiblePkgId, shortName] = parseQualifiedName(name);
+  if (possiblePkgId !== null && registry.packages[possiblePkgId]) {
+    throw new NamespaceResolutionError(
+      "model",
+      name,
+      namespace,
+      `Cannot use qualified model name "${name}". Models must be unqualified. If this is a provider model name, ensure no package named "${possiblePkgId}" exists.`
+    );
+  }
+  const lookupName = name;
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    if (pkg) {
+      const loader2 = pkg.models[lookupName];
+      if (loader2) {
+        return loader2;
       }
-      /**
-       * A terminal execution failure ended the run without a normal assistant
-       * reply. Persist a durable failed assistant message + settle pending
-       * messages so every connected head lands on a visible end state instead of
-       * a stuck "Working" spinner. Best-effort — never masks the original error.
-       */
-      static async settleTerminalFailure(state, error) {
-        try {
-          const detail = error instanceof Error ? error.message : String(error);
-          await state.thread.instance.settleTerminalFailure?.(
+    }
+    const globalLoader = registry.global.models[lookupName];
+    if (globalLoader) {
+      return globalLoader;
+    }
+    throw new NamespaceResolutionError(
+      "model",
+      name,
+      namespace,
+      `Model "${lookupName}" not found in package "${namespace.packageId}" or global namespace`
+    );
+  }
+  const loader = registry.global.models[lookupName];
+  if (!loader) {
+    throw new NamespaceResolutionError(
+      "model",
+      name,
+      namespace,
+      `Model "${lookupName}" not found in global namespace`
+    );
+  }
+  return loader;
+}
+function resolveAgent(registry, name, namespace) {
+  const [pkgId, shortName] = parseQualifiedName(name);
+  if (pkgId !== null) {
+    const pkg = registry.packages[pkgId];
+    if (!pkg) {
+      throw new NamespaceResolutionError(
+        "agent",
+        name,
+        namespace,
+        `Package "${pkgId}" not found`
+      );
+    }
+    if (!pkg.entryAgents.includes(shortName)) {
+      throw new NamespaceResolutionError(
+        "agent",
+        name,
+        namespace,
+        `Agent "${shortName}" is not an entry point in package "${pkgId}"`
+      );
+    }
+    const loader = pkg.agents[shortName];
+    if (!loader) {
+      throw new NamespaceResolutionError(
+        "agent",
+        name,
+        namespace,
+        `Agent "${shortName}" not found in package "${pkgId}"`
+      );
+    }
+    return loader;
+  }
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    if (!pkg) {
+      throw new NamespaceResolutionError(
+        "agent",
+        name,
+        namespace,
+        `Package "${namespace.packageId}" not found`
+      );
+    }
+    const loader = pkg.agents[shortName];
+    if (!loader) {
+      throw new NamespaceResolutionError(
+        "agent",
+        name,
+        namespace,
+        `Agent "${shortName}" not found in package "${namespace.packageId}"`
+      );
+    }
+    return loader;
+  }
+  const globalLoader = registry.global.agents[shortName];
+  if (globalLoader) {
+    return globalLoader;
+  }
+  for (const [pkgId2, pkg] of Object.entries(registry.packages)) {
+    if (pkg.entryAgents.includes(shortName)) {
+      const loader = pkg.agents[shortName];
+      if (loader) {
+        return loader;
+      }
+    }
+  }
+  throw new NamespaceResolutionError(
+    "agent",
+    name,
+    namespace,
+    `Agent "${shortName}" not found in global namespace`
+  );
+}
+function resolveHook(registry, name, namespace) {
+  const [pkgId, shortName] = parseQualifiedName(name);
+  if (pkgId !== null) {
+    throw new NamespaceResolutionError(
+      "hook",
+      name,
+      namespace,
+      `Cannot use qualified hook name "${name}". Hooks must be unqualified.`
+    );
+  }
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    if (pkg) {
+      const loader2 = pkg.hooks[shortName];
+      if (loader2) {
+        return loader2;
+      }
+    }
+    return null;
+  }
+  const loader = registry.global.hooks[shortName];
+  return loader || null;
+}
+function getVisibleToolNames(registry, namespace) {
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    return pkg ? Object.keys(pkg.tools) : [];
+  }
+  return Object.keys(registry.global.tools);
+}
+function getVisibleAgentNames(registry, namespace) {
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    const ownAgents = pkg ? Object.keys(pkg.agents) : [];
+    const otherEntryPoints = Object.entries(registry.packages).filter(([id]) => id !== namespace.packageId).flatMap(
+      ([pkgId, pkg2]) => pkg2.entryAgents.map((name) => qualifyName(pkgId, name))
+    );
+    return [...ownAgents, ...otherEntryPoints];
+  }
+  const globalAgents = Object.keys(registry.global.agents);
+  const entryPoints = Object.values(registry.packages).flatMap((pkg) => pkg.entryAgents);
+  return [.../* @__PURE__ */ new Set([...globalAgents, ...entryPoints])];
+}
+function getVisiblePromptNames(registry, namespace) {
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    return pkg ? Object.keys(pkg.prompts) : [];
+  }
+  return Object.keys(registry.global.prompts);
+}
+function getVisibleModelNames(registry, namespace) {
+  if (namespace.type === "packed") {
+    const pkg = registry.packages[namespace.packageId];
+    const ownModels = pkg ? Object.keys(pkg.models) : [];
+    const globalModels = Object.keys(registry.global.models);
+    return [.../* @__PURE__ */ new Set([...ownModels, ...globalModels])];
+  }
+  return Object.keys(registry.global.models);
+}
+function createNamespaceContext(agentDef) {
+  if (agentDef?.__package) {
+    return { type: "packed", packageId: agentDef.__package.packageId };
+  }
+  return { type: "global" };
+}
+function isQualifiedName(name) {
+  if (name.startsWith("@")) {
+    const firstSlash = name.indexOf("/");
+    if (firstSlash === -1) return false;
+    return name.indexOf("/", firstSlash + 1) !== -1;
+  }
+  return name.includes("/");
+}
+var NamespaceResolutionError;
+var init_resolver = __esm({
+  "src/packing/resolver.ts"() {
+    NamespaceResolutionError = class extends Error {
+      constructor(itemType, itemName, namespace, message) {
+        super(message);
+        this.itemType = itemType;
+        this.itemName = itemName;
+        this.namespace = namespace;
+        this.name = "NamespaceResolutionError";
+      }
+    };
+  }
+});
+
+// src/agents/ParentHookResolver.ts
+function packageOf(definition) {
+  return definition?.__package ?? definition?._package;
+}
+function qualifyWithinPackage(name, packageId) {
+  if (!packageId || parseQualifiedName(name)[0] !== null) {
+    return name;
+  }
+  return qualifyName(packageId, name);
+}
+function promptHooks(prompt) {
+  if (!prompt) return [];
+  return Array.isArray(prompt.hooks) ? prompt.hooks : Array.isArray(prompt._hooks) ? prompt._hooks : [];
+}
+function promptTools(prompt) {
+  if (!prompt) return [];
+  return Array.isArray(prompt.tools) ? prompt.tools : Array.isArray(prompt._tools) ? prompt._tools : [];
+}
+function relationDescriptor(entry) {
+  if (typeof entry === "string") {
+    return {
+      relationshipName: entry,
+      implementingAgent: entry,
+      explicitlyAgentShaped: false
+    };
+  }
+  if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+    return null;
+  }
+  const config = entry;
+  if (typeof config.name !== "string" || !config.name) {
+    return null;
+  }
+  const implementingAgent = typeof config.agent === "string" && config.agent ? config.agent : config.name;
+  const explicitlyAgentShaped = "agent" in config || "blocking" in config || "resumable" in config || "immediate" in config || "parentCommunication" in config || "hidden" in config;
+  return {
+    relationshipName: config.name,
+    implementingAgent,
+    optional: typeof config.optional === "string" ? config.optional : void 0,
+    explicitlyAgentShaped
+  };
+}
+function hookLoader(host, owner, hookId) {
+  const ownerPackage = packageOf(owner);
+  if (!ownerPackage) {
+    return host.hooks()[hookId];
+  }
+  return host.registry?.()?.packages?.[ownerPackage.packageId]?.hooks?.[hookId];
+}
+async function loadBinding(host, owner, hookId, hookType, context, required) {
+  const loader = hookLoader(host, owner, hookId);
+  if (!loader) {
+    if (required) {
+      throw new Error(
+        `Required parent hook '${hookId}' was not found in the child agent namespace`
+      );
+    }
+    return null;
+  }
+  let loaded;
+  try {
+    loaded = await loader();
+  } catch (error) {
+    if (required) throw error;
+    console.error(`[Hooks] Failed to load hook '${hookId}':`, error);
+    return null;
+  }
+  if (!loaded) {
+    if (required) {
+      throw new Error(`Required parent hook '${hookId}' did not export a hook definition`);
+    }
+    return null;
+  }
+  if (typeof loaded.id !== "string" || loaded.id !== hookId) {
+    if (required) {
+      throw new Error(`Required parent hook '${hookId}' exported a mismatched hook ID`);
+    }
+    return null;
+  }
+  if (typeof loaded.execute !== "function") {
+    if (required) {
+      throw new Error(`Required parent hook '${hookId}' did not export an execute function`);
+    }
+    return null;
+  }
+  if (USER_HOOK_NAMES.has(loaded.hook)) {
+    if (required) {
+      throw new Error(
+        `Required parent hook '${hookId}' uses user-scoped hook type '${loaded.hook}'`
+      );
+    }
+    return null;
+  }
+  if (!THREAD_HOOK_NAMES.has(loaded.hook)) {
+    if (required) {
+      throw new Error(`Required parent hook '${hookId}' exported invalid hook type '${loaded.hook}'`);
+    }
+    return null;
+  }
+  if (loaded.hook !== hookType) {
+    return null;
+  }
+  return {
+    id: hookId,
+    hook: hookType,
+    execute: loaded.execute,
+    context
+  };
+}
+async function resolveHooksForPrompt(input, hookType) {
+  const agent = input.agent ?? await input.host.loadAgent(input.agentName);
+  const agentPackage = packageOf(agent);
+  const unqualifiedPromptName = input.promptName ?? agent.sideA?.prompt;
+  const resolvedPromptName = unqualifiedPromptName ? qualifyWithinPackage(unqualifiedPromptName, agentPackage?.packageId) : void 0;
+  const prompt = input.prompt ?? (resolvedPromptName ? await input.host.loadPrompt(resolvedPromptName) : void 0);
+  const promptName = prompt?.name ?? prompt?.id ?? resolvedPromptName ?? "unknown_prompt";
+  const before = [];
+  const after = [];
+  for (const entry of promptTools(prompt)) {
+    const relation = relationDescriptor(entry);
+    if (!relation) continue;
+    if (relation.optional && input.isOptionalRelationshipEnabled && !await input.isOptionalRelationshipEnabled(relation.optional)) {
+      continue;
+    }
+    const promptPackage = packageOf(prompt) ?? agentPackage;
+    const childReference = qualifyWithinPackage(
+      relation.implementingAgent,
+      promptPackage?.packageId
+    );
+    let child;
+    try {
+      child = await input.host.loadAgent(childReference);
+    } catch (error) {
+      if (relation.explicitlyAgentShaped) throw error;
+      continue;
+    }
+    if (child.type !== "dual_ai") continue;
+    if (child.parentHooks !== void 0 && child.exposeAsTool !== true) {
+      throw new Error(
+        `Child agent '${childReference}' declares parentHooks but is not exposed as a tool`
+      );
+    }
+    if (child.parentHooks !== void 0 && !Array.isArray(child.parentHooks)) {
+      throw new Error(`Child agent '${childReference}' has an invalid parentHooks declaration`);
+    }
+    const requirements = child.parentHooks ?? [];
+    const seenRequirements = /* @__PURE__ */ new Set();
+    for (const requirement of requirements) {
+      if (!requirement || typeof requirement !== "object" || typeof requirement.hook !== "string" || !requirement.hook || typeof requirement.reason !== "string" || !requirement.reason.trim() || requirement.stage !== void 0 && requirement.stage !== "before_parent" && requirement.stage !== "after_parent" || seenRequirements.has(requirement.hook)) {
+        throw new Error(`Child agent '${childReference}' has an invalid parentHooks requirement`);
+      }
+      seenRequirements.add(requirement.hook);
+      const loaded = await loadBinding(
+        input.host,
+        child,
+        requirement.hook,
+        hookType,
+        {
+          source: {
+            kind: "child",
+            relationshipName: relation.relationshipName,
+            agentName: childReference,
+            package: packageOf(child)
+          }
+        },
+        true
+      );
+      if (!loaded) continue;
+      if ((requirement.stage ?? "after_parent") === "before_parent") {
+        before.push(loaded);
+      } else {
+        after.push(loaded);
+      }
+    }
+  }
+  const promptHookIds = promptHooks(prompt);
+  const promptOwnsBaseHooks = promptHookIds.length > 0 && prompt !== void 0;
+  const baseOwner = promptOwnsBaseHooks ? prompt : agent;
+  const baseIds = promptHookIds.length > 0 ? promptHookIds : Array.isArray(agent.hooks) ? agent.hooks : [];
+  const baseContext = promptOwnsBaseHooks ? { source: { kind: "prompt", promptName } } : { source: { kind: "agent", agentName: input.agentName } };
+  const base = [];
+  for (const hookId of baseIds) {
+    const loaded = await loadBinding(
+      input.host,
+      baseOwner,
+      hookId,
+      hookType,
+      baseContext,
+      false
+    );
+    if (loaded) base.push(loaded);
+  }
+  return [...before, ...base, ...after];
+}
+var USER_HOOK_NAMES, THREAD_HOOK_NAMES;
+var init_ParentHookResolver = __esm({
+  "src/agents/ParentHookResolver.ts"() {
+    init_resolver();
+    USER_HOOK_NAMES = /* @__PURE__ */ new Set([
+      "user_client_attached",
+      "user_client_detached",
+      "user_value_changed"
+    ]);
+    THREAD_HOOK_NAMES = /* @__PURE__ */ new Set([
+      "after_thread_created",
+      "after_subagent_created",
+      "after_system_message",
+      "filter_messages",
+      "prefilter_llm_history",
+      "before_create_message",
+      "after_create_message",
+      "before_update_message",
+      "after_update_message",
+      "before_store_tool_result",
+      "after_tool_call_success",
+      "after_tool_call_failure",
+      "tool_call_started",
+      "tool_call_done"
+    ]);
+  }
+});
+
+// src/agents/FlowEngine.ts
+var FlowEngine_exports = {};
+__export(FlowEngine_exports, {
+  FlowEngine: () => FlowEngine,
+  HookBlockedExecutionError: () => HookBlockedExecutionError
+});
+var IMMEDIATE_BOOTSTRAP_TOOL_NAME, HookBlockedExecutionError, FlowEngine;
+var init_FlowEngine = __esm({
+  "src/agents/FlowEngine.ts"() {
+    init_types();
+    init_StreamManager();
+    init_LLMRequest();
+    init_ToolExecutor();
+    init_context();
+    init_sessionTools();
+    init_ThreadStateImpl();
+    init_ParentHookResolver();
+    IMMEDIATE_BOOTSTRAP_TOOL_NAME = "bootstrap_immediate_subagent";
+    HookBlockedExecutionError = class extends Error {
+      constructor(message) {
+        super(message);
+        this.name = "HookBlockedExecutionError";
+      }
+    };
+    FlowEngine = class _FlowEngine {
+      static IMMEDIATE_SCOPED_ENV_CONTEXT_KEY = "__immediate_scoped_env_by_call_id";
+      /**
+       * Main execution entry point
+       * Executes an agent conversation until stopped or max steps reached
+       *
+       * By default, returns immediately with the stream while execution continues in background.
+       * Set awaitCompletion: true to wait for all steps and database writes to complete (required for sub-prompts).
+       *
+       * @param stateInput - Partial FlowState object with required fields
+       * @param awaitCompletion - If true, awaits full execution completion before returning (default: false)
+       */
+      static async execute(stateInput, awaitCompletion = false) {
+        const state = await this.initializeState(stateInput);
+        if (awaitCompletion) {
+          try {
+            await this.executeAsync(state, state.threadId);
+          } catch (error) {
+            console.error("Fatal error in executeAsync:", error);
+            await this.logError(state, error, "fatal_execution_error", "FlowEngine.executeAsync");
+            await this.settleTerminalFailure(state, error);
+            throw error;
+          }
+        } else {
+          this.executeAsync(state, state.threadId).catch(async (error) => {
+            console.error("Fatal error in executeAsync:", error);
+            await this.logError(state, error, "fatal_execution_error", "FlowEngine.executeAsync");
+            await this.settleTerminalFailure(state, error);
+          });
+        }
+        return {
+          messages: state.messageHistory,
+          stopped: state.stopped,
+          stoppedBy: state.stoppedBy,
+          stopReason: state.stopReason,
+          stopReasonCode: state.stopReasonCode,
+          sessionStopped: state.sessionStopped,
+          sessionStopResult: state.sessionStopResult,
+          stepCount: state.stepCount,
+          stream: state.stream.httpStream
+        };
+      }
+      /**
+       * Execute the agentic loop asynchronously
+       * This runs in the background while the stream is being consumed
+       */
+      /**
+       * Finalize logs left incomplete by a previous, abandoned execution.
+       *
+       * A log row is created with is_complete=0 the moment a request is sent and is
+       * only flipped complete by logSuccess/logError. If the Durable Object is
+       * evicted (or crashes) while awaiting a hung provider, neither runs and the row
+       * is stranded incomplete forever — which downstream reads as "the agent is
+       * still running". A fresh top-level execution proves the prior request is no
+       * longer in flight, so we mark any lingering incomplete logs as failed and tell
+       * connected clients so their "running" state clears. Best-effort: never let
+       * this cleanup block or fail the execution.
+       */
+      static async finalizeOrphanedLogs(state) {
+        try {
+          const rows = (await state.storage.sql.exec(
+            `SELECT id FROM logs WHERE is_complete = 0`
+          )).toArray();
+          if (rows.length === 0) return;
+          const error = "Request did not complete \u2014 the response was interrupted (the worker was evicted or the provider stalled) before it finished.";
+          const errorType = "interrupted_incomplete";
+          await state.storage.sql.exec(
+            `UPDATE logs SET is_complete = 1, error = ?1, error_type = ?2 WHERE is_complete = 0`,
+            error,
+            errorType
+          );
+          for (const row of rows) {
+            state.emitLog?.({
+              type: "log_data",
+              log_id: row.id,
+              data: { id: row.id, is_complete: true, error, error_type: errorType }
+            });
+          }
+          console.warn(
+            `[FlowEngine] Finalized ${rows.length} orphaned incomplete log(s) for thread ${state.threadId}`
+          );
+          await state.thread.instance.failPendingMessagesAndBroadcast?.();
+        } catch (err) {
+          console.error("[FlowEngine] Failed to finalize orphaned logs (non-fatal):", err);
+        }
+      }
+      /**
+       * A terminal execution failure ended the run without a normal assistant
+       * reply. Persist a durable failed assistant message + settle pending
+       * messages so every connected head lands on a visible end state instead of
+       * a stuck "Working" spinner. Best-effort — never masks the original error.
+       */
+      static async settleTerminalFailure(state, error) {
+        try {
+          const detail = error instanceof Error ? error.message : String(error);
+          await state.thread.instance.settleTerminalFailure?.(
             `The agent run failed unexpectedly: ${detail}`,
             state.threadId
           );
@@ -7155,7 +7700,8 @@ This usually points to something I can't fix from here \u2014 for example the wo
           _variables: def.variables ?? [],
           _env: def.env ?? def.tenvs ?? {},
           _requiredSchema: def.requiredSchema ?? null,
-          _hooks: def.hooks ?? []
+          _hooks: def.hooks ?? [],
+          _package: def.__package
         };
       }
       /**
@@ -7545,6 +8091,8 @@ This usually points to something I can't fix from here \u2014 for example the wo
             type: newAgentDef.type,
             created_at: Date.now(),
             max_session_turns: newAgentDef.maxSessionTurns ?? null,
+            hooks: newAgentDef.hooks ?? [],
+            _package: newAgentDef.__package,
             side_a_label: newAgentDef.sideA?.label ?? null,
             side_a_agent_prompt: newAgentDef.sideA?.prompt ?? null,
             side_a_stop_on_response: newAgentDef.sideA?.stopOnResponse ?? true,
@@ -7635,28 +8183,12 @@ This usually points to something I can't fix from here \u2014 for example the wo
           state.promptPath = [sideAPrompt.name];
           state.pendingImmediateAfterHandoff = true;
           if (userMessageContent || userMessageAttachments) {
-            const handoffMessageId = crypto.randomUUID();
-            const handoffTimestamp = Date.now() * 1e3;
-            const handoffMessage = {
-              id: handoffMessageId,
-              role: "user",
-              content: userMessageContent || "",
-              created_at: handoffTimestamp,
-              attachments: userMessageAttachments
-            };
-            await state.storage.sql.exec(
-              `INSERT INTO messages (id, role, content, attachments, created_at, prompt) VALUES (?, ?, ?, ?, ?, ?)`,
-              handoffMessage.id,
-              handoffMessage.role,
-              handoffMessage.content,
-              handoffMessage.attachments || null,
-              handoffMessage.created_at,
+            await this.persistHandoffUserMessage(
+              state,
+              userMessageContent || "",
+              userMessageAttachments,
               sideAPrompt.name
             );
-            state.messageHistory.push(handoffMessage);
-            if (state.emitMessage) {
-              state.emitMessage(handoffMessage);
-            }
           }
           state.pendingHandoff = void 0;
           state.emitTelemetry?.({
@@ -7671,6 +8203,37 @@ This usually points to something I can't fix from here \u2014 for example the wo
           throw error;
         }
       }
+      /**
+       * Persist the user message that rides an agent handoff, applying the
+       * create-message lifecycle hooks like every other insertion path.
+       */
+      static async persistHandoffUserMessage(state, content, attachments, promptName) {
+        let handoffMessage = {
+          id: crypto.randomUUID(),
+          role: "user",
+          content,
+          created_at: Date.now() * 1e3,
+          status: "completed",
+          attachments: attachments ?? null
+        };
+        handoffMessage = await this.runBeforeCreateMessageHook(state, handoffMessage);
+        await state.storage.sql.exec(
+          `INSERT INTO messages (id, role, content, attachments, created_at, status, silent, prompt) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
+          handoffMessage.id,
+          handoffMessage.role,
+          handoffMessage.content,
+          handoffMessage.attachments || null,
+          handoffMessage.created_at,
+          handoffMessage.status ?? "completed",
+          handoffMessage.silent ? 1 : 0,
+          promptName
+        );
+        state.messageHistory.push(handoffMessage);
+        await this.runAfterCreateMessageHook(state, handoffMessage);
+        if (state.emitMessage) {
+          state.emitMessage(handoffMessage);
+        }
+      }
       static isEnabledEnvFlag(value) {
         if (value === null || value === void 0) return false;
         const normalized = value.trim().toLowerCase();
@@ -7690,7 +8253,7 @@ This usually points to something I can't fix from here \u2014 for example the wo
             return null;
           }
           return await stub.resolveThreadEnv({
-            threadId: state.threadId,
+            threadId: state.thread.metadata.id,
             property,
             promptName: state.prompt?.name
           });
@@ -8212,8 +8775,8 @@ This usually points to something I can't fix from here \u2014 for example the wo
         state.context[key] = existing;
       }
       static async runImmediateToolsIfNeeded(state) {
-        const promptTools = Array.isArray(state.prompt._tools) ? state.prompt._tools : [];
-        if (promptTools.length === 0) {
+        const promptTools2 = Array.isArray(state.prompt._tools) ? state.prompt._tools : [];
+        if (promptTools2.length === 0) {
           return false;
         }
         if (!state.immediatePromptRuns) {
@@ -8249,7 +8812,7 @@ This usually points to something I can't fix from here \u2014 for example the wo
             (activeInstanceCounts.get(child.name) ?? 0) + 1
           );
         }
-        for (const toolConfig of promptTools) {
+        for (const toolConfig of promptTools2) {
           if (!toolConfig || typeof toolConfig !== "object") {
             continue;
           }
@@ -8415,10 +8978,10 @@ This usually points to something I can't fix from here \u2014 for example the wo
        * model's to clean up, and terminate_subagent on an infrastructure child
        * kills work the runtime depends on. Static and pure for direct testing.
        */
-      static filterModelVisibleSubagents(registry, promptTools) {
+      static filterModelVisibleSubagents(registry, promptTools2) {
         if (registry.length === 0) return registry;
         const hidden = /* @__PURE__ */ new Set();
-        for (const config of promptTools ?? []) {
+        for (const config of promptTools2 ?? []) {
           if (typeof config === "object" && config !== null && "name" in config && config.hidden === true) {
             hidden.add(config.name);
           }
@@ -8568,7 +9131,16 @@ This usually points to something I can't fix from here \u2014 for example the wo
           role: "system",
           content: systemPromptText
         });
-        const completedMessages = state.messageHistory.filter(
+        const historySnapshot = state.messageHistory.filter(
+          (msg) => msg.status !== "pending"
+        );
+        const filteredHistory = await this.runFilterMessagesHook(
+          state.thread.instance,
+          state,
+          historySnapshot
+        );
+        const contextHistory = this.filterOrphanedToolCalls(filteredHistory);
+        const completedMessages = contextHistory.filter(
           (msg) => msg.status !== "pending"
         );
         const recentMessageThreshold = state.prompt.recentImageThreshold ?? 10;
@@ -9439,8 +10011,8 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         try {
           const nativeTools = await this.loadNativeTools(state);
           tools.push(...nativeTools);
-          const promptTools = await this.loadPromptTools(state);
-          tools.push(...promptTools);
+          const promptTools2 = await this.loadPromptTools(state);
+          tools.push(...promptTools2);
           const agentTools = await this.loadAgentTools(state);
           tools.push(...agentTools);
           const toolNameSources = /* @__PURE__ */ new Map();
@@ -9449,7 +10021,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             sources.add("native tool");
             toolNameSources.set(tool.function.name, sources);
           }
-          for (const tool of promptTools) {
+          for (const tool of promptTools2) {
             const sources = toolNameSources.get(tool.function.name) || /* @__PURE__ */ new Set();
             sources.add("prompt");
             toolNameSources.set(tool.function.name, sources);
@@ -9591,24 +10163,8 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
       // Hook Resolution Helpers
       // ==========================================================================
       /**
-       * Get the list of hook IDs that should run for the current context.
-       * Resolution: prompt hooks > agent hooks > empty array
-       *
-       * @param state - Flow state with prompt and agent configuration
-       * @returns Array of hook IDs to execute
-       */
-      static getActiveHookIds(state) {
-        if (state.prompt?._hooks !== void 0 && state.prompt._hooks.length > 0) {
-          return state.prompt._hooks;
-        }
-        if (state.agentConfig.hooks !== void 0 && state.agentConfig.hooks.length > 0) {
-          return state.agentConfig.hooks;
-        }
-        return [];
-      }
-      /**
-       * Get hooks of a specific type from the active hook IDs.
-       * Returns typed hook executors in the order they appear in the hooks array.
+       * Resolve hooks of a specific type for the active prompt, including required
+       * hooks contributed automatically by its enabled direct child agents.
        *
        * @template K - The hook type name (ensures type-safe executors)
        * @param state - Flow state with hook configuration
@@ -9616,24 +10172,17 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
        * @returns Array of typed hook executor functions
        */
       static async getHooksForType(state, hookType) {
-        const hookIds = this.getActiveHookIds(state);
-        if (hookIds.length === 0) return [];
-        const hooksRegistry = state.thread.instance.hooks();
-        if (!hooksRegistry) return [];
-        const executors = [];
-        for (const hookId of hookIds) {
-          const hookLoader = hooksRegistry[hookId];
-          if (!hookLoader) continue;
-          try {
-            const hookDef = await hookLoader();
-            if (hookDef && hookDef.hook === hookType) {
-              executors.push(hookDef.execute);
-            }
-          } catch (error) {
-            console.error(`[Hooks] Failed to load hook '${hookId}':`, error);
-          }
-        }
-        return executors;
+        return await resolveHooksForPrompt(
+          {
+            host: state.thread.instance,
+            agentName: state.agentConfig.id,
+            agent: state.agentConfig,
+            promptName: state.prompt?.id,
+            prompt: state.prompt,
+            isOptionalRelationshipEnabled: (envName) => this.isOptionalToolEnabled(state, envName)
+          },
+          hookType
+        );
       }
       // ==========================================================================
       // Hook Runner Methods
@@ -9651,9 +10200,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         if (executors.length === 0) return messages;
         let result = messages;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            result = await executor(threadState, result);
+            result = await execute(threadState, result, context);
           } catch (error) {
             if (error && typeof error === "object" && error.block === true) {
               throw new HookBlockedExecutionError(error instanceof Error ? error.message : String(error));
@@ -9671,9 +10220,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         if (executors.length === 0) return systemMessage;
         let result = systemMessage;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            const next = await executor(threadState, result);
+            const next = await execute(threadState, result, context);
             if (next !== null && next !== void 0) {
               result = next;
             }
@@ -9690,9 +10239,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         const executors = await this.getHooksForType(state, "after_subagent_created");
         if (executors.length === 0) return;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            await executor(threadState, childState);
+            await execute(threadState, childState, context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running after_subagent_created hook:", error);
           }
@@ -9706,20 +10255,27 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
        * @param message - Message object to be created
        * @returns Processed message (or original if hook doesn't exist/fails)
        */
-      static async runBeforeCreateMessageHook(state, message) {
+      static async runBeforeCreateMessageHook(state, message, threadStateOverride, options) {
         const executors = await this.getHooksForType(state, "before_create_message");
         if (executors.length === 0) return message;
         let result = message;
-        const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        const threadState = threadStateOverride ?? ThreadStateImpl.fromFlowState(state);
+        for (const { execute, context } of executors) {
           try {
-            const hooked = await executor(threadState, _FlowEngine.rowToHookMessage(result));
+            const hooked = await execute(
+              threadState,
+              _FlowEngine.rowToHookMessage(result),
+              context
+            );
             result = {
               ...result,
               ...hooked,
               attachments: hooked.attachments === void 0 ? result.attachments : hooked.attachments === null ? null : typeof hooked.attachments === "string" ? hooked.attachments : JSON.stringify(hooked.attachments)
             };
           } catch (error) {
+            if (options?.propagateHookErrors) {
+              throw error;
+            }
             console.error("[Hooks] \u2717 Error running before_create_message hook:", error);
           }
         }
@@ -9732,13 +10288,13 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
        * @param state - Flow state with execution context
        * @param message - The created message object
        */
-      static async runAfterCreateMessageHook(state, message) {
+      static async runAfterCreateMessageHook(state, message, threadStateOverride) {
         const executors = await this.getHooksForType(state, "after_create_message");
         if (executors.length === 0) return;
-        const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        const threadState = threadStateOverride ?? ThreadStateImpl.fromFlowState(state);
+        for (const { execute, context } of executors) {
           try {
-            await executor(threadState, _FlowEngine.rowToHookMessage(message));
+            await execute(threadState, _FlowEngine.rowToHookMessage(message), context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running after_create_message hook:", error);
           }
@@ -9779,9 +10335,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         if (executors.length === 0) return updates;
         let result = updates;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            result = await executor(threadState, messageId, result);
+            result = await execute(threadState, messageId, result, context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running before_update_message hook:", error);
           }
@@ -9799,9 +10355,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         const executors = await this.getHooksForType(state, "after_update_message");
         if (executors.length === 0) return;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            await executor(threadState, _FlowEngine.rowToHookMessage(message));
+            await execute(threadState, _FlowEngine.rowToHookMessage(message), context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running after_update_message hook:", error);
           }
@@ -9821,9 +10377,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         if (executors.length === 0) return toolResult;
         let result = toolResult;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            result = await executor(threadState, toolCall, result);
+            result = await execute(threadState, toolCall, result, context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running before_store_tool_result hook:", error);
           }
@@ -9843,10 +10399,10 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         if (executors.length === 0) return toolResult;
         let result = toolResult;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           if (result === null) break;
           try {
-            result = await executor(threadState, toolCall, result);
+            result = await execute(threadState, toolCall, result, context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running after_tool_call_success hook:", error);
           }
@@ -9866,10 +10422,10 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         if (executors.length === 0) return toolResult;
         let result = toolResult;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           if (result === null) break;
           try {
-            result = await executor(threadState, toolCall, result);
+            result = await execute(threadState, toolCall, result, context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running after_tool_call_failure hook:", error);
           }
@@ -9899,9 +10455,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         const executors = await this.getHooksForType(state, "tool_call_started");
         if (executors.length === 0) return;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            await executor(threadState, toolCall, progress);
+            await execute(threadState, toolCall, progress, context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running tool_call_started hook:", error);
           }
@@ -9929,9 +10485,9 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         const executors = await this.getHooksForType(state, "tool_call_done");
         if (executors.length === 0) return;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
-            await executor(threadState, toolCall, toolResult);
+            await execute(threadState, toolCall, toolResult, context);
           } catch (error) {
             console.error("[Hooks] \u2717 Error running tool_call_done hook:", error);
           }
@@ -10236,7 +10792,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
           }
           existingPathMessages.add(content);
           const attachmentsJson = JSON.stringify([ref]);
-          const silentMessage = {
+          let silentMessage = {
             id: crypto.randomUUID(),
             role: sourceMessage.role,
             content,
@@ -10247,6 +10803,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             parent_id: parentId,
             depth
           };
+          silentMessage = await this.runBeforeCreateMessageHook(state, silentMessage);
           await state.storage.sql.exec(
             `
         INSERT INTO messages (
@@ -10257,15 +10814,16 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             silentMessage.id,
             silentMessage.role,
             silentMessage.content,
-            attachmentsJson,
-            1,
+            silentMessage.attachments ?? null,
+            silentMessage.silent ? 1 : 0,
             silentMessage.created_at,
-            silentMessage.status,
+            silentMessage.status ?? "completed",
             silentMessage.parent_id,
             silentMessage.depth,
             currentPrompt
           );
           state.messageHistory.push(silentMessage);
+          await this.runAfterCreateMessageHook(state, silentMessage);
           if (state.emitMessage) {
             state.emitMessage(silentMessage);
           }
@@ -10804,7 +11362,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
        */
       static async loadMessageHistory(state) {
         const storage = state.storage;
-        const thread = state.thread;
+        state.thread;
         const includeParentHistory = state.prompt.include_chat ?? true;
         const includeToolCalls = state.prompt.include_past_tools ?? true;
         try {
@@ -10840,8 +11398,11 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             rows = cursor.toArray();
           }
           if (state.extraMessages && state.extraMessages.length > 0) {
-            rows.push(...state.extraMessages);
-            rows.sort((a, b) => a.created_at - b.created_at || (a.id < b.id ? -1 : a.id > b.id ? 1 : 0));
+            const persistedIds = new Set(rows.map((row) => row.id));
+            rows.push(
+              ...state.extraMessages.filter((entry) => !persistedIds.has(entry.id))
+            );
+            rows.sort((a, b) => a.created_at - b.created_at);
           }
           const messages = rows.map((row) => ({
             id: row.id,
@@ -10864,43 +11425,77 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             reasoning_content: row.reasoning_content,
             reasoning_details: row.reasoning_details
           }));
-          return this.runFilterMessagesHook(
-            thread.instance,
-            state,
-            this.filterOrphanedToolCalls(messages)
-          );
+          return messages;
         } catch (error) {
           console.error("Error loading message history:", error);
           return [];
         }
       }
       /**
-       * Run the filter_messages hook if it exists
-       * This hook allows developers to modify SQL row data before transformation
-       *
-       * @param thread - Thread instance with hooks registry
-       * @param state - Flow state for hook context
-       * @param rows - SQL rows from messages table
-       * @returns Processed rows (or original if hook doesn't exist/fails)
+       * Build request-context rows from persisted history.
+       * Mutations and synthetic messages stay in the request context.
        */
       static async runFilterMessagesHook(thread, state, messages) {
         const executors = await this.getHooksForType(state, "filter_messages");
         if (executors.length === 0) return messages;
         let result = messages;
         const threadState = ThreadStateImpl.fromFlowState(state);
-        for (const executor of executors) {
+        for (const { execute, context } of executors) {
           try {
             const byId = /* @__PURE__ */ new Map();
             for (const row of result) if (row.id) byId.set(row.id, row);
             const hookView = result.map((row) => _FlowEngine.rowToHookMessage(row));
-            const kept = await executor(threadState, hookView);
-            result = kept.map((m) => m.id && byId.get(m.id) || null).filter((row) => row !== null);
+            const kept = await execute(threadState, hookView, context);
+            result = kept.map((hookedMessage) => {
+              const original = hookedMessage.id ? byId.get(hookedMessage.id) : void 0;
+              if (original) {
+                return _FlowEngine.applyHookMessageToRow(original, hookedMessage);
+              }
+              return _FlowEngine.hookMessageToContextRow(hookedMessage);
+            });
           } catch (error) {
             console.error("[Hooks] \u2717 Error running filter_messages hook:", error);
           }
         }
         return result;
       }
+      /**
+       * Copy a persisted row and apply hook edits. The original live-history
+       * object is left unchanged.
+       */
+      static applyHookMessageToRow(original, hooked) {
+        const attachments = hooked.attachments === void 0 ? original.attachments : hooked.attachments === null ? null : typeof hooked.attachments === "string" ? hooked.attachments : JSON.stringify(hooked.attachments);
+        return {
+          ...original,
+          role: hooked.role ?? original.role,
+          content: hooked.content !== void 0 ? hooked.content : original.content,
+          name: hooked.name !== void 0 ? hooked.name : original.name,
+          tool_calls: hooked.tool_calls !== void 0 ? hooked.tool_calls : original.tool_calls,
+          tool_call_id: hooked.tool_call_id !== void 0 ? hooked.tool_call_id : original.tool_call_id,
+          silent: hooked.silent !== void 0 ? hooked.silent : original.silent,
+          attachments
+        };
+      }
+      /**
+       * Convert a synthetic hook message into a request-context-only builder row.
+       */
+      static hookMessageToContextRow(hooked) {
+        const attachments = hooked.attachments === void 0 || hooked.attachments === null ? hooked.attachments ?? null : typeof hooked.attachments === "string" ? hooked.attachments : JSON.stringify(hooked.attachments);
+        return {
+          id: hooked.id || crypto.randomUUID(),
+          role: hooked.role,
+          content: hooked.content ?? null,
+          name: hooked.name ?? null,
+          tool_calls: typeof hooked.tool_calls === "string" ? hooked.tool_calls : null,
+          tool_call_id: hooked.tool_call_id ?? null,
+          created_at: hooked.created_at ?? Date.now() * TIMESTAMP_MULTIPLIER,
+          parent_id: hooked.parent_id ?? null,
+          depth: hooked.depth ?? 0,
+          silent: hooked.silent ?? false,
+          status: "completed",
+          attachments
+        };
+      }
       /**
        * Log an error to the logs table (best-effort)
        * Creates a log entry with error details but no associated message_id
@@ -11044,6 +11639,35 @@ ${errorStack}` : ""}`;
 });
 
 // src/agents/utilities.ts
+var utilities_exports = {};
+__export(utilities_exports, {
+  cat: () => cat,
+  emitThreadEvent: () => emitThreadEvent,
+  exists: () => exists,
+  find: () => find,
+  forceTurn: () => forceTurn,
+  getFileStats: () => getFileStats,
+  getMessages: () => getMessages,
+  getThumbnail: () => getThumbnail,
+  grep: () => grep,
+  head: () => head,
+  injectMessage: () => injectMessage,
+  linkFile: () => linkFile,
+  mkdir: () => mkdir,
+  move: () => move,
+  queueTool: () => queueTool,
+  readFile: () => readFile,
+  readdir: () => readdir,
+  reloadHistory: () => reloadHistory,
+  rename: () => rename,
+  rmdir: () => rmdir,
+  stat: () => stat,
+  tail: () => tail,
+  unlink: () => unlink,
+  updateThread: () => updateThread,
+  writeFile: () => writeFile,
+  writeImage: () => writeImage
+});
 function queueTool(flow, toolName, args = {}) {
   if (flow.currentToolUses !== void 0) {
     if (!flow.currentToolUses.includes(toolName)) {
@@ -11071,7 +11695,7 @@ async function injectMessage(flow, options) {
   const timestamp = Date.now() * TIMESTAMP_MULTIPLIER;
   const silent = options.silent ?? false;
   const forceTopLevel = options.forceTopLevel ?? false;
-  const message = {
+  let message = {
     id: messageId,
     role: options.role,
     content: options.content,
@@ -11085,41 +11709,52 @@ async function injectMessage(flow, options) {
     metadata: options.metadata
   };
   if (options.beforeMessageId) {
-    const cursor = await flow.storage.sql.exec(
-      `SELECT created_at FROM messages WHERE id = ?`,
-      options.beforeMessageId
+    const liveTarget = flow.messageHistory.find(
+      (entry) => entry.id === options.beforeMessageId
     );
-    const rows = cursor.toArray();
-    const targetMessage = rows[0];
-    if (!targetMessage) {
-      throw new Error(
-        `Message with id ${options.beforeMessageId} not found`
+    let targetCreatedAt = liveTarget?.created_at;
+    if (targetCreatedAt === void 0) {
+      const cursor = await flow.storage.sql.exec(
+        `SELECT created_at FROM messages WHERE id = ?`,
+        options.beforeMessageId
       );
+      const rows = cursor.toArray();
+      const targetMessage = rows[0];
+      if (!targetMessage) {
+        throw new Error(
+          `Message with id ${options.beforeMessageId} not found`
+        );
+      }
+      targetCreatedAt = targetMessage.created_at;
     }
-    message.created_at = targetMessage.created_at - 1;
+    message.created_at = targetCreatedAt - 1;
   }
   const currentPrompt = flow.promptPath.length > 0 ? flow.promptPath[flow.promptPath.length - 1] : null;
-  const metadataJson = options.metadata ? JSON.stringify(options.metadata) : null;
+  const { FlowEngine: FlowEngine2 } = await Promise.resolve().then(() => (init_FlowEngine(), FlowEngine_exports));
+  message = await FlowEngine2.runBeforeCreateMessageHook(flow, message, void 0, {
+    propagateHookErrors: true
+  });
+  const metadataJson = message.metadata === void 0 ? null : JSON.stringify(message.metadata);
   await flow.storage.sql.exec(
     `INSERT INTO messages (id, role, content, name, tool_call_id, created_at, status, silent, parent_id, depth, metadata, prompt) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-    messageId,
+    message.id,
     message.role,
     message.content,
     message.name,
     message.tool_call_id,
     message.created_at,
     message.status,
-    silent ? 1 : 0,
+    message.silent ? 1 : 0,
     message.parent_id,
     message.depth,
     metadataJson,
     currentPrompt
   );
-  if (!silent) {
-    flow.messageHistory.push(message);
-  } else {
-    flow.messageHistory = await reloadHistory(flow);
+  appendLiveExecutionHistory(flow, message, options.beforeMessageId);
+  if (flow.prompt.include_chat === false || message.parent_id !== null || (message.depth ?? 0) > 0) {
+    appendInjectedContextMessage(flow.extraMessages, message);
   }
+  await FlowEngine2.runAfterCreateMessageHook(flow, message);
   if (flow.emitMessage) {
     flow.emitMessage(message);
   }
@@ -11128,6 +11763,42 @@ async function injectMessage(flow, options) {
   }
   return message;
 }
+function appendLiveExecutionHistory(flow, message, beforeMessageId) {
+  const history = flow.messageHistory;
+  const existing = history.findIndex((entry) => entry.id === message.id);
+  if (existing >= 0) {
+    history.splice(existing, 1);
+  }
+  if (beforeMessageId) {
+    const targetIndex = history.findIndex((entry) => entry.id === beforeMessageId);
+    if (targetIndex >= 0) {
+      history.splice(targetIndex, 0, message);
+      return;
+    }
+  }
+  const insertAt = history.findIndex(
+    (entry) => entry.created_at > message.created_at
+  );
+  if (insertAt === -1) {
+    history.push(message);
+    return;
+  }
+  history.splice(insertAt, 0, message);
+}
+function appendInjectedContextMessage(extraMessages, message) {
+  const existing = extraMessages.findIndex((entry) => entry.id === message.id);
+  if (existing >= 0) {
+    extraMessages.splice(existing, 1);
+  }
+  const insertAt = extraMessages.findIndex(
+    (entry) => entry.created_at > message.created_at
+  );
+  if (insertAt === -1) {
+    extraMessages.push(message);
+    return;
+  }
+  extraMessages.splice(insertAt, 0, message);
+}
 async function getMessages(flow, limit = 100, offset = 0, order = "asc") {
   const orderClause = order === "desc" ? "DESC" : "ASC";
   const cursor = await flow.storage.sql.exec(
@@ -17607,649 +18278,336 @@ var migration48 = {
       )
     `);
     sql.exec(`INSERT INTO api_keys SELECT * FROM api_keys_0012_backup`);
-    sql.exec(`CREATE INDEX idx_api_keys_key_hash ON api_keys(key_hash)`);
-    sql.exec(`CREATE INDEX idx_api_keys_user_id ON api_keys(user_id)`);
-    sql.exec(`CREATE INDEX idx_api_keys_key_prefix ON api_keys(key_prefix)`);
-    sql.exec(`CREATE INDEX idx_api_keys_platform_key_id ON api_keys(platform_key_id)`);
-    sql.exec(`CREATE INDEX idx_api_keys_replica_active ON api_keys(replica_active)`);
-    sql.exec(`
-      CREATE TABLE sessions (
-        id TEXT PRIMARY KEY NOT NULL,
-        user_id TEXT NOT NULL,
-        token_hash TEXT NOT NULL,
-        expires_at INTEGER NOT NULL,
-        created_at INTEGER DEFAULT (strftime('%s', 'now')),
-        FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
-      )
-    `);
-    sql.exec(`INSERT INTO sessions SELECT * FROM sessions_0012_backup`);
-    sql.exec(`CREATE INDEX idx_sessions_token_hash ON sessions(token_hash)`);
-    sql.exec(`CREATE INDEX idx_sessions_user_id ON sessions(user_id)`);
-    sql.exec(`CREATE INDEX idx_sessions_expires_at ON sessions(expires_at)`);
-    sql.exec(`DROP TABLE oauth_accounts_0012_backup`);
-    sql.exec(`DROP TABLE api_keys_0012_backup`);
-    sql.exec(`DROP TABLE sessions_0012_backup`);
-    sql.exec(`
-      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '12')
-    `);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0013_add_thread_activity.ts
-var migration49 = {
-  version: 13,
-  async up(sql) {
-    sql.exec(`ALTER TABLE threads ADD COLUMN last_activity_at INTEGER`);
-    sql.exec(`ALTER TABLE threads ADD COLUMN executing_since INTEGER`);
-    sql.exec(
-      `CREATE INDEX IF NOT EXISTS idx_threads_last_activity_at ON threads(last_activity_at)`
-    );
-    sql.exec(`UPDATE threads SET last_activity_at = created_at`);
-    sql.exec(`
-      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '13')
-    `);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0014_thread_activity_scale.ts
-var migration50 = {
-  version: 14,
-  async up(sql) {
-    sql.exec(`ALTER TABLE threads ADD COLUMN last_message_preview TEXT`);
-    sql.exec(
-      `CREATE INDEX IF NOT EXISTS idx_threads_executing_since
-       ON threads(executing_since) WHERE executing_since IS NOT NULL`
-    );
-    sql.exec(
-      `UPDATE threads SET last_activity_at = created_at WHERE last_activity_at IS NULL`
-    );
-    sql.exec(`
-      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '14')
-    `);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0015_clear_envelope_previews.ts
-var migration51 = {
-  version: 15,
-  async up(sql) {
-    sql.exec(
-      `UPDATE threads SET last_message_preview = NULL
-       WHERE last_message_preview LIKE 'Subagent (reference: %'`
-    );
-    sql.exec(`
-      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '15')
-    `);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0016_add_origin_agent.ts
-var migration52 = {
-  version: 16,
-  async up(sql) {
-    sql.exec(`ALTER TABLE threads ADD COLUMN origin_agent_name TEXT`);
-    sql.exec(
-      `CREATE INDEX IF NOT EXISTS idx_threads_origin_agent_name ON threads(origin_agent_name)`
-    );
-    sql.exec(`UPDATE threads SET origin_agent_name = agent_name`);
-    sql.exec(`
-      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '16')
-    `);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0017_add_thread_message_recency.ts
-var migration53 = {
-  version: 17,
-  async up(sql) {
-    sql.exec(`ALTER TABLE threads ADD COLUMN last_message_at INTEGER`);
-    sql.exec(`UPDATE threads SET last_message_at = created_at`);
-    sql.exec(`
-      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '17')
-    `);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0018_auth_security.ts
-var migration54 = {
-  version: 18,
-  async up(sql) {
-    sql.exec(`
-      CREATE TABLE IF NOT EXISTS super_admin_sessions (
-        token_hash TEXT PRIMARY KEY,
-        created_at INTEGER NOT NULL,
-        expires_at INTEGER NOT NULL
-      )
-    `);
-    sql.exec(`
-      CREATE INDEX IF NOT EXISTS idx_super_admin_sessions_expires
-      ON super_admin_sessions(expires_at)
-    `);
-    sql.exec(`
-      CREATE TABLE IF NOT EXISTS auth_rate_limits (
-        bucket_key TEXT PRIMARY KEY,
-        attempts INTEGER NOT NULL,
-        reset_at INTEGER NOT NULL
-      )
-    `);
-    sql.exec(`
-      CREATE INDEX IF NOT EXISTS idx_auth_rate_limits_reset
-      ON auth_rate_limits(reset_at)
-    `);
-    sql.exec(`
-      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '18')
-    `);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0019_scope_skills.ts
-var migration55 = {
-  version: 19,
-  async up(sql) {
-    sql.exec(`
-      CREATE TABLE skills_0019 (
-        owner_id TEXT NOT NULL,
-        name TEXT NOT NULL,
-        description TEXT NOT NULL,
-        version TEXT,
-        enabled INTEGER NOT NULL DEFAULT 1,
-        shared INTEGER NOT NULL DEFAULT 0,
-        created_at INTEGER DEFAULT (strftime('%s', 'now')),
-        updated_at INTEGER DEFAULT (strftime('%s', 'now')),
-        PRIMARY KEY (owner_id, name)
-      )
-    `);
-    sql.exec(`
-      INSERT INTO skills_0019 (
-        owner_id, name, description, version, enabled, shared, created_at, updated_at
-      )
-      SELECT '__instance_shared__', name, description, version, enabled, 1, created_at, updated_at
-      FROM skills
-    `);
-    sql.exec(`
-      CREATE TABLE skill_files_0019 (
-        owner_id TEXT NOT NULL,
-        skill_name TEXT NOT NULL,
-        path TEXT NOT NULL,
-        content TEXT NOT NULL,
-        size INTEGER NOT NULL,
-        PRIMARY KEY (owner_id, skill_name, path),
-        FOREIGN KEY (owner_id, skill_name) REFERENCES skills_0019(owner_id, name) ON DELETE CASCADE
-      )
-    `);
-    sql.exec(`
-      INSERT INTO skill_files_0019 (owner_id, skill_name, path, content, size)
-      SELECT '__instance_shared__', skill_name, path, content, size FROM skill_files
-    `);
-    sql.exec(`DROP TABLE skill_files`);
-    sql.exec(`DROP TABLE skills`);
-    sql.exec(`ALTER TABLE skills_0019 RENAME TO skills`);
-    sql.exec(`ALTER TABLE skill_files_0019 RENAME TO skill_files`);
-    sql.exec(`CREATE INDEX idx_skills_owner_enabled ON skills(owner_id, enabled)`);
-    sql.exec(`CREATE INDEX idx_skills_shared_enabled ON skills(shared, enabled)`);
-    sql.exec(`CREATE INDEX idx_skill_files_skill ON skill_files(owner_id, skill_name)`);
-    sql.exec(`INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '19')`);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0020_websocket_tickets.ts
-var migration56 = {
-  version: 20,
-  async up(sql) {
-    sql.exec(`
-      CREATE TABLE websocket_tickets (
-        ticket_hash TEXT PRIMARY KEY,
-        pathname TEXT NOT NULL,
-        auth_json TEXT NOT NULL,
-        created_at INTEGER NOT NULL,
-        expires_at INTEGER NOT NULL
-      )
-    `);
-    sql.exec(`
-      CREATE INDEX idx_websocket_tickets_expires
-      ON websocket_tickets(expires_at)
-    `);
-    sql.exec(`INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '20')`);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/0021_platform_handoff_jtis.ts
-var migration57 = {
-  version: 21,
-  async up(sql) {
+    sql.exec(`CREATE INDEX idx_api_keys_key_hash ON api_keys(key_hash)`);
+    sql.exec(`CREATE INDEX idx_api_keys_user_id ON api_keys(user_id)`);
+    sql.exec(`CREATE INDEX idx_api_keys_key_prefix ON api_keys(key_prefix)`);
+    sql.exec(`CREATE INDEX idx_api_keys_platform_key_id ON api_keys(platform_key_id)`);
+    sql.exec(`CREATE INDEX idx_api_keys_replica_active ON api_keys(replica_active)`);
     sql.exec(`
-      CREATE TABLE platform_handoff_jtis (
-        jti TEXT PRIMARY KEY,
-        consumed_at INTEGER NOT NULL,
-        expires_at INTEGER NOT NULL
+      CREATE TABLE sessions (
+        id TEXT PRIMARY KEY NOT NULL,
+        user_id TEXT NOT NULL,
+        token_hash TEXT NOT NULL,
+        expires_at INTEGER NOT NULL,
+        created_at INTEGER DEFAULT (strftime('%s', 'now')),
+        FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
       )
     `);
+    sql.exec(`INSERT INTO sessions SELECT * FROM sessions_0012_backup`);
+    sql.exec(`CREATE INDEX idx_sessions_token_hash ON sessions(token_hash)`);
+    sql.exec(`CREATE INDEX idx_sessions_user_id ON sessions(user_id)`);
+    sql.exec(`CREATE INDEX idx_sessions_expires_at ON sessions(expires_at)`);
+    sql.exec(`DROP TABLE oauth_accounts_0012_backup`);
+    sql.exec(`DROP TABLE api_keys_0012_backup`);
+    sql.exec(`DROP TABLE sessions_0012_backup`);
     sql.exec(`
-      CREATE INDEX idx_platform_handoff_jtis_expires
-      ON platform_handoff_jtis(expires_at)
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '12')
     `);
-    sql.exec(`INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '21')`);
-  }
-};
-
-// src/durable-objects/agentbuilder-migrations/index.ts
-var migrations2 = [migration37, migration38, migration39, migration40, migration41, migration42, migration43, migration44, migration45, migration46, migration47, migration48, migration49, migration50, migration51, migration52, migration53, migration54, migration55, migration56, migration57];
-var LATEST_SCHEMA_VERSION2 = migrations2.reduce(
-  (max, migration58) => Math.max(max, migration58.version),
-  0
-);
-
-// src/utils/crypto.ts
-var CryptoUtil = class {
-  static algorithm = "aes-256-gcm";
-  /**
-   * Encrypt a string value
-   */
-  static async encrypt(text, key) {
-    const encoder = new TextEncoder();
-    const data = encoder.encode(text);
-    const cryptoKey = await crypto.subtle.importKey(
-      "raw",
-      hexToBuffer(key),
-      { name: "AES-GCM" },
-      false,
-      ["encrypt"]
-    );
-    const iv = crypto.getRandomValues(new Uint8Array(12));
-    const encrypted = await crypto.subtle.encrypt(
-      {
-        name: "AES-GCM",
-        iv
-      },
-      cryptoKey,
-      data
-    );
-    const combined = new Uint8Array(iv.length + encrypted.byteLength);
-    combined.set(iv);
-    combined.set(new Uint8Array(encrypted), iv.length);
-    return bufferToBase64(combined);
-  }
-  /**
-   * Decrypt a string value
-   */
-  static async decrypt(encryptedText, key) {
-    const combined = base64ToBuffer2(encryptedText);
-    const iv = combined.slice(0, 12);
-    const encrypted = combined.slice(12);
-    const cryptoKey = await crypto.subtle.importKey(
-      "raw",
-      hexToBuffer(key),
-      { name: "AES-GCM" },
-      false,
-      ["decrypt"]
-    );
-    const decrypted = await crypto.subtle.decrypt(
-      {
-        name: "AES-GCM",
-        iv
-      },
-      cryptoKey,
-      encrypted
-    );
-    const decoder = new TextDecoder();
-    return decoder.decode(decrypted);
   }
 };
-function hexToBuffer(hex) {
-  const bytes = new Uint8Array(hex.length / 2);
-  for (let i = 0; i < hex.length; i += 2) {
-    bytes[i / 2] = parseInt(hex.substr(i, 2), 16);
-  }
-  return bytes;
-}
-function bufferToBase64(buffer) {
-  let binary = "";
-  for (let i = 0; i < buffer.byteLength; i++) {
-    binary += String.fromCharCode(buffer[i]);
-  }
-  return btoa(binary);
-}
-function base64ToBuffer2(base64) {
-  const binary = atob(base64);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  return bytes;
-}
-async function encryptEnvs(env, encryptionKey) {
-  const plaintext = JSON.stringify(env);
-  return CryptoUtil.encrypt(plaintext, encryptionKey);
-}
-async function decryptEnvs(encrypted, encryptionKey) {
-  const plaintext = await CryptoUtil.decrypt(encrypted, encryptionKey);
-  const parsed = JSON.parse(plaintext);
-  if (!parsed || typeof parsed !== "object") {
-    return {};
-  }
-  const result = {};
-  for (const [key, value] of Object.entries(parsed)) {
-    if (value === void 0 || value === null) continue;
-    result[key] = String(value);
-  }
-  return result;
-}
 
-// src/packing/resolver.ts
-var NamespaceResolutionError = class extends Error {
-  constructor(itemType, itemName, namespace, message) {
-    super(message);
-    this.itemType = itemType;
-    this.itemName = itemName;
-    this.namespace = namespace;
-    this.name = "NamespaceResolutionError";
-  }
-};
-function parseQualifiedName(name) {
-  if (name.startsWith("@")) {
-    const firstSlash = name.indexOf("/");
-    if (firstSlash === -1) {
-      return [null, name];
-    }
-    const secondSlash = name.indexOf("/", firstSlash + 1);
-    if (secondSlash === -1) {
-      return [null, name];
-    }
-    return [name.substring(0, secondSlash), name.substring(secondSlash + 1)];
-  }
-  const separatorIndex = name.indexOf("/");
-  if (separatorIndex === -1) {
-    return [null, name];
-  }
-  return [name.substring(0, separatorIndex), name.substring(separatorIndex + 1)];
-}
-function qualifyName(packageId, shortName) {
-  return `${packageId}/${shortName}`;
-}
-function getShortName(name) {
-  const [, shortName] = parseQualifiedName(name);
-  return shortName;
-}
-function resolveTool(registry, name, namespace) {
-  const [pkgId, shortName] = parseQualifiedName(name);
-  if (pkgId !== null) {
-    const pkg = registry.packages[pkgId];
-    if (!pkg) {
-      throw new NamespaceResolutionError(
-        "tool",
-        name,
-        namespace,
-        `Package "${pkgId}" not found`
-      );
-    }
-    throw new NamespaceResolutionError(
-      "tool",
-      name,
-      namespace,
-      `Cannot access tool "${shortName}" from package "${pkgId}". Only entry point agents are accessible cross-package.`
-    );
-  }
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    if (!pkg) {
-      throw new NamespaceResolutionError(
-        "tool",
-        name,
-        namespace,
-        `Package "${namespace.packageId}" not found`
-      );
-    }
-    const loader2 = pkg.tools[shortName];
-    if (!loader2) {
-      throw new NamespaceResolutionError(
-        "tool",
-        name,
-        namespace,
-        `Tool "${shortName}" not found in package "${namespace.packageId}"`
-      );
-    }
-    return loader2;
-  }
-  const loader = registry.global.tools[shortName];
-  if (!loader) {
-    throw new NamespaceResolutionError(
-      "tool",
-      name,
-      namespace,
-      `Tool "${shortName}" not found in global namespace`
-    );
-  }
-  return loader;
-}
-function resolvePrompt(registry, name, namespace) {
-  const [pkgId, shortName] = parseQualifiedName(name);
-  if (pkgId !== null) {
-    throw new NamespaceResolutionError(
-      "prompt",
-      name,
-      namespace,
-      `Cannot access prompt "${shortName}" from package "${pkgId}". Prompts are package-internal.`
-    );
-  }
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    if (!pkg) {
-      throw new NamespaceResolutionError(
-        "prompt",
-        name,
-        namespace,
-        `Package "${namespace.packageId}" not found`
-      );
-    }
-    const loader2 = pkg.prompts[shortName];
-    if (!loader2) {
-      throw new NamespaceResolutionError(
-        "prompt",
-        name,
-        namespace,
-        `Prompt "${shortName}" not found in package "${namespace.packageId}"`
-      );
-    }
-    return loader2;
-  }
-  const loader = registry.global.prompts[shortName];
-  if (!loader) {
-    throw new NamespaceResolutionError(
-      "prompt",
-      name,
-      namespace,
-      `Prompt "${shortName}" not found in global namespace`
+// src/durable-objects/agentbuilder-migrations/0013_add_thread_activity.ts
+var migration49 = {
+  version: 13,
+  async up(sql) {
+    sql.exec(`ALTER TABLE threads ADD COLUMN last_activity_at INTEGER`);
+    sql.exec(`ALTER TABLE threads ADD COLUMN executing_since INTEGER`);
+    sql.exec(
+      `CREATE INDEX IF NOT EXISTS idx_threads_last_activity_at ON threads(last_activity_at)`
     );
+    sql.exec(`UPDATE threads SET last_activity_at = created_at`);
+    sql.exec(`
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '13')
+    `);
   }
-  return loader;
-}
-function resolveModel(registry, name, namespace) {
-  const [possiblePkgId, shortName] = parseQualifiedName(name);
-  if (possiblePkgId !== null && registry.packages[possiblePkgId]) {
-    throw new NamespaceResolutionError(
-      "model",
-      name,
-      namespace,
-      `Cannot use qualified model name "${name}". Models must be unqualified. If this is a provider model name, ensure no package named "${possiblePkgId}" exists.`
+};
+
+// src/durable-objects/agentbuilder-migrations/0014_thread_activity_scale.ts
+var migration50 = {
+  version: 14,
+  async up(sql) {
+    sql.exec(`ALTER TABLE threads ADD COLUMN last_message_preview TEXT`);
+    sql.exec(
+      `CREATE INDEX IF NOT EXISTS idx_threads_executing_since
+       ON threads(executing_since) WHERE executing_since IS NOT NULL`
+    );
+    sql.exec(
+      `UPDATE threads SET last_activity_at = created_at WHERE last_activity_at IS NULL`
     );
+    sql.exec(`
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '14')
+    `);
   }
-  const lookupName = name;
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    if (pkg) {
-      const loader2 = pkg.models[lookupName];
-      if (loader2) {
-        return loader2;
-      }
-    }
-    const globalLoader = registry.global.models[lookupName];
-    if (globalLoader) {
-      return globalLoader;
-    }
-    throw new NamespaceResolutionError(
-      "model",
-      name,
-      namespace,
-      `Model "${lookupName}" not found in package "${namespace.packageId}" or global namespace`
+};
+
+// src/durable-objects/agentbuilder-migrations/0015_clear_envelope_previews.ts
+var migration51 = {
+  version: 15,
+  async up(sql) {
+    sql.exec(
+      `UPDATE threads SET last_message_preview = NULL
+       WHERE last_message_preview LIKE 'Subagent (reference: %'`
     );
+    sql.exec(`
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '15')
+    `);
   }
-  const loader = registry.global.models[lookupName];
-  if (!loader) {
-    throw new NamespaceResolutionError(
-      "model",
-      name,
-      namespace,
-      `Model "${lookupName}" not found in global namespace`
+};
+
+// src/durable-objects/agentbuilder-migrations/0016_add_origin_agent.ts
+var migration52 = {
+  version: 16,
+  async up(sql) {
+    sql.exec(`ALTER TABLE threads ADD COLUMN origin_agent_name TEXT`);
+    sql.exec(
+      `CREATE INDEX IF NOT EXISTS idx_threads_origin_agent_name ON threads(origin_agent_name)`
     );
+    sql.exec(`UPDATE threads SET origin_agent_name = agent_name`);
+    sql.exec(`
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '16')
+    `);
   }
-  return loader;
-}
-function resolveAgent(registry, name, namespace) {
-  const [pkgId, shortName] = parseQualifiedName(name);
-  if (pkgId !== null) {
-    const pkg = registry.packages[pkgId];
-    if (!pkg) {
-      throw new NamespaceResolutionError(
-        "agent",
-        name,
-        namespace,
-        `Package "${pkgId}" not found`
-      );
-    }
-    if (!pkg.entryAgents.includes(shortName)) {
-      throw new NamespaceResolutionError(
-        "agent",
-        name,
-        namespace,
-        `Agent "${shortName}" is not an entry point in package "${pkgId}"`
-      );
-    }
-    const loader = pkg.agents[shortName];
-    if (!loader) {
-      throw new NamespaceResolutionError(
-        "agent",
-        name,
-        namespace,
-        `Agent "${shortName}" not found in package "${pkgId}"`
-      );
-    }
-    return loader;
+};
+
+// src/durable-objects/agentbuilder-migrations/0017_add_thread_message_recency.ts
+var migration53 = {
+  version: 17,
+  async up(sql) {
+    sql.exec(`ALTER TABLE threads ADD COLUMN last_message_at INTEGER`);
+    sql.exec(`UPDATE threads SET last_message_at = created_at`);
+    sql.exec(`
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '17')
+    `);
   }
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    if (!pkg) {
-      throw new NamespaceResolutionError(
-        "agent",
-        name,
-        namespace,
-        `Package "${namespace.packageId}" not found`
-      );
-    }
-    const loader = pkg.agents[shortName];
-    if (!loader) {
-      throw new NamespaceResolutionError(
-        "agent",
-        name,
-        namespace,
-        `Agent "${shortName}" not found in package "${namespace.packageId}"`
-      );
-    }
-    return loader;
+};
+
+// src/durable-objects/agentbuilder-migrations/0018_auth_security.ts
+var migration54 = {
+  version: 18,
+  async up(sql) {
+    sql.exec(`
+      CREATE TABLE IF NOT EXISTS super_admin_sessions (
+        token_hash TEXT PRIMARY KEY,
+        created_at INTEGER NOT NULL,
+        expires_at INTEGER NOT NULL
+      )
+    `);
+    sql.exec(`
+      CREATE INDEX IF NOT EXISTS idx_super_admin_sessions_expires
+      ON super_admin_sessions(expires_at)
+    `);
+    sql.exec(`
+      CREATE TABLE IF NOT EXISTS auth_rate_limits (
+        bucket_key TEXT PRIMARY KEY,
+        attempts INTEGER NOT NULL,
+        reset_at INTEGER NOT NULL
+      )
+    `);
+    sql.exec(`
+      CREATE INDEX IF NOT EXISTS idx_auth_rate_limits_reset
+      ON auth_rate_limits(reset_at)
+    `);
+    sql.exec(`
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '18')
+    `);
   }
-  const globalLoader = registry.global.agents[shortName];
-  if (globalLoader) {
-    return globalLoader;
+};
+
+// src/durable-objects/agentbuilder-migrations/0019_scope_skills.ts
+var migration55 = {
+  version: 19,
+  async up(sql) {
+    sql.exec(`
+      CREATE TABLE skills_0019 (
+        owner_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        description TEXT NOT NULL,
+        version TEXT,
+        enabled INTEGER NOT NULL DEFAULT 1,
+        shared INTEGER NOT NULL DEFAULT 0,
+        created_at INTEGER DEFAULT (strftime('%s', 'now')),
+        updated_at INTEGER DEFAULT (strftime('%s', 'now')),
+        PRIMARY KEY (owner_id, name)
+      )
+    `);
+    sql.exec(`
+      INSERT INTO skills_0019 (
+        owner_id, name, description, version, enabled, shared, created_at, updated_at
+      )
+      SELECT '__instance_shared__', name, description, version, enabled, 1, created_at, updated_at
+      FROM skills
+    `);
+    sql.exec(`
+      CREATE TABLE skill_files_0019 (
+        owner_id TEXT NOT NULL,
+        skill_name TEXT NOT NULL,
+        path TEXT NOT NULL,
+        content TEXT NOT NULL,
+        size INTEGER NOT NULL,
+        PRIMARY KEY (owner_id, skill_name, path),
+        FOREIGN KEY (owner_id, skill_name) REFERENCES skills_0019(owner_id, name) ON DELETE CASCADE
+      )
+    `);
+    sql.exec(`
+      INSERT INTO skill_files_0019 (owner_id, skill_name, path, content, size)
+      SELECT '__instance_shared__', skill_name, path, content, size FROM skill_files
+    `);
+    sql.exec(`DROP TABLE skill_files`);
+    sql.exec(`DROP TABLE skills`);
+    sql.exec(`ALTER TABLE skills_0019 RENAME TO skills`);
+    sql.exec(`ALTER TABLE skill_files_0019 RENAME TO skill_files`);
+    sql.exec(`CREATE INDEX idx_skills_owner_enabled ON skills(owner_id, enabled)`);
+    sql.exec(`CREATE INDEX idx_skills_shared_enabled ON skills(shared, enabled)`);
+    sql.exec(`CREATE INDEX idx_skill_files_skill ON skill_files(owner_id, skill_name)`);
+    sql.exec(`INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '19')`);
   }
-  for (const [pkgId2, pkg] of Object.entries(registry.packages)) {
-    if (pkg.entryAgents.includes(shortName)) {
-      const loader = pkg.agents[shortName];
-      if (loader) {
-        return loader;
-      }
-    }
+};
+
+// src/durable-objects/agentbuilder-migrations/0020_websocket_tickets.ts
+var migration56 = {
+  version: 20,
+  async up(sql) {
+    sql.exec(`
+      CREATE TABLE websocket_tickets (
+        ticket_hash TEXT PRIMARY KEY,
+        pathname TEXT NOT NULL,
+        auth_json TEXT NOT NULL,
+        created_at INTEGER NOT NULL,
+        expires_at INTEGER NOT NULL
+      )
+    `);
+    sql.exec(`
+      CREATE INDEX idx_websocket_tickets_expires
+      ON websocket_tickets(expires_at)
+    `);
+    sql.exec(`INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '20')`);
+  }
+};
+
+// src/durable-objects/agentbuilder-migrations/0021_platform_handoff_jtis.ts
+var migration57 = {
+  version: 21,
+  async up(sql) {
+    sql.exec(`
+      CREATE TABLE platform_handoff_jtis (
+        jti TEXT PRIMARY KEY,
+        consumed_at INTEGER NOT NULL,
+        expires_at INTEGER NOT NULL
+      )
+    `);
+    sql.exec(`
+      CREATE INDEX idx_platform_handoff_jtis_expires
+      ON platform_handoff_jtis(expires_at)
+    `);
+    sql.exec(`INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '21')`);
   }
-  throw new NamespaceResolutionError(
-    "agent",
-    name,
-    namespace,
-    `Agent "${shortName}" not found in global namespace`
-  );
-}
-function resolveHook(registry, name, namespace) {
-  const [pkgId, shortName] = parseQualifiedName(name);
-  if (pkgId !== null) {
-    throw new NamespaceResolutionError(
-      "hook",
-      name,
-      namespace,
-      `Cannot use qualified hook name "${name}". Hooks must be unqualified.`
+};
+
+// src/durable-objects/agentbuilder-migrations/index.ts
+var migrations2 = [migration37, migration38, migration39, migration40, migration41, migration42, migration43, migration44, migration45, migration46, migration47, migration48, migration49, migration50, migration51, migration52, migration53, migration54, migration55, migration56, migration57];
+var LATEST_SCHEMA_VERSION2 = migrations2.reduce(
+  (max, migration58) => Math.max(max, migration58.version),
+  0
+);
+
+// src/utils/crypto.ts
+var CryptoUtil = class {
+  static algorithm = "aes-256-gcm";
+  /**
+   * Encrypt a string value
+   */
+  static async encrypt(text, key) {
+    const encoder = new TextEncoder();
+    const data = encoder.encode(text);
+    const cryptoKey = await crypto.subtle.importKey(
+      "raw",
+      hexToBuffer(key),
+      { name: "AES-GCM" },
+      false,
+      ["encrypt"]
+    );
+    const iv = crypto.getRandomValues(new Uint8Array(12));
+    const encrypted = await crypto.subtle.encrypt(
+      {
+        name: "AES-GCM",
+        iv
+      },
+      cryptoKey,
+      data
     );
+    const combined = new Uint8Array(iv.length + encrypted.byteLength);
+    combined.set(iv);
+    combined.set(new Uint8Array(encrypted), iv.length);
+    return bufferToBase64(combined);
   }
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    if (pkg) {
-      const loader2 = pkg.hooks[shortName];
-      if (loader2) {
-        return loader2;
-      }
-    }
-    return null;
+  /**
+   * Decrypt a string value
+   */
+  static async decrypt(encryptedText, key) {
+    const combined = base64ToBuffer2(encryptedText);
+    const iv = combined.slice(0, 12);
+    const encrypted = combined.slice(12);
+    const cryptoKey = await crypto.subtle.importKey(
+      "raw",
+      hexToBuffer(key),
+      { name: "AES-GCM" },
+      false,
+      ["decrypt"]
+    );
+    const decrypted = await crypto.subtle.decrypt(
+      {
+        name: "AES-GCM",
+        iv
+      },
+      cryptoKey,
+      encrypted
+    );
+    const decoder = new TextDecoder();
+    return decoder.decode(decrypted);
   }
-  const loader = registry.global.hooks[shortName];
-  return loader || null;
-}
-function getVisibleToolNames(registry, namespace) {
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    return pkg ? Object.keys(pkg.tools) : [];
+};
+function hexToBuffer(hex) {
+  const bytes = new Uint8Array(hex.length / 2);
+  for (let i = 0; i < hex.length; i += 2) {
+    bytes[i / 2] = parseInt(hex.substr(i, 2), 16);
   }
-  return Object.keys(registry.global.tools);
+  return bytes;
 }
-function getVisibleAgentNames(registry, namespace) {
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    const ownAgents = pkg ? Object.keys(pkg.agents) : [];
-    const otherEntryPoints = Object.entries(registry.packages).filter(([id]) => id !== namespace.packageId).flatMap(
-      ([pkgId, pkg2]) => pkg2.entryAgents.map((name) => qualifyName(pkgId, name))
-    );
-    return [...ownAgents, ...otherEntryPoints];
+function bufferToBase64(buffer) {
+  let binary = "";
+  for (let i = 0; i < buffer.byteLength; i++) {
+    binary += String.fromCharCode(buffer[i]);
   }
-  const globalAgents = Object.keys(registry.global.agents);
-  const entryPoints = Object.values(registry.packages).flatMap((pkg) => pkg.entryAgents);
-  return [.../* @__PURE__ */ new Set([...globalAgents, ...entryPoints])];
+  return btoa(binary);
 }
-function getVisiblePromptNames(registry, namespace) {
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    return pkg ? Object.keys(pkg.prompts) : [];
+function base64ToBuffer2(base64) {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i);
   }
-  return Object.keys(registry.global.prompts);
+  return bytes;
 }
-function getVisibleModelNames(registry, namespace) {
-  if (namespace.type === "packed") {
-    const pkg = registry.packages[namespace.packageId];
-    const ownModels = pkg ? Object.keys(pkg.models) : [];
-    const globalModels = Object.keys(registry.global.models);
-    return [.../* @__PURE__ */ new Set([...ownModels, ...globalModels])];
-  }
-  return Object.keys(registry.global.models);
+async function encryptEnvs(env, encryptionKey) {
+  const plaintext = JSON.stringify(env);
+  return CryptoUtil.encrypt(plaintext, encryptionKey);
 }
-function createNamespaceContext(agentDef) {
-  if (agentDef?.__package) {
-    return { type: "packed", packageId: agentDef.__package.packageId };
+async function decryptEnvs(encrypted, encryptionKey) {
+  const plaintext = await CryptoUtil.decrypt(encrypted, encryptionKey);
+  const parsed = JSON.parse(plaintext);
+  if (!parsed || typeof parsed !== "object") {
+    return {};
   }
-  return { type: "global" };
-}
-function isQualifiedName(name) {
-  if (name.startsWith("@")) {
-    const firstSlash = name.indexOf("/");
-    if (firstSlash === -1) return false;
-    return name.indexOf("/", firstSlash + 1) !== -1;
+  const result = {};
+  for (const [key, value] of Object.entries(parsed)) {
+    if (value === void 0 || value === null) continue;
+    result[key] = String(value);
   }
-  return name.includes("/");
+  return result;
 }
 
 // src/durable-objects/DurableAgentBuilder.ts
+init_resolver();
 init_types();
 
 // src/skills/frontmatter.ts
@@ -18341,6 +18699,7 @@ function validateSkillFiles(files) {
 
 // src/durable-objects/DurableAgentBuilder.ts
 init_scope();
+init_ParentHookResolver();
 var ENV_TYPES_PROPERTY = "__agentbuilder_env_types";
 function parseStoredPermissions(value) {
   if (typeof value !== "string" || !value.trim()) return null;
@@ -19022,16 +19381,29 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
     } catch {
       return;
     }
-    const hookIds = Array.isArray(agentDef?.hooks) ? agentDef.hooks : [];
-    if (hookIds.length === 0) {
-      return;
-    }
-    let hooksRegistry;
-    try {
-      hooksRegistry = this.hooks();
-    } catch {
-      return;
-    }
+    const packageId = agentDef?.__package?.packageId;
+    const rawPromptName = agentDef?.sideA?.prompt;
+    const promptName = rawPromptName && packageId && !isQualifiedName(rawPromptName) ? `${packageId}/${rawPromptName}` : rawPromptName;
+    const promptDef = promptName ? await this.loadPrompt(promptName) : void 0;
+    const bindings = await resolveHooksForPrompt(
+      {
+        host: this,
+        agentName: thread.agent_name,
+        agent: agentDef,
+        promptName,
+        prompt: promptDef,
+        isOptionalRelationshipEnabled: async (envName) => {
+          const value = await this.resolveThreadEnv({
+            threadId: thread.id,
+            property: envName,
+            promptName: promptName ?? agentDef.name ?? thread.agent_name
+          });
+          return ["true", "1", "yes"].includes((value ?? "").trim().toLowerCase());
+        }
+      },
+      "after_thread_created"
+    );
+    if (bindings.length === 0) return;
     const durableId = this.env.AGENT_BUILDER_THREAD.idFromName(thread.id);
     const threadStub = this.env.AGENT_BUILDER_THREAD.get(durableId);
     const { ThreadStateImpl: ThreadStateImpl2 } = await Promise.resolve().then(() => (init_ThreadStateImpl(), ThreadStateImpl_exports));
@@ -19046,16 +19418,14 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
       terminated: thread.terminated,
       created_at: thread.created_at
     });
-    for (const hookId of hookIds) {
-      const hookLoader = hooksRegistry[hookId];
-      if (!hookLoader) continue;
+    for (const binding of bindings) {
       try {
-        const hookDef = await hookLoader();
-        if (hookDef?.hook === "after_thread_created") {
-          await hookDef.execute(threadState);
-        }
+        await binding.execute(threadState, binding.context);
       } catch (error) {
-        console.error(`[Hooks] \u2717 Error running after_thread_created hook '${hookId}':`, error);
+        console.error(
+          `[Hooks] \u2717 Error running after_thread_created hook '${binding.id}':`,
+          error
+        );
       }
     }
   }
@@ -20267,6 +20637,15 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
    * Load a prompt definition by name.
    */
   async loadPrompt(name) {
+    if (isQualifiedName(name)) {
+      const [packageId, promptName] = parseQualifiedName(name);
+      const pkg = packageId ? this.registry()?.packages?.[packageId] : void 0;
+      const loader2 = pkg?.prompts?.[promptName];
+      if (!loader2) {
+        throw new Error(`Prompt not found: ${name}`);
+      }
+      return await loader2();
+    }
     const registry = this.prompts();
     const loader = registry[name];
     if (!loader) {
@@ -21555,6 +21934,8 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
 // src/durable-objects/DurableThread.ts
 init_StreamManager();
 init_LLMRequest();
+init_ThreadStateImpl();
+init_resolver();
 
 // src/durable-objects/logDetailStream.ts
 var LOG_DETAIL_HEAVY_FIELDS = [
@@ -22228,6 +22609,7 @@ var DurableThread = class _DurableThread extends DurableObject {
       type: agentDef.type,
       created_at: Date.now(),
       max_session_turns: agentDef.maxSessionTurns,
+      _package: agentDef.__package,
       side_a_label: agentDef.sideA?.label,
       side_a_agent_prompt: qualifyPromptName(agentDef.sideA?.prompt),
       side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? true,
@@ -22257,7 +22639,8 @@ var DurableThread = class _DurableThread extends DurableObject {
       side_b_session_fail_attachments_property: sideBSession.fail.attachmentsProperty,
       side_b_session_status_tool: sideBSession.status.toolName,
       side_b_session_status_message_property: sideBSession.status.messageProperty,
-      side_b_session_status_attachments_property: sideBSession.status.attachmentsProperty
+      side_b_session_status_attachments_property: sideBSession.status.attachmentsProperty,
+      hooks: Array.isArray(agentDef.hooks) ? agentDef.hooks : void 0
     };
   }
   /**
@@ -22927,6 +23310,29 @@ var DurableThread = class _DurableThread extends DurableObject {
     }
     return projections;
   }
+  /**
+   * Build hook resolution context and a genuine at-rest ThreadState.
+   * Resolution failures abort insertion so lifecycle hooks cannot be bypassed.
+   */
+  async buildAtRestHookState(threadId) {
+    try {
+      const metadata = await this.getThreadMetadata(threadId);
+      const agentConfig = await this.loadAgentConfig(metadata.agent_id);
+      const threadInstance = this;
+      return {
+        hookState: {
+          agentConfig,
+          thread: { instance: threadInstance, metadata }
+        },
+        threadState: ThreadStateImpl.fromThreadInstance(threadInstance, metadata)
+      };
+    } catch (error) {
+      throw new Error(
+        `Unable to resolve create-message hooks for ${threadId}`,
+        { cause: error }
+      );
+    }
+  }
   /**
    * Inject a top-level message without starting a new execution.
    *
@@ -22939,22 +23345,7 @@ var DurableThread = class _DurableThread extends DurableObject {
     const id = crypto.randomUUID();
     const createdAt = Date.now() * TIMESTAMP_MULTIPLIER;
     const silent = message.silent === true;
-    const metadataJson = message.metadata ? JSON.stringify(message.metadata) : null;
-    await this.ctx.storage.sql.exec(
-      `INSERT INTO messages (id, role, content, created_at, status, silent, parent_id, depth, metadata, prompt)
-       VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)`,
-      id,
-      message.role,
-      message.content,
-      createdAt,
-      "completed",
-      silent ? 1 : 0,
-      null,
-      0,
-      metadataJson,
-      null
-    );
-    const inserted = {
+    let inserted = {
       id,
       role: message.role,
       content: message.content,
@@ -22965,9 +23356,37 @@ var DurableThread = class _DurableThread extends DurableObject {
       depth: 0,
       metadata: message.metadata
     };
+    const { hookState, threadState } = await this.buildAtRestHookState(threadId);
+    const { FlowEngine: FlowEngine2 } = await Promise.resolve().then(() => (init_FlowEngine(), FlowEngine_exports));
+    inserted = await FlowEngine2.runBeforeCreateMessageHook(
+      hookState,
+      inserted,
+      threadState,
+      { propagateHookErrors: true }
+    );
+    const metadataJson = inserted.metadata ? JSON.stringify(inserted.metadata) : null;
+    await this.ctx.storage.sql.exec(
+      `INSERT INTO messages (id, role, content, created_at, status, silent, parent_id, depth, metadata, prompt)
+       VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)`,
+      inserted.id,
+      inserted.role,
+      inserted.content,
+      inserted.created_at,
+      inserted.status ?? "completed",
+      inserted.silent ? 1 : 0,
+      inserted.parent_id ?? null,
+      inserted.depth ?? 0,
+      metadataJson,
+      null
+    );
+    await FlowEngine2.runAfterCreateMessageHook(
+      hookState,
+      inserted,
+      threadState
+    );
     this.broadcastMessage(inserted);
     const record = inserted;
-    const visibleUserInjection = message.role === "user" && !silent && typeof message.content === "string" && message.content.trim().length > 0 && !isRuntimeSubagentEnvelope(message.content);
+    const visibleUserInjection = inserted.role === "user" && !inserted.silent && typeof inserted.content === "string" && inserted.content.trim().length > 0 && !isRuntimeSubagentEnvelope(inserted.content);
     if (visibleUserInjection || isVisibleTerminalAssistantMessage(record)) {
       const stamp = this.recordRegistryActivity(
         threadId,
@@ -27425,6 +27844,8 @@ Its execution was lost (the executor restarted or hung) and automatic recovery w
         type: agentDef.type,
         created_at: Date.now(),
         max_session_turns: agentDef.maxSessionTurns,
+        hooks: agentDef.hooks ?? [],
+        _package: agentDef.__package,
         side_a_label: agentDef.sideA?.label,
         side_a_agent_prompt: qualifyPromptName(agentDef.sideA?.prompt),
         side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? true,
@@ -27650,6 +28071,8 @@ Its execution was lost (the executor restarted or hung) and automatic recovery w
         type: agentDef.type,
         created_at: Date.now(),
         max_session_turns: agentDef.maxSessionTurns,
+        hooks: agentDef.hooks ?? [],
+        _package: agentDef.__package,
         side_a_label: agentDef.sideA?.label,
         side_a_agent_prompt: qualifyPromptName(agentDef.sideA?.prompt),
         side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? true,
@@ -27806,6 +28229,8 @@ Its execution was lost (the executor restarted or hung) and automatic recovery w
         type: agentDef.type,
         created_at: Date.now(),
         max_session_turns: agentDef.maxSessionTurns,
+        hooks: agentDef.hooks ?? [],
+        _package: agentDef.__package,
         side_a_label: agentDef.sideA?.label,
         side_a_agent_prompt: qualifyPromptName(agentDef.sideA?.prompt),
         side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? true,
@@ -29462,8 +29887,7 @@ var DurableUserHub = class extends DurableObject {
 init_utilities();
 
 // src/agents/FlowStateSdk.ts
-init_types();
-var FlowStateSdk = class _FlowStateSdk {
+var FlowStateSdk = class {
   /**
    * Queue a new tool call to be executed in the current flow
    *
@@ -29530,63 +29954,8 @@ var FlowStateSdk = class _FlowStateSdk {
    * ```
    */
   static async injectMessage(flow, options) {
-    const messageId = options.id ?? crypto.randomUUID();
-    const timestamp = Date.now() * TIMESTAMP_MULTIPLIER;
-    const silent = options.silent ?? false;
-    const forceTopLevel = options.forceTopLevel ?? false;
-    const message = {
-      id: messageId,
-      role: options.role,
-      content: options.content,
-      name: options.name ?? null,
-      tool_call_id: options.toolCallId ?? null,
-      created_at: timestamp,
-      status: "completed",
-      silent,
-      parent_id: forceTopLevel ? null : flow.parentMessageId ?? null,
-      depth: forceTopLevel ? 0 : flow.depth
-    };
-    if (options.beforeMessageId) {
-      const cursor = await flow.storage.sql.exec(
-        `SELECT created_at FROM messages WHERE id = ?`,
-        options.beforeMessageId
-      );
-      const rows = cursor.toArray();
-      const targetMessage = rows[0];
-      if (!targetMessage) {
-        throw new Error(
-          `Message with id ${options.beforeMessageId} not found`
-        );
-      }
-      message.created_at = targetMessage.created_at - 1;
-    }
-    const currentPrompt = flow.promptPath.length > 0 ? flow.promptPath[flow.promptPath.length - 1] : null;
-    await flow.storage.sql.exec(
-      `INSERT INTO messages (id, role, content, name, tool_call_id, created_at, status, silent, parent_id, depth, prompt) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-      messageId,
-      message.role,
-      message.content,
-      message.name,
-      message.tool_call_id,
-      message.created_at,
-      message.status,
-      silent ? 1 : 0,
-      message.parent_id,
-      message.depth,
-      currentPrompt
-    );
-    if (!silent) {
-      flow.messageHistory.push(message);
-    } else {
-      flow.messageHistory = await _FlowStateSdk.reloadHistory(flow);
-    }
-    if (flow.emitMessage) {
-      flow.emitMessage(message);
-    }
-    if (options.forceTurn) {
-      _FlowStateSdk.forceTurn(flow, options.forceTurn);
-    }
-    return message;
+    const { injectMessage: injectMessage2 } = await Promise.resolve().then(() => (init_utilities(), utilities_exports));
+    return injectMessage2(flow, options);
   }
   /**
    * Get messages from the thread history
@@ -29675,9 +30044,9 @@ var FlowStateSdk = class _FlowStateSdk {
   /**
    * Reload message history from storage
    *
-   * Re-loads the complete message history from the thread's SQLite storage,
-   * applying any filter_messages hooks. This is useful when you need to refresh
-   * the message history after making changes (e.g., injecting silent messages).
+   * Re-loads the complete message history from the thread's SQLite storage.
+   * This is useful when you need to refresh the message history after making
+   * changes (e.g., injecting messages).
    *
    * @param flow - The current FlowState
    * @returns Array of messages (reloaded from storage)
@@ -29818,6 +30187,7 @@ function enhanceFlowState(flow) {
 init_context();
 init_ProviderRegistry();
 init_types2();
+init_resolver();
 
 export { CLIENT_STREAM_CHUNK_BYTES, CodeExecutionBridge, DurableAgentBuilder, DurableThread, DurableUserHub, FlowStateSdk, NamespaceResolutionError, ProviderRegistry, ThreadWatchdog, applyRuntimeCors, authenticate, buildImageDescription, callClient, callClientStream, canAccessThread, cat, createNamespaceContext, createThreadEndpointHandler, decodeStreamChunk, defineController2 as defineController, emitThreadEvent, encodeStreamChunk, endpointCallerFromAuth, enhanceFlowState, exists, find, forceTurn, generateImageDescription, getFileStats, getMessages, getMessagesToSummarize, getShortName, getThumbnail, getUnsummarizedImageAttachments, getVisibleAgentNames, getVisibleModelNames, getVisiblePromptNames, getVisibleToolNames, grep, hasImageAttachments, head, injectMessage, isAdminOnlyApiRoute, isHostedInstance, isPublicApiRoute, isQualifiedName, isSameOriginBrowserRequest, isTrustedLocalDevelopmentRequest, linkFile, mkdir, move, optimizeImageContext, parseQualifiedName, qualifyName, queueTool, readFile, readdir, reloadHistory, rename, replaceImagesWithDescriptions, requireAdmin, requireAuth, resolveAgent, resolveHook, resolveModel, resolvePrompt, resolveTool, rmdir, runtimeCorsHeaders, runtimePreflightResponse, stat, supportsClientForwarding, tail, unlink, updateThread, writeFile, writeImage };
 //# sourceMappingURL=runtime.js.map