negotium 0.22.2 → 0.22.3

package/dist/main.js

@@ -6536,7 +6536,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.22.2";
+var NEGOTIUM_VERSION = "0.22.3";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -7166,12 +7166,6 @@ var init_registry = __esm(async () => {
 });
 
 // ../../packages/core/src/agents/fork.ts
-var exports_fork = {};
-__export(exports_fork, {
-  forkAgentSession: () => forkAgentSession,
-  createAgentForkHelpers: () => createAgentForkHelpers,
-  cleanupAgentFork: () => cleanupAgentFork
-});
 import { existsSync as existsSync10, unlinkSync as unlinkSync7 } from "fs";
 function createAgentForkHelpers(host) {
   return {
@@ -27574,22 +27568,8 @@ function normalizeAskTarget(target) {
     return "main";
   return target === "cron" ? "cron" : null;
 }
-function askRunsOnTargetSession(target) {
-  return target === "main";
-}
-async function createAskForkPlan(options) {
-  const snapshot = structuredClone(options.entries);
-  const prepareSession = options.prepareSession ?? (async () => options.synthesize(structuredClone(snapshot)));
-  let forkHandle;
-  if (options.forkNative) {
-    try {
-      forkHandle = await options.forkNative();
-    } catch (error) {
-      options.onNativeForkError?.(error);
-    }
-  }
-  forkHandle ??= await options.synthesize(structuredClone(snapshot));
-  return { forkHandle, prepareSession };
+function askRunsOnTargetSession(_target) {
+  return true;
 }
 function scheduledEntryDeliveryTime(value) {
   if (!value || typeof value !== "object")
@@ -28150,22 +28130,11 @@ ${entry.message}
   const { getTopic: getTopic2 } = await init_api_topics().then(() => exports_api_topics);
   const fullTopic = getTopic2(topic.id);
   const agentOverride = fullTopic?.agent ?? topic.agent ?? undefined;
-  const cwd = resolveTopicWorkspaceDir(topic.id);
   if (!agentOverride) {
     clearPendingAskForEntry(scope, entry, topicName, "target-agent-missing");
     await notifyAskDrop(scope, entry, topicName, "(error: target topic has no agent)");
     return;
   }
-  const { cleanupAgentFork: cleanupAgentFork2, forkAgentSession: forkAgentSession2 } = await init_fork().then(() => exports_fork);
-  const { getRegistry: getRegistry2, getRegistryOperations: getRegistryOperations2 } = await init_registry().then(() => exports_registry);
-  const { resolveModelForAgent: resolveModelForAgent2 } = await Promise.resolve().then(() => (init_model_catalog(), exports_model_catalog));
-  const { getApiTopicConfig: getApiTopicConfig2 } = await init_api_topic_config().then(() => exports_api_topic_config);
-  const { readConversation: readConversation2 } = await init_conversations().then(() => exports_conversations);
-  const registry = getRegistry2(agentOverride);
-  const topicConfig = getApiTopicConfig2(topic.id);
-  const model = resolveModelForAgent2(agentOverride, topicConfig?.model ?? fullTopic?.defaultModel, registry);
-  const requestedEffort = topicConfig?.effort ?? fullTopic?.defaultEffort;
-  const effort = requestedEffort && registry.validateEffort(requestedEffort) ? requestedEffort : registry.defaultEffort;
   const cronSession = askTarget === "cron" ? getRegisteredCronSession(topic.id, agentOverride) : null;
   const parentSessionId = askTarget === "cron" ? cronSession?.sessionId ?? null : getTopicSessionId(topic.id);
   if (askTarget === "cron" && !parentSessionId) {
@@ -28225,103 +28194,17 @@ ${entry.message}
         label: `Ask from ${fromLabel}`,
         message: entry.message
       },
+      ...askTarget === "cron" ? {
+        sessionId: parentSessionId,
+        sessionScope: "isolated",
+        turnConcurrency: "isolated"
+      } : {},
       onSettled,
       onDispatched
     });
     logger.info({ topicName, from: entry.from, requestId, callerTopicId, agent: agentOverride }, "session-inbox: ask delivered to target session");
     return;
   }
-  const forkNative = parentSessionId ? () => forkAgentSession2({
-    agent: agentOverride,
-    parentSessionId,
-    cwd,
-    userId: scope.userId,
-    topicName,
-    title: `ask: ${entry.from} -> ${targetLabel}`,
-    model,
-    ...effort ? { effort } : {}
-  }) : undefined;
-  let forkPlan;
-  try {
-    forkPlan = await createAskForkPlan({
-      entries: askTarget === "cron" ? [] : readConversation2(scope.userId, topicName),
-      ...forkNative ? { forkNative } : {},
-      ...askTarget === "cron" && forkNative ? { prepareSession: forkNative } : {},
-      synthesize: async (entries) => {
-        if (askTarget === "cron") {
-          throw new Error("cron session fork failed");
-        }
-        const rollout = getRegistryOperations2(agentOverride).writeRollout({
-          cwd,
-          entries,
-          model,
-          ...effort ? { effort } : {}
-        });
-        return {
-          agent: agentOverride,
-          forkId: rollout.sessionId,
-          rolloutPath: rollout.rolloutPath
-        };
-      },
-      onNativeForkError: (err2) => {
-        logger.warn({ err: err2, topicName, from: entry.from, requestId, parentSessionId }, "session-inbox: native target fork failed");
-      }
-    });
-  } catch (err2) {
-    logger.error({ err: err2, topicName, from: entry.from, requestId, parentSessionId }, "session-inbox: failed to prepare target ask session");
-    try {
-      clearPendingAskForEntry(scope, entry, topicName, "target-session-prepare-failed");
-    } catch (clearError) {
-      logger.warn({ err: clearError, topicName, from: entry.from, requestId }, "session-inbox: failed to clear ask after session preparation failure");
-    }
-    const message2 = "(error: target session could not be prepared)";
-    if (remoteReply) {
-      try {
-        const delivered = await deliverPeerReply(remoteReply, targetLabel, message2, "error");
-        if (!delivered) {
-          logger.warn({ topicName, from: entry.from, requestId }, "session-inbox: failed to deliver remote ask preparation error");
-        }
-      } catch (deliveryError) {
-        logger.warn({ err: deliveryError, topicName, from: entry.from, requestId }, "session-inbox: remote ask preparation error delivery threw");
-      }
-    } else {
-      try {
-        await notifyAskDrop(scope, entry, targetLabel, message2);
-      } catch (deliveryError) {
-        logger.warn({ err: deliveryError, topicName, from: entry.from, requestId }, "session-inbox: local ask preparation error delivery threw");
-      }
-    }
-    return;
-  }
-  if (askTarget === "cron") {
-    const currentCronSession = getRegisteredCronSession(topic.id, agentOverride);
-    if (!cronSession || !currentCronSession || currentCronSession.sessionId !== cronSession.sessionId || currentCronSession.ownerUserId !== cronSession.ownerUserId) {
-      cleanupAgentFork2(forkPlan.forkHandle);
-      clearPendingAskForEntry(scope, entry, topicName, "cron-session-changed-during-fork");
-      const message2 = "(error: cron session changed while preparing the request; retry the request)";
-      if (remoteReply) {
-        await deliverPeerReply(remoteReply, targetLabel, message2, "error");
-      } else {
-        await notifyAskDrop(scope, entry, targetLabel, message2);
-      }
-      return;
-    }
-  }
-  triggerTopicAiTurn2(topic.id, String(scope.userId), prompt, agentOverride ?? topic.agent ?? undefined, {
-    origin: entry.from,
-    requestId,
-    contextId: entry.contextId,
-    depth: (entry.fromDepth ?? 0) + 1,
-    silent: true,
-    sessionId: forkPlan.forkHandle.forkId,
-    turnConcurrency: "isolated",
-    forkHandle: forkPlan.forkHandle,
-    prepareSession: forkPlan.prepareSession,
-    cwd,
-    onSettled,
-    onDispatched
-  });
-  logger.info({ topicName, from: entry.from, requestId, callerTopicId }, "session-inbox: ask delivered");
 }
 function stopLeaderResources2() {
   if (watcher2) {
@@ -58299,4 +58182,4 @@ switch (command) {
   }
 }
 
-//# debugId=C09F998B373A2DD164756E2164756E21
+//# debugId=EDA696EC3AD07A8E64756E2164756E21