@oxgeneral/orch 1.0.2 → 1.0.3

package/dist/index.js

@@ -1,9 +1,9 @@
-import { ensureDir, Paths, readYaml, writeYaml, listFiles, writeJson, readJson, appendJsonl, readJsonl, readJsonlTail, pathExists } from './chunk-INZ4O2RI.js';
-import { canTransition, isTerminal } from './chunk-O2OQCSBL.js';
-export { Orchestrator, canTransition, isBlocked, isDispatchable, isTerminal, resolveFailureStatus } from './chunk-O2OQCSBL.js';
+import { ensureDir, Paths, readYaml, writeYaml, readJson, writeJson, listFiles, appendJsonl, readJsonl, readJsonlTail, pathExists } from './chunk-BSJVYRI3.js';
+import { canTransition, isTerminal } from './chunk-FDSFFFMT.js';
+export { Orchestrator, canTransition, isBlocked, isDispatchable, isTerminal, resolveFailureStatus } from './chunk-FDSFFFMT.js';
 import { AUTONOMOUS_LABEL } from './chunk-VG4465AG.js';
 export { AdapterRegistry } from './chunk-6DWHQPTE.js';
-export { createTokenUsage } from './chunk-XDVMX2FO.js';
+export { createTokenUsage } from './chunk-RHFRHCN5.js';
 import { InvalidArgumentsError, TaskNotFoundError, InvalidTransitionError, AgentNotFoundError, OrchestryError, TeamNotFoundError, GoalNotFoundError } from './chunk-NLQAJ7TW.js';
 export { AdapterErrorKind, AgentNotFoundError, ERROR_HINTS, NotInitializedError, OrchestryError, TaskNotFoundError, WorkspaceError, classifyAdapterError } from './chunk-NLQAJ7TW.js';
 import fs, { mkdtemp, readFile, unlink, rm, mkdir } from 'fs/promises';
@@ -748,20 +748,138 @@ async function getImageWindows() {
     }
   }
 }
