@standardagents/builder 0.39.0 → 0.40.0

package/dist/index.js

@@ -1498,6 +1498,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;
@@ -6806,6 +6809,547 @@ var init_context = __esm({
   }
 });
 
+// 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;
+      }
+    }
+    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, {
@@ -6822,6 +7366,7 @@ var init_FlowEngine = __esm({
     init_context();
     init_sessionTools();
     init_ThreadStateImpl();
+    init_ParentHookResolver();
     IMMEDIATE_BOOTSTRAP_TOOL_NAME = "bootstrap_immediate_subagent";
     HookBlockedExecutionError = class extends Error {
       constructor(message) {
@@ -7164,7 +7709,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
         };
       }
       /**
@@ -7554,6 +8100,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,
@@ -7644,28 +8192,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?.({
@@ -7680,6 +8212,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();
@@ -7699,7 +8262,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
           });
@@ -8221,8 +8784,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) {
@@ -8258,7 +8821,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;
           }
@@ -8424,10 +8987,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);
           }
@@ -8577,7 +9140,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;
@@ -9448,8 +10020,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();
@@ -9458,7 +10030,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);
@@ -9600,24 +10172,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
@@ -9625,24 +10181,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
@@ -9660,9 +10209,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));
@@ -9680,9 +10229,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;
             }
@@ -9699,9 +10248,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);
           }
@@ -9715,20 +10264,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);
           }
         }
@@ -9741,13 +10297,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);
           }
@@ -9788,9 +10344,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);
           }
@@ -9808,9 +10364,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);
           }
@@ -9830,9 +10386,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);
           }
@@ -9852,10 +10408,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);
           }
@@ -9875,10 +10431,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);
           }
@@ -9908,9 +10464,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);
           }
@@ -9938,9 +10494,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);
           }
@@ -10245,7 +10801,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
           }
           existingPathMessages.add(content);
           const attachmentsJson = JSON.stringify([ref]);
-          const silentMessage = {
+          let silentMessage = {
             id: crypto.randomUUID(),
             role: sourceMessage.role,
             content,
@@ -10256,6 +10812,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             parent_id: parentId,
             depth
           };
+          silentMessage = await this.runBeforeCreateMessageHook(state, silentMessage);
           await state.storage.sql.exec(
             `
         INSERT INTO messages (
@@ -10266,15 +10823,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);
           }
@@ -10813,7 +11371,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 {
@@ -10849,8 +11407,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,
@@ -10873,43 +11434,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
@@ -11053,6 +11648,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)) {
@@ -11080,7 +11704,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,
@@ -11094,41 +11718,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);
   }
@@ -11137,6 +11772,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(
@@ -16868,6 +17539,10 @@ function generateAgentFile(data) {
   if (data.toolDescription) {
     lines.push(`  toolDescription: '${escapeString3(data.toolDescription)}',`);
   }
+  if (data.parentHooks && data.parentHooks.length > 0) {
+    const serialized = JSON.stringify(data.parentHooks, null, 2).split("\n").map((line, index) => index === 0 ? line : `  ${line}`).join("\n");
+    lines.push(`  parentHooks: ${serialized},`);
+  }
   const env = data.env ?? (data.tenvs || void 0);
   if (env && Object.keys(env).length > 0) {
     lines.push(`  env: ${JSON.stringify(env)},`);
@@ -17637,6 +18312,9 @@ function transformAgentData(data) {
   if (data.tool_description) {
     transformed.toolDescription = data.tool_description;
   }
+  if (data.parent_hooks !== void 0 || data.parentHooks !== void 0) {
+    transformed.parentHooks = data.parent_hooks ?? data.parentHooks;
+  }
   if (data.env !== void 0 || data.tenvs !== void 0) {
     transformed.env = normalizeStringEnvRecord(data.env ?? data.tenvs) ?? {};
   }
@@ -17882,6 +18560,22 @@ function validateAgentData(data) {
   if (data.exposeAsTool && !data.toolDescription) {
     errors["tool_description"] = "Tool description is required when expose as tool is enabled";
   }
+  if (data.parentHooks !== void 0) {
+    if (!Array.isArray(data.parentHooks)) {
+      errors["parent_hooks"] = "Parent hooks must be an array";
+    } else if (data.type !== "dual_ai" || !data.exposeAsTool) {
+      errors["parent_hooks"] = "Parent hooks require an exposed dual_ai agent";
+    } else {
+      const seen = /* @__PURE__ */ new Set();
+      for (const requirement of data.parentHooks) {
+        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" || seen.has(requirement.hook)) {
+          errors["parent_hooks"] = "Parent hook entries require a unique hook, reason, and valid stage";
+          break;
+        }
+        seen.add(requirement.hook);
+      }
+    }
+  }
   if (data.maxSessionTurns !== void 0 && data.maxSessionTurns !== null) {
     if (typeof data.maxSessionTurns !== "number" || data.maxSessionTurns <= 0) {
       errors["max_session_turns"] = "Max session turns must be a positive number";
@@ -18027,6 +18721,44 @@ function discoverPackedPackageDirectories(packedDir) {
   }
   return packageDirs;
 }
+function discoverStandardAgentPackageDirectories(rootDir) {
+  const packages = /* @__PURE__ */ new Map();
+  const addPackage = (packagePath, source) => {
+    const packageJsonPath = path9__default.join(packagePath, "package.json");
+    if (!fs9__default.existsSync(packageJsonPath)) return;
+    try {
+      const packageJson = JSON.parse(fs9__default.readFileSync(packageJsonPath, "utf8"));
+      if (typeof packageJson.name !== "string" || !Array.isArray(packageJson.standardagent?.entryAgents)) {
+        return;
+      }
+      packages.set(packageJson.name, { path: packagePath, source });
+    } catch {
+    }
+  };
+  const nodeModulesDir = path9__default.join(rootDir, "node_modules");
+  if (fs9__default.existsSync(nodeModulesDir)) {
+    for (const entry of fs9__default.readdirSync(nodeModulesDir, { withFileTypes: true })) {
+      if (entry.name.startsWith(".")) continue;
+      const entryPath = path9__default.join(nodeModulesDir, entry.name);
+      if (entry.name.startsWith("@")) {
+        if (!fs9__default.existsSync(entryPath)) continue;
+        for (const scopedEntry of fs9__default.readdirSync(entryPath, { withFileTypes: true })) {
+          if (!scopedEntry.name.startsWith(".")) {
+            addPackage(path9__default.join(entryPath, scopedEntry.name), "npm");
+          }
+        }
+      } else {
+        addPackage(entryPath, "npm");
+      }
+    }
+  }
+  for (const packagePath of discoverPackedPackageDirectories(
+    path9__default.join(rootDir, "agents", "packed")
+  )) {
+    addPackage(packagePath, "local");
+  }
+  return [...packages.values()];
+}
 function scanPackedDistDirectory(packagePath, outputDir, subDir) {
   const fullPath = path9__default.join(packagePath, outputDir, subDir);
   if (!fs9__default.existsSync(fullPath)) {
@@ -18970,11 +19702,19 @@ async function extractPromptTools(sourceCode) {
               result.tools.push(element.text);
             } else if (ts.isObjectLiteralExpression(element)) {
               result.hasSubpromptConfigs = true;
+              let configuredName;
+              let implementingAgent;
               for (const objProp of element.properties) {
-                if (ts.isPropertyAssignment(objProp) && ts.isIdentifier(objProp.name) && objProp.name.text === "name" && ts.isStringLiteral(objProp.initializer)) {
-                  result.tools.push(objProp.initializer.text);
+                if (ts.isPropertyAssignment(objProp) && ts.isIdentifier(objProp.name) && ts.isStringLiteral(objProp.initializer)) {
+                  if (objProp.name.text === "name") {
+                    configuredName = objProp.initializer.text;
+                  } else if (objProp.name.text === "agent") {
+                    implementingAgent = objProp.initializer.text;
+                  }
                 }
               }
+              const dependencyName = implementingAgent ?? configuredName;
+              if (dependencyName) result.tools.push(dependencyName);
             }
           }
         }
@@ -19097,6 +19837,106 @@ async function extractAgentPrompts(sourceCode) {
   visit(sourceFile);
   return result;
 }
+async function extractAgentHooks(sourceCode) {
+  const ts = await loadTypeScript();
+  const sourceFile = ts.createSourceFile(
+    "agent.ts",
+    sourceCode,
+    ts.ScriptTarget.ESNext,
+    true
+  );
+  const arrays = /* @__PURE__ */ new Map();
+  const result = {
+    hooks: [],
+    parentHooks: [],
+    parentHookRequirements: []
+  };
+  const unwrapArray = (expression) => {
+    let current = expression;
+    while (ts.isParenthesizedExpression(current) || ts.isAsExpression(current) || ts.isSatisfiesExpression(current)) {
+      current = current.expression;
+    }
+    if (ts.isArrayLiteralExpression(current)) return current;
+    if (ts.isIdentifier(current)) return arrays.get(current.text) ?? null;
+    return null;
+  };
+  for (const statement of sourceFile.statements) {
+    if (!ts.isVariableStatement(statement)) continue;
+    for (const declaration of statement.declarationList.declarations) {
+      if (ts.isIdentifier(declaration.name) && declaration.initializer) {
+        const array = unwrapArray(declaration.initializer);
+        if (array) arrays.set(declaration.name.text, array);
+      }
+    }
+  }
+  const pushUnique = (target, value) => {
+    if (!target.includes(value)) target.push(value);
+  };
+  function visit(node) {
+    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "defineAgent" && node.arguments.length > 0 && ts.isObjectLiteralExpression(node.arguments[0])) {
+      for (const property of node.arguments[0].properties) {
+        if (!ts.isPropertyAssignment(property) || !ts.isIdentifier(property.name)) continue;
+        const array = unwrapArray(property.initializer);
+        if (!array) continue;
+        if (property.name.text === "hooks") {
+          for (const element of array.elements) {
+            if (ts.isStringLiteral(element)) pushUnique(result.hooks, element.text);
+          }
+        }
+        if (property.name.text === "parentHooks") {
+          for (const element of array.elements) {
+            if (!ts.isObjectLiteralExpression(element)) continue;
+            let hook;
+            let reason;
+            let stage;
+            for (const requirement of element.properties) {
+              if (ts.isPropertyAssignment(requirement) && ts.isIdentifier(requirement.name) && ts.isStringLiteral(requirement.initializer)) {
+                if (requirement.name.text === "hook") hook = requirement.initializer.text;
+                if (requirement.name.text === "reason") reason = requirement.initializer.text;
+                if (requirement.name.text === "stage" && (requirement.initializer.text === "before_parent" || requirement.initializer.text === "after_parent")) {
+                  stage = requirement.initializer.text;
+                }
+              }
+            }
+            if (hook) {
+              pushUnique(result.parentHooks, hook);
+              if (reason) result.parentHookRequirements.push({ hook, reason, stage });
+            }
+          }
+        }
+      }
+    }
+    ts.forEachChild(node, visit);
+  }
+  visit(sourceFile);
+  return result;
+}
+async function extractPromptHooks(sourceCode) {
+  const ts = await loadTypeScript();
+  const sourceFile = ts.createSourceFile(
+    "prompt.ts",
+    sourceCode,
+    ts.ScriptTarget.ESNext,
+    true
+  );
+  const hooks = [];
+  function visit(node) {
+    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "definePrompt" && node.arguments.length > 0 && ts.isObjectLiteralExpression(node.arguments[0])) {
+      for (const property of node.arguments[0].properties) {
+        if (ts.isPropertyAssignment(property) && ts.isIdentifier(property.name) && property.name.text === "hooks" && ts.isArrayLiteralExpression(property.initializer)) {
+          for (const element of property.initializer.elements) {
+            if (ts.isStringLiteral(element) && !hooks.includes(element.text)) {
+              hooks.push(element.text);
+            }
+          }
+        }
+      }
+    }
+    ts.forEachChild(node, visit);
+  }
+  visit(sourceFile);
+  return hooks;
+}
 async function extractAgentDescription(sourceCode) {
   const ts = await loadTypeScript();
   const sourceFile = ts.createSourceFile(
@@ -19336,6 +20176,13 @@ var PackingService = class {
     });
     const agentSource = fs9.readFileSync(agentFilePath, "utf-8");
     const agentPrompts = await extractAgentPrompts(agentSource);
+    const agentHooks = await extractAgentHooks(agentSource);
+    for (const hookId of agentHooks.hooks) {
+      await this.analyzeHook(hookId, agentsDir, analysis, false, `agent:${agentName}`);
+    }
+    for (const hookId of agentHooks.parentHooks) {
+      await this.analyzeHook(hookId, agentsDir, analysis, true, `agent:${agentName}`);
+    }
     if (agentPrompts.sideA) {
       analysis.primaryPrompt = agentPrompts.sideA;
       await this.analyzePrompt(agentPrompts.sideA, agentsDir, analysis, /* @__PURE__ */ new Set(), `agent:${agentName}`);
@@ -19538,6 +20385,9 @@ var PackingService = class {
     }
     visited.add(`prompt:${promptName}`);
     const promptSource = fs9.readFileSync(promptFilePath, "utf-8");
+    for (const hookId of await extractPromptHooks(promptSource)) {
+      await this.analyzeHook(hookId, agentsDir, analysis, false, thisKey);
+    }
     const modelName = await extractPromptModel(promptSource);
     if (modelName) {
       await this.analyzeModel(modelName, agentsDir, analysis, visited, thisKey);
@@ -19622,6 +20472,13 @@ var PackingService = class {
     visited.add(`agent:${agentName}`);
     const agentSource = fs9.readFileSync(agentFilePath, "utf-8");
     const agentPrompts = await extractAgentPrompts(agentSource);
+    const agentHooks = await extractAgentHooks(agentSource);
+    for (const hookId of agentHooks.hooks) {
+      await this.analyzeHook(hookId, agentsDir, analysis, false, thisKey);
+    }
+    for (const hookId of agentHooks.parentHooks) {
+      await this.analyzeHook(hookId, agentsDir, analysis, true, thisKey);
+    }
     if (agentPrompts.sideA) {
       await this.analyzePrompt(agentPrompts.sideA, agentsDir, analysis, visited, thisKey);
     }
@@ -19629,6 +20486,27 @@ var PackingService = class {
       await this.analyzePrompt(agentPrompts.sideB, agentsDir, analysis, visited, thisKey);
     }
   }
+  /** Add a hook referenced by an agent or prompt to the packed graph. */
+  async analyzeHook(hookId, agentsDir, analysis, required, parentKey) {
+    const hookFilePath = await this.findFile(path9.join(agentsDir, "hooks"), hookId);
+    if (!hookFilePath) {
+      const message = `Hook file not found for ID: ${hookId}`;
+      if (required) analysis.errors.push(message);
+      else analysis.warnings.push(message);
+      return;
+    }
+    if (!analysis.constituents.hooks.some(
+      (hook) => hook.name === hookId && hook.parentKey === parentKey
+    )) {
+      analysis.constituents.hooks.push({
+        name: hookId,
+        filePath: hookFilePath,
+        discoveredVia: "static",
+        sharedWith: [],
+        parentKey
+      });
+    }
+  }
   /**
    * Analyze a model and its fallbacks.
    */
@@ -19763,11 +20641,17 @@ var PackingService = class {
     } = options;
     const finalPackageName = packageName || packageId;
     const packedAt = Date.now();
+    const entryAgentFile = await this.findFile(
+      path9.join(rootDir, "agents", "agents"),
+      agentName
+    );
+    const entryParentHooks = entryAgentFile ? (await extractAgentHooks(fs9.readFileSync(entryAgentFile, "utf-8"))).parentHookRequirements : [];
     const meta = {
       packageId,
       version,
       entryAgents: [agentName],
-      packedAt
+      packedAt,
+      ...entryParentHooks.length > 0 ? { parentHooks: { [agentName]: entryParentHooks } } : {}
     };
     const result = {
       success: false,
@@ -19876,6 +20760,7 @@ var PackingService = class {
         agentName,
         this.deduplicateConstituents(analysis).effects.map((effect) => effect.name),
         this.deduplicateConstituents(analysis).threadEndpoints.map((endpoint) => endpoint.name),
+        meta.parentHooks,
         externalDeps,
         rootDir,
         license,
@@ -20267,7 +21152,7 @@ var PackingService = class {
   /**
    * Generate the package.json file with dependencies.
    */
-  generatePackageJson(packageName, version, agentName, effects, threadEndpoints, externalDeps, rootDir, license, licenseOwner) {
+  generatePackageJson(packageName, version, agentName, effects, threadEndpoints, parentHooks, externalDeps, rootDir, license, licenseOwner) {
     const dependencies = {
       "@standardagents/spec": this.resolvePackageVersion("@standardagents/spec", rootDir)
     };
@@ -20289,6 +21174,7 @@ var PackingService = class {
       keywords: ["standardagent"],
       standardagent: {
         entryAgents: [agentName],
+        ...parentHooks ? { parentHooks } : {},
         ...effects.length > 0 ? { effects } : {},
         ...threadEndpoints.length > 0 ? { threadEndpoints } : {}
       },
@@ -20582,6 +21468,22 @@ ${license || "See LICENSE file"}
     return agents;
   }
 };
+function validParentHooks(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+  return Object.values(value).every((requirements) => {
+    if (!Array.isArray(requirements)) return false;
+    const seen = /* @__PURE__ */ new Set();
+    return requirements.every((requirement) => {
+      if (typeof requirement !== "object" || requirement === null) return false;
+      const item = requirement;
+      if (typeof item.hook !== "string" || !item.hook.trim() || typeof item.reason !== "string" || !item.reason.trim() || item.stage !== void 0 && item.stage !== "before_parent" && item.stage !== "after_parent" || seen.has(item.hook)) {
+        return false;
+      }
+      seen.add(item.hook);
+      return true;
+    });
+  });
+}
 var PackageDiscoveryService = class {
   config;
   constructor(config) {
@@ -20677,6 +21579,7 @@ var PackageDiscoveryService = class {
       }
       const effects = Array.isArray(pkgJson.standardagent.effects) && pkgJson.standardagent.effects.every((effectName) => typeof effectName === "string") ? pkgJson.standardagent.effects : void 0;
       const threadEndpoints = Array.isArray(pkgJson.standardagent.threadEndpoints) && pkgJson.standardagent.threadEndpoints.every((endpoint) => typeof endpoint === "string") ? pkgJson.standardagent.threadEndpoints : void 0;
+      const parentHooks = validParentHooks(pkgJson.standardagent.parentHooks) ? pkgJson.standardagent.parentHooks : void 0;
       return {
         packageId: pkgJson.name || pkgName,
         version: pkgJson.version || "0.0.0",
@@ -20685,6 +21588,7 @@ var PackageDiscoveryService = class {
         entryAgents: pkgJson.standardagent.entryAgents,
         ...effects ? { effects } : {},
         ...threadEndpoints ? { threadEndpoints } : {},
+        ...parentHooks ? { parentHooks } : {},
         description: pkgJson.description
       };
     } catch (error) {
@@ -20746,6 +21650,7 @@ var PackageDiscoveryService = class {
       }
       const effects = Array.isArray(pkgJson.standardagent.effects) && pkgJson.standardagent.effects.every((effectName) => typeof effectName === "string") ? pkgJson.standardagent.effects : void 0;
       const threadEndpoints = Array.isArray(pkgJson.standardagent.threadEndpoints) && pkgJson.standardagent.threadEndpoints.every((endpoint) => typeof endpoint === "string") ? pkgJson.standardagent.threadEndpoints : void 0;
+      const parentHooks = validParentHooks(pkgJson.standardagent.parentHooks) ? pkgJson.standardagent.parentHooks : void 0;
       return {
         packageId: pkgJson.name || dirName,
         version: pkgJson.version || "0.0.0",
@@ -20754,6 +21659,7 @@ var PackageDiscoveryService = class {
         entryAgents: pkgJson.standardagent.entryAgents,
         ...effects ? { effects } : {},
         ...threadEndpoints ? { threadEndpoints } : {},
+        ...parentHooks ? { parentHooks } : {},
         description: pkgJson.description
       };
     } catch (error) {
@@ -20782,7 +21688,8 @@ var PackageDiscoveryService = class {
     const hasValidEntryAgents = Array.isArray(f.entryAgents) && f.entryAgents.length > 0 && f.entryAgents.every((e) => typeof e === "string");
     const hasValidEffects = f.effects === void 0 || Array.isArray(f.effects) && f.effects.every((effectName) => typeof effectName === "string");
     const hasValidThreadEndpoints = f.threadEndpoints === void 0 || Array.isArray(f.threadEndpoints) && f.threadEndpoints.every((endpoint) => typeof endpoint === "string");
-    return hasValidEntryAgents && hasValidEffects && hasValidThreadEndpoints;
+    const hasValidParentHooks = f.parentHooks === void 0 || validParentHooks(f.parentHooks);
+    return hasValidEntryAgents && hasValidEffects && hasValidThreadEndpoints && hasValidParentHooks;
   }
   /**
    * Get a package by ID.
@@ -22410,13 +23317,13 @@ async function loadRegistryVirtualModule(context) {
     const absPath = toAbsolutePath(importPath);
     return `    "${name}": async () => (await import("${absPath}")).default,`;
   }).join("\n");
-  const packedDir = path9__default.resolve(process.cwd(), "agents/packed");
+  const projectRoot = process.cwd();
   const packedPackages = [];
-  if (fs9__default.existsSync(packedDir)) {
-    console.log(`[vite-plugin-agent] Scanning packed directory: ${packedDir}`);
-    const packageDirs = discoverPackedPackageDirectories(packedDir);
-    console.log(`[vite-plugin-agent] Found package dirs: ${packageDirs.join(", ")}`);
-    for (const pkgPath of packageDirs) {
+  {
+    const packageDirs = discoverStandardAgentPackageDirectories(projectRoot);
+    console.log(`[vite-plugin-agent] Found Standard Agent package dirs: ${packageDirs.map((pkg) => pkg.path).join(", ")}`);
+    for (const discovered of packageDirs) {
+      const pkgPath = discovered.path;
       const pkgJsonPath = path9__default.join(pkgPath, "package.json");
       if (fs9__default.existsSync(pkgJsonPath)) {
         try {
@@ -22430,6 +23337,7 @@ async function loadRegistryVirtualModule(context) {
           const pkg = {
             packageId: pkgJson.name,
             version: pkgJson.version,
+            source: discovered.source,
             entryAgents: pkgJson.standardagent.entryAgents || [],
             items: {
               agents: scanPackedDistDirectory(pkgPath, outputDir, "agents"),
@@ -22448,15 +23356,13 @@ async function loadRegistryVirtualModule(context) {
         }
       }
     }
-  } else {
-    console.log(`[vite-plugin-agent] Packed directory does not exist: ${packedDir}`);
   }
   console.log(`[vite-plugin-agent] Total packed packages found: ${packedPackages.length}`);
   const packagesCode = packedPackages.map((pkg) => {
     const signature = JSON.stringify({
       packageId: pkg.packageId,
       version: pkg.version,
-      source: "local",
+      source: pkg.source,
       packedAt: Date.now()
     });
     const genLoaders = (items) => items.map(
@@ -22555,9 +23461,9 @@ async function loadRoutesVirtualModule(context) {
   );`;
   }).join("\n");
   const packedThreadRoutes = [];
-  const packedDir = path9__default.resolve(process.cwd(), "agents/packed");
-  const packedPackageDirs = discoverPackedPackageDirectories(packedDir);
-  for (const packagePath of packedPackageDirs) {
+  const packedPackageDirs = discoverStandardAgentPackageDirectories(process.cwd());
+  for (const discovered of packedPackageDirs) {
+    const packagePath = discovered.path;
     const packageJsonPath = path9__default.join(packagePath, "package.json");
     if (!fs9__default.existsSync(packageJsonPath)) {
       continue;
@@ -26410,321 +27316,8 @@ async function decryptEnvs(encrypted, encryptionKey) {
   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`
-    );
-  }
-  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;
-      }
-    }
-    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("/");
-}
-
 // src/durable-objects/DurableAgentBuilder.ts
+init_resolver();
 init_types();
 
 // src/skills/frontmatter.ts
@@ -26816,6 +27409,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;
@@ -27497,16 +28091,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));
@@ -27521,16 +28128,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
+        );
       }
     }
   }
@@ -28742,6 +29347,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) {
@@ -30030,6 +30644,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 = [
@@ -30703,6 +31319,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,
@@ -30732,7 +31349,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
     };
   }
   /**
@@ -31402,6 +32020,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.
    *
@@ -31414,22 +32055,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,
@@ -31440,9 +32066,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,
@@ -35900,6 +36554,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,
@@ -36125,6 +36781,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,
@@ -36281,6 +36939,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,
@@ -37937,8 +38597,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
    *
@@ -38005,63 +38664,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
@@ -38150,9 +38754,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)
@@ -38294,6 +38898,9 @@ init_context();
 init_ProviderRegistry();
 init_types2();
 
+// src/packing/index.ts
+init_resolver();
+
 export { CLIENT_STREAM_CHUNK_BYTES, CodeExecutionBridge, DurableAgentBuilder, DurableThread, DurableUserHub, FlowStateSdk, NamespaceResolutionError, PackageDiscoveryService, ProviderRegistry, ThreadWatchdog, agentbuilder, applyRuntimeCors, assistantMessageText, authenticate, buildImageDescription, builder, callClient, callClientStream, canAccessThread, cat, createNamespaceContext, createThreadEndpointHandler, decodeStreamChunk, defineController2 as defineController, discoverPackages, emitThreadEvent, encodeStreamChunk, endpointCallerFromAuth, enhanceFlowState, exists, find, forceTurn, generateAgentFile, generateImageDescription, generateModelFile, generatePromptFile, getFileStats, getMessages, getMessagesToSummarize, getShortName, getThumbnail, getUnsummarizedImageAttachments, getVisibleAgentNames, getVisibleModelNames, getVisiblePromptNames, getVisibleToolNames, grep, hasImageAttachments, hasJsonArrayEntries, head, injectMessage, isAdminOnlyApiRoute, isHostedInstance, isPublicApiRoute, isQualifiedName, isSameOriginBrowserRequest, isTrustedLocalDevelopmentRequest, isVisibleTerminalAssistantMessage, linkFile, messageTimestampSeconds, 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=index.js.map
 //# sourceMappingURL=index.js.map