negotium 0.19.0 → 0.19.1

package/dist/agent-helpers.js

@@ -3099,6 +3099,13 @@ function parseJsonlText(raw) {
   return raw.trim().split(`
 `).filter(Boolean).map((line) => JSON.parse(line));
 }
+function readJsonFile(filePath) {
+  try {
+    return JSON.parse(readFileSync2(filePath, "utf-8"));
+  } catch {
+    return null;
+  }
+}
 function lockStaleMs() {
   const raw = Number.parseInt(process.env.NEGOTIUM_JSONL_LOCK_STALE_MS ?? "", 10);
   return Number.isFinite(raw) && raw > 0 ? raw : DEFAULT_LOCK_STALE_MS;
@@ -3962,7 +3969,7 @@ var init_codex = __esm(async () => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.19.0";
+var NEGOTIUM_VERSION = "0.19.1";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -14952,15 +14959,84 @@ var init_derive = __esm(async () => {
   };
 });
 
+// ../../packages/core/src/query/state.ts
+import { mkdirSync as mkdirSync15, renameSync as renameSync7, unlinkSync as unlinkSync14, writeFileSync as writeFileSync13 } from "fs";
+import { basename as basename4, join as join24 } from "path";
+function createQueryStateStore(options) {
+  const sanitize = options.sanitizeTopicId ?? sanitizeId;
+  const queryStateDirPath = (userId) => join24(options.usersLogDir, String(userId), "active-queries");
+  const queryStateFile = (userId, topicId) => join24(queryStateDirPath(userId), `${sanitize(topicId)}.json`);
+  const legacyQueryStateFile = (userId, topicName) => {
+    if (!topicName || topicName === "." || topicName === ".." || basename4(topicName) !== topicName) {
+      return null;
+    }
+    return join24(queryStateDirPath(userId), `${topicName}.json`);
+  };
+  return {
+    write(userId, topicId, topicName, task) {
+      const dir = queryStateDirPath(userId);
+      mkdirSync15(dir, { recursive: true });
+      const state = { topicId, topicName, since: new Date().toISOString() };
+      if (task)
+        state.task = [...task.replace(/\n+/g, " ").trim()].slice(0, 100).join("");
+      const target = queryStateFile(userId, topicId);
+      const tmp = `${target}.${process.pid}.${Date.now()}.tmp`;
+      writeFileSync13(tmp, JSON.stringify(state));
+      renameSync7(tmp, target);
+    },
+    clear(userId, topicId, legacyTopicName) {
+      const paths = [
+        queryStateFile(userId, topicId),
+        legacyQueryStateFile(userId, legacyTopicName)
+      ].filter((path) => Boolean(path));
+      for (const path of new Set(paths)) {
+        try {
+          unlinkSync14(path);
+        } catch (error) {
+          if (error?.code !== "ENOENT") {
+            options.logger?.warn({ err: error, userId, topicId, path }, "Failed to clear query state file");
+          }
+        }
+      }
+    },
+    hasActive(userId, topicId) {
+      const state = readJsonFile(queryStateFile(userId, topicId));
+      if (!state)
+        return false;
+      const sinceMs = new Date(state.since).getTime();
+      return Date.now() - sinceMs <= ACTIVE_QUERY_STALE_MS;
+    }
+  };
+}
+function writeQueryState(userId, topicId, topicName, task) {
+  defaultQueryStateStore.write(userId, topicId, topicName, task);
+}
+function clearQueryState(userId, topicId, legacyTopicName) {
+  defaultQueryStateStore.clear(userId, topicId, legacyTopicName);
+}
+function hasActiveQuery(userId, topicId) {
+  return defaultQueryStateStore.hasActive(userId, topicId);
+}
+var defaultQueryStateStore;
+var init_state = __esm(() => {
+  init_config();
+  init_jsonl();
+  init_logger();
+  defaultQueryStateStore = createQueryStateStore({
+    usersLogDir: USERS_LOG_DIR,
+    logger
+  });
+});
+
 // ../../packages/core/src/query/session-inbox-path.ts
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 function sessionInboxPath(userId, topicId) {
   const key = Buffer.from(topicId, "utf8").toString("base64url");
-  return join24(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${JSONL_SUFFIX}`);
+  return join25(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${JSONL_SUFFIX}`);
 }
 function scheduledSessionInboxPath(userId, topicId) {
   const key = Buffer.from(topicId, "utf8").toString("base64url");
-  return join24(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${SCHEDULE_SUFFIX}`);
+  return join25(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${SCHEDULE_SUFFIX}`);
 }
 var TOPIC_ID_FILE_PREFIX = "topic-id-", JSONL_SUFFIX = ".jsonl", SCHEDULE_SUFFIX = ".schedule";
 var init_session_inbox_path = __esm(() => {
@@ -14968,12 +15044,12 @@ var init_session_inbox_path = __esm(() => {
 });
 
 // ../../packages/core/src/storage/session-inbox-signal.ts
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 var SESSION_INBOX_WAKE_FILE, listeners;
 var init_session_inbox_signal = __esm(() => {
   init_config();
   init_logger();
-  SESSION_INBOX_WAKE_FILE = join25(SESSION_INBOX_DIR, ".wake");
+  SESSION_INBOX_WAKE_FILE = join26(SESSION_INBOX_DIR, ".wake");
   listeners = new Set;
 });
 
@@ -15010,14 +15086,14 @@ var init_session_inbox = __esm(async () => {
 });
 
 // ../../packages/core/src/query/session-inbox-cleanup.ts
-import { unlinkSync as unlinkSync14 } from "fs";
-import { basename as basename4, join as join26 } from "path";
+import { unlinkSync as unlinkSync15 } from "fs";
+import { basename as basename5, join as join27 } from "path";
 function cleanupSessionInboxFiles(userId, topicId, legacyTopicTitle) {
   const live = sessionInboxPath(userId, topicId);
   const scheduled = scheduledSessionInboxPath(userId, topicId);
   const candidates = new Set([live, `${live}.processing`, scheduled, `${scheduled}.processing`]);
-  if (legacyTopicTitle && legacyTopicTitle !== "." && legacyTopicTitle !== ".." && basename4(legacyTopicTitle) === legacyTopicTitle) {
-    const legacyBase = join26(SESSION_INBOX_DIR, userId, legacyTopicTitle);
+  if (legacyTopicTitle && legacyTopicTitle !== "." && legacyTopicTitle !== ".." && basename5(legacyTopicTitle) === legacyTopicTitle) {
+    const legacyBase = join27(SESSION_INBOX_DIR, userId, legacyTopicTitle);
     for (const suffix of [".jsonl", ".jsonl.processing", ".schedule", ".schedule.processing"]) {
       candidates.add(`${legacyBase}${suffix}`);
     }
@@ -15025,7 +15101,7 @@ function cleanupSessionInboxFiles(userId, topicId, legacyTopicTitle) {
   let deleted = deleteSessionInboxForTopic(topicId);
   for (const path of candidates) {
     try {
-      unlinkSync14(path);
+      unlinkSync15(path);
       deleted++;
     } catch (err2) {
       if (err2?.code !== "ENOENT") {
@@ -15042,64 +15118,6 @@ var init_session_inbox_cleanup = __esm(async () => {
   await init_session_inbox();
 });
 
-// ../../packages/core/src/query/state.ts
-import { mkdirSync as mkdirSync15, renameSync as renameSync7, unlinkSync as unlinkSync15, writeFileSync as writeFileSync13 } from "fs";
-import { basename as basename5, join as join27 } from "path";
-function createQueryStateStore(options) {
-  const sanitize = options.sanitizeTopicId ?? sanitizeId;
-  const queryStateDirPath = (userId) => join27(options.usersLogDir, String(userId), "active-queries");
-  const queryStateFile = (userId, topicId) => join27(queryStateDirPath(userId), `${sanitize(topicId)}.json`);
-  const legacyQueryStateFile = (userId, topicName) => {
-    if (!topicName || topicName === "." || topicName === ".." || basename5(topicName) !== topicName) {
-      return null;
-    }
-    return join27(queryStateDirPath(userId), `${topicName}.json`);
-  };
-  return {
-    write(userId, topicId, topicName, task) {
-      const dir = queryStateDirPath(userId);
-      mkdirSync15(dir, { recursive: true });
-      const state = { topicId, topicName, since: new Date().toISOString() };
-      if (task)
-        state.task = [...task.replace(/\n+/g, " ").trim()].slice(0, 100).join("");
-      const target = queryStateFile(userId, topicId);
-      const tmp = `${target}.${process.pid}.${Date.now()}.tmp`;
-      writeFileSync13(tmp, JSON.stringify(state));
-      renameSync7(tmp, target);
-    },
-    clear(userId, topicId, legacyTopicName) {
-      const paths = [
-        queryStateFile(userId, topicId),
-        legacyQueryStateFile(userId, legacyTopicName)
-      ].filter((path) => Boolean(path));
-      for (const path of new Set(paths)) {
-        try {
-          unlinkSync15(path);
-        } catch (error) {
-          if (error?.code !== "ENOENT") {
-            options.logger?.warn({ err: error, userId, topicId, path }, "Failed to clear query state file");
-          }
-        }
-      }
-    }
-  };
-}
-function writeQueryState(userId, topicId, topicName, task) {
-  defaultQueryStateStore.write(userId, topicId, topicName, task);
-}
-function clearQueryState(userId, topicId, legacyTopicName) {
-  defaultQueryStateStore.clear(userId, topicId, legacyTopicName);
-}
-var defaultQueryStateStore;
-var init_state = __esm(() => {
-  init_config();
-  init_logger();
-  defaultQueryStateStore = createQueryStateStore({
-    usersLogDir: USERS_LOG_DIR,
-    logger
-  });
-});
-
 // ../../packages/core/src/mcp/session-comm/peer-forward.ts
 var exports_peer_forward = {};
 __export(exports_peer_forward, {
@@ -19201,6 +19219,12 @@ var init_turn_runner = __esm(async () => {
 
 // ../../packages/core/src/agents/mcp-tools/spawn-subagent.ts
 import { z as z4 } from "zod";
+function activeQueryUserId(topic) {
+  return topic?.participants.find((participant) => hasActiveQuery(participant.userId, topic.id))?.userId;
+}
+function persistedWatchUserId(topic) {
+  return activeQueryUserId(topic) ?? topic?.participants.find((participant) => participant.role === "owner")?.userId ?? topic?.participants[0]?.userId;
+}
 function createSubagentLifecycle(host) {
   const runtimeOwnerId = host.runtime.ownerId;
   const limits = Object.freeze({
@@ -19315,7 +19339,7 @@ function createSubagentLifecycle(host) {
   }
   function watchFromPersistedCard(message, card, queryId) {
     const child = host.storage.getTopic(card.subagentTopicId);
-    const userId = child?.participants.find((participant) => participant.role === "owner")?.userId ?? child?.participants[0]?.userId;
+    const userId = persistedWatchUserId(child);
     if (!userId)
       return null;
     return {
@@ -19674,6 +19698,10 @@ ${card.task}${reportInstruction}`;
     if (watch?.running)
       return "running";
     const card = host.storage.listSubagentMessages().filter((message) => message.topicId === parentTopicId && message.subagentCard?.subagentTopicId === childTopicId).at(-1)?.subagentCard;
+    if (!card || card.status === "failed") {
+      if (activeQueryUserId(host.storage.getTopic(childTopicId)))
+        return "running";
+    }
     return card?.status ?? "unknown";
   }
   function listMemoryTopicNames(ctx) {
@@ -19897,6 +19925,7 @@ var MAX_TASK_CHARS = 8000, MAX_NAME_CHARS = 80, MAX_LIVE_CHILDREN_PER_PARENT = 5
 var init_spawn_subagent = __esm(async () => {
   init_common();
   init_logger();
+  init_state();
   init_wiki_summary_names();
   init_types();
   await __promiseAll([
@@ -19993,7 +20022,9 @@ var init_spawn_subagent = __esm(async () => {
         if (getRuntimeUserTurnRequest(childTopicId))
           return true;
         const lease = getRuntimeTurnLease(childTopicId);
-        return Boolean(lease && processOwnerIsAlive(lease.ownerId));
+        if (lease && processOwnerIsAlive(lease.ownerId))
+          return true;
+        return Boolean(activeQueryUserId(getTopic(childTopicId)));
       }
     },
     config: {
@@ -21130,4 +21161,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=BACEE10AB360A31A64756E2164756E21
+//# debugId=7A2CA1A98309099B64756E2164756E21