+
+// src/domain/global-config.ts
+var DEFAULT_GLOBAL_CONFIG = {
+  tui: {
+    activity_filter: "all",
+    notifications: { toast: true, bell: false }
+  }
+};
+var IndexManager = class {
+  indexPath;
+  dir;
+  ext;
+  itemPath;
+  fileFilter;
+  readItemFn;
+  /** Promise-chain mutex to serialize updateIndex read-modify-write cycles. */
+  mutex = Promise.resolve();
+  /** True while executing inside withMutex — prevents re-entrant deadlock. */
+  insideMutex = false;
+  constructor(config) {
+    this.dir = config.dir;
+    this.ext = config.ext;
+    this.itemPath = config.itemPath;
+    this.indexPath = path.join(config.dir, "_index.json");
+    this.fileFilter = config.fileFilter ?? (() => true);
+    if (config.readItem) {
+      this.readItemFn = config.readItem;
+    } else if (config.ext === ".yml") {
+      this.readItemFn = (fp) => readYaml(fp);
+    } else {
+      this.readItemFn = (fp) => readJson(fp);
+    }
+  }
+  /**
+   * Read the index file. Falls back to rebuilding from individual files
+   * if the index is missing or corrupt.
+   */
+  async readIndex() {
+    try {
+      const entries = await readJson(this.indexPath);
+      if (Array.isArray(entries)) return entries;
+    } catch {
+    }
+    return this.rebuildIndex();
+  }
+  /**
+   * Rebuild the index by reading all individual item files.
+   * Used as fallback when _index.json is missing or corrupted.
+   *
+   * When called from outside the mutex (standalone), the write is serialized
+   * through {@link withMutex} to prevent races with concurrent updateIndex.
+   * When called from within the mutex (e.g. updateIndex → readIndex fallback),
+   * it writes directly to avoid re-entrant deadlock.
+   */
+  async rebuildIndex() {
+    await ensureDir(this.dir);
+    const files = await listFiles(this.dir, this.ext);
+    const results = await Promise.all(
+      files.filter(this.fileFilter).map((file) => {
+        const id = file.replace(this.ext, "");
+        return this.readItemFn(this.itemPath(id));
+      })
+    );
+    const items = [];
+    for (const item of results) {
+      if (item != null) items.push(item);
+    }
+    if (this.insideMutex) {
+      await this.writeIndexUnsafe(items);
+    } else {
+      await this.withMutex(() => this.writeIndexUnsafe(items));
+    }
+    return items;
+  }
+  /**
+   * Write the index file atomically.
+   * Serialized through the mutex to prevent races with concurrent updateIndex.
+   */
+  async writeIndex(items) {
+    return this.withMutex(() => this.writeIndexUnsafe(items));
+  }
+  /**
+   * Apply a mutation to the index and write it back.
+   *
+   * Serialized through a promise-chain mutex to prevent TOCTOU races
+   * where parallel callers could overwrite each other's changes
+   * (e.g. two `orch task add` invocations losing data).
+   */
+  async updateIndex(fn) {
+    return this.withMutex(async () => {
+      const current = await this.readIndex();
+      const updated = fn(current);
+      await this.writeIndexUnsafe(updated);
+    });
+  }
+  /** Internal write without mutex — called only from within withMutex. */
+  async writeIndexUnsafe(items) {
+    await ensureDir(this.dir);
+    await writeJson(this.indexPath, items);
+  }
+  /** Promise-chain mutex: serializes all index-mutating operations. */
+  withMutex(fn) {
+    let release;
+    const next = new Promise((resolve) => {
+      release = resolve;
+    });
+    const prev = this.mutex;
+    this.mutex = next;
+    return prev.then(async () => {
+      this.insideMutex = true;
+      try {
+        return await fn();
+      } finally {
+        this.insideMutex = false;
+        release();
+      }
+    });
+  }
+};
 var TaskStore = class {
   constructor(paths) {
     this.paths = paths;
+    this.index = new IndexManager({
+      dir: paths.tasksDir,
+      ext: ".yml",
+      itemPath: (id) => paths.taskPath(id)
+    });
   }
+  index;
   async list(filter) {
-    await ensureDir(this.paths.tasksDir);
-    const files = await listFiles(this.paths.tasksDir, ".yml");
-    const tasksResults = await Promise.all(
-      files.map((file) => {
-        const id = file.replace(".yml", "");
-        return readYaml(this.paths.taskPath(id));
-      })
-    );
-    const tasks = tasksResults.filter(
+    const all = await this.index.readIndex();
+    const tasks = all.filter(
       (task) => task !== null && (!filter?.status || task.status === filter.status) && (!filter?.goalId || task.goalId === filter.goalId)
     );
     return tasks.sort((a, b) => {
@@ -778,6 +896,11 @@ var TaskStore = class {
   async save(task) {
     await ensureDir(this.paths.tasksDir);
     await writeYaml(this.paths.taskPath(task.id), task);
+    await this.index.updateIndex((idx) => {
+      const filtered = idx.filter((t) => t.id !== task.id);
+      filtered.push(task);
+      return filtered;
+    });
   }
   async delete(id) {
     try {
@@ -785,6 +908,7 @@ var TaskStore = class {
     } catch (err) {
       if (err.code !== "ENOENT") throw err;
     }
+    await this.index.updateIndex((idx) => idx.filter((t) => t.id !== id));
   }
 };
 function statusPriority(status) {
@@ -802,17 +926,15 @@ function statusPriority(status) {
 var AgentStore = class {
   constructor(paths) {
     this.paths = paths;
+    this.index = new IndexManager({
+      dir: paths.agentsDir,
+      ext: ".yml",
+      itemPath: (id) => paths.agentPath(id)
+    });
   }
+  index;
   async list() {
-    await ensureDir(this.paths.agentsDir);
-    const files = await listFiles(this.paths.agentsDir, ".yml");
-    const results = await Promise.all(
-      files.map((file) => {
-        const id = file.replace(".yml", "");
-        return readYaml(this.paths.agentPath(id));
-      })
-    );
-    return results.filter((agent) => agent !== null);
+    return this.index.readIndex();
   }
   async get(id) {
     return readYaml(this.paths.agentPath(id));
@@ -824,6 +946,11 @@ var AgentStore = class {
   async save(agent) {
     await ensureDir(this.paths.agentsDir);
     await writeYaml(this.paths.agentPath(agent.id), agent);
+    await this.index.updateIndex((idx) => {
+      const filtered = idx.filter((a) => a.id !== agent.id);
+      filtered.push(agent);
+      return filtered;
+    });
   }
   async delete(id) {
     try {
@@ -831,6 +958,7 @@ var AgentStore = class {
     } catch (err) {
       if (err.code !== "ENOENT") throw err;
     }
+    await this.index.updateIndex((idx) => idx.filter((a) => a.id !== id));
   }
 };
 var RunStore = class {
@@ -926,7 +1054,7 @@ var DEFAULT_STATE = {
     total_runs: 0,
     total_tasks_completed: 0,
     total_tasks_failed: 0,
-    total_tokens: { input: 0, output: 0, total: 0 },
+    total_tokens: { input: 0, output: 0, reasoning: 0, total: 0, cache_read: 0, cache_write: 0 },
     total_runtime_ms: 0
   }
 };
@@ -952,7 +1080,10 @@ var StateStore = class {
         total_runs: raw.stats?.total_runs ?? defaults.stats.total_runs,
         total_tasks_completed: raw.stats?.total_tasks_completed ?? defaults.stats.total_tasks_completed,
         total_tasks_failed: raw.stats?.total_tasks_failed ?? defaults.stats.total_tasks_failed,
-        total_tokens: raw.stats?.total_tokens ?? defaults.stats.total_tokens,
+        total_tokens: {
+          ...defaults.stats.total_tokens,
+          ...raw.stats?.total_tokens ?? {}
+        },
         total_runtime_ms: raw.stats?.total_runtime_ms ?? defaults.stats.total_runtime_ms
       }
     };
@@ -1055,16 +1186,6 @@ function deepMerge(target, source) {
   }
   return result;
 }
-
-// src/domain/global-config.ts
-var DEFAULT_GLOBAL_CONFIG = {
-  tui: {
-    activity_filter: "all",
-    notifications: { toast: true, bell: false }
-  }
-};
-
-// src/infrastructure/storage/global-config-store.ts
 var GLOBAL_DIR = path.join(homedir(), ".orchestry");
 var GLOBAL_CONFIG_PATH = path.join(GLOBAL_DIR, "global.yml");
 var GlobalConfigStore = class {
@@ -1096,7 +1217,14 @@ var GlobalConfigStore = class {
 var ContextStore = class _ContextStore {
   constructor(paths) {
     this.paths = paths;
+    this.index = new IndexManager({
+      dir: paths.contextDir,
+      ext: ".json",
+      itemPath: (key) => paths.contextPath(key),
+      fileFilter: (f) => f !== "_index.json"
+    });
   }
+  index;
   async get(key) {
     const entry = await readJson(this.paths.contextPath(key));
     if (!entry) return null;
@@ -1126,6 +1254,11 @@ var ContextStore = class _ContextStore {
       expires_at: ttlMs ? new Date(Date.now() + ttlMs).toISOString() : void 0
     };
     await writeJson(this.paths.contextPath(key), entry);
+    await this.index.updateIndex((idx) => {
+      const filtered = idx.filter((e) => e.key !== key);
+      filtered.push(entry);
+      return filtered;
+    });
   }
   async delete(key) {
     try {
@@ -1133,26 +1266,24 @@ var ContextStore = class _ContextStore {
     } catch (err) {
       if (err.code !== "ENOENT") throw err;
     }
+    await this.index.updateIndex((idx) => idx.filter((e) => e.key !== key));
   }
   async list() {
-    await ensureDir(this.paths.contextDir);
-    const files = await listFiles(this.paths.contextDir, ".json");
-    const results = await Promise.all(
-      files.map((file) => {
-        const key = file.replace(".json", "");
-        return readJson(this.paths.contextPath(key));
-      })
-    );
-    const entries = [];
-    for (const entry of results) {
-      if (!entry) continue;
+    const entries = await this.index.readIndex();
+    const expired = [];
+    const valid = [];
+    for (const entry of entries) {
       if (isExpired(entry)) {
-        await this.delete(entry.key);
-        continue;
+        expired.push(entry);
+      } else {
+        valid.push(entry);
       }
-      entries.push(entry);
     }
-    return entries.sort((a, b) => a.key.localeCompare(b.key));
+    if (expired.length > 0) {
+      await Promise.all(expired.map((e) => this.deleteFile(e.key)));
+      await this.index.writeIndex(valid);
+    }
+    return valid.sort((a, b) => a.key.localeCompare(b.key));
   }
   async getAll() {
     const entries = await this.list();
@@ -1162,6 +1293,14 @@ var ContextStore = class _ContextStore {
     }
     return result;
   }
+  /** Delete just the file (no index update). Used by lazy expiry cleanup. */
+  async deleteFile(key) {
+    try {
+      await fs.unlink(this.paths.contextPath(key));
+    } catch (err) {
+      if (err.code !== "ENOENT") throw err;
+    }
+  }
 };
 function isExpired(entry) {
   if (!entry.expires_at) return false;
@@ -1170,20 +1309,29 @@ function isExpired(entry) {
 var MessageStore = class {
   constructor(paths) {
     this.paths = paths;
+    this.index = new IndexManager({
+      dir: paths.messagesDir,
+      ext: ".json",
+      itemPath: (id) => paths.messagePath(id),
+      fileFilter: (fileName) => fileName !== "_index.json"
+    });
   }
+  index;
   async save(message) {
     await ensureDir(this.paths.messagesDir);
     await writeJson(this.paths.messagePath(message.id), message);
+    await this.index.updateIndex((idx) => {
+      const filtered = idx.filter((m) => m.id !== message.id);
+      filtered.push(message);
+      return filtered;
+    });
   }
   async get(id) {
     return readJson(this.paths.messagePath(id));
   }
   async list() {
-    const files = await listFiles(this.paths.messagesDir, ".json");
-    const results = await Promise.all(
-      files.map((f) => readJson(this.paths.messagePath(f.replace(".json", ""))))
-    );
-    return results.filter((m) => m !== null).sort((a, b) => a.created_at.localeCompare(b.created_at));
+    const all = await this.index.readIndex();
+    return all.filter((m) => m !== null).sort((a, b) => a.created_at.localeCompare(b.created_at));
   }
   async listPending(agentId) {
     const all = await this.list();
@@ -1200,6 +1348,11 @@ var MessageStore = class {
     msg.status = "delivered";
     msg.delivered_at = (/* @__PURE__ */ new Date()).toISOString();
     await writeJson(this.paths.messagePath(id), msg);
+    await this.index.updateIndex((idx) => {
+      const filtered = idx.filter((m) => m.id !== id);
+      filtered.push(msg);
+      return filtered;
+    });
   }
   async delete(id) {
     try {
@@ -1207,6 +1360,7 @@ var MessageStore = class {
     } catch (err) {
       if (err.code !== "ENOENT") throw err;
     }
+    await this.index.updateIndex((idx) => idx.filter((m) => m.id !== id));
   }
   async purgeExpired() {
     const all = await this.list();
@@ -1216,7 +1370,17 @@ var MessageStore = class {
       const isOldDelivered = m.delivered_at && now - new Date(m.delivered_at).getTime() > 36e5;
       return isExpired2 || isOldDelivered;
     });
-    await Promise.all(toDelete.map((m) => this.delete(m.id)));
+    const idsToDelete = new Set(toDelete.map((m) => m.id));
+    await Promise.all(
+      toDelete.map(async (m) => {
+        try {
+          await fs.unlink(this.paths.messagePath(m.id));
+        } catch (err) {
+          if (err.code !== "ENOENT") throw err;
+        }
+      })
+    );
+    await this.index.updateIndex((idx) => idx.filter((m) => !idsToDelete.has(m.id)));
     return toDelete.length;
   }
 };
@@ -1235,16 +1399,16 @@ var GOAL_STATUS_ORDER = {
 var GoalStore = class {
   constructor(paths) {
     this.paths = paths;
+    this.index = new IndexManager({
+      dir: paths.goalsDir,
+      ext: ".yml",
+      itemPath: (id) => paths.goalPath(id)
+    });
   }
+  index;
   async list(filter) {
-    const files = await listFiles(this.paths.goalsDir, ".yml");
-    const results = await Promise.all(
-      files.map((file) => {
-        const id = file.replace(".yml", "");
-        return readYaml(this.paths.goalPath(id));
-      })
-    );
-    const goals = results.filter(
+    const all = await this.index.readIndex();
+    const goals = all.filter(
       (goal) => goal !== null && (!filter?.status || goal.status === filter.status)
     );
     return goals.sort((a, b) => {
@@ -1259,7 +1423,13 @@ var GoalStore = class {
     return readYaml(this.paths.goalPath(id));
   }
   async save(goal) {
+    await ensureDir(this.paths.goalsDir);
     await writeYaml(this.paths.goalPath(goal.id), goal);
+    await this.index.updateIndex((idx) => {
+      const filtered = idx.filter((g) => g.id !== goal.id);
+      filtered.push(goal);
+      return filtered;
+    });
   }
   async delete(id) {
     try {
@@ -1267,6 +1437,7 @@ var GoalStore = class {
     } catch (err) {
       if (err.code !== "ENOENT") throw err;
     }
+    await this.index.updateIndex((idx) => idx.filter((g) => g.id !== id));
   }
 };
 var TeamStore = class {
@@ -1703,12 +1874,11 @@ var TeamService = class {
 // src/container.ts
 async function buildLightContainer(context) {
   const paths = new Paths(context.projectRoot);
-  await paths.requireInit();
   const configStore = new ConfigStore(paths);
   const globalConfigStore = new GlobalConfigStore();
-  const [config, globalConfig] = await Promise.all([
-    configStore.read(),
-    globalConfigStore.read()
+  const [, config] = await Promise.all([
+    paths.requireInit(),
+    configStore.read()
   ]);
   const taskStore = new TaskStore(paths);
   const agentStore = new AgentStore(paths);
@@ -1735,7 +1905,7 @@ async function buildLightContainer(context) {
     stateStore,
     configStore,
     globalConfigStore,
-    globalConfig,
+    globalConfig: DEFAULT_GLOBAL_CONFIG,
     contextStore,
     messageStore,
     goalStore,
@@ -1751,6 +1921,8 @@ async function buildLightContainer(context) {
 }
 async function buildFullContainer(context) {
   const light = await buildLightContainer(context);
+  const globalConfig = await light.globalConfigStore.read();
+  light.globalConfig = globalConfig;
   const [
     { ProcessManager },
     { AdapterRegistry: AdapterRegistry2 },
@@ -1766,14 +1938,14 @@ async function buildFullContainer(context) {
   ] = await Promise.all([
     import('./process-manager-A36Y7LHP.js'),
     import('./registry-JXXRLJ5J.js'),
-    import('./claude-WUJU5KIE.js'),
-    import('./codex-NYJWEPRQ.js'),
-    import('./cursor-3YHVD4NP.js'),
-    import('./shell-NJNW3O6K.js'),
-    import('./opencode-FAMPSA6X.js'),
-    import('./workspace-manager-2SFPKPLZ.js'),
+    import('./claude-4R6L6BWY.js'),
+    import('./codex-IMOW5ZUZ.js'),
+    import('./cursor-NHV7X3WG.js'),
+    import('./shell-UXEJRK3D.js'),
+    import('./opencode-ULT6DYCT.js'),
+    import('./workspace-manager-ABXFBL2A.js'),
     import('./template-engine-5ZKVJMYA.js'),
-    import('./orchestrator-X2CWGFCL.js'),
+    import('./orchestrator-6XH2TY3T.js'),
     import('./doctor-service-F2SXDWHS.js')
   ]);
   const processManager = new ProcessManager();