negotium 0.2.0 → 0.2.2

package/dist/main.js

@@ -411,9 +411,9 @@ var init_sqlite = __esm(async () => {
   }
 });
 
-// ../../packages/core/src/storage/vault-crypto.ts
+// ../../packages/core/src/storage/vault-crypto-core.ts
 import { createCipheriv, createDecipheriv, createHash, randomBytes as randomBytes2 } from "crypto";
-function encryptionKey(masterKey = VAULT_MASTER_KEY) {
+function encryptionKey(masterKey) {
   return createHash("sha256").update("otium-vault-value-v1\x00", "utf8").update(masterKey, "utf8").digest().subarray(0, KEY_BYTES);
 }
 function aad(userId, key) {
@@ -422,7 +422,7 @@ function aad(userId, key) {
 function isEncryptedVaultValue(value) {
   return value.startsWith(ENVELOPE_PREFIX);
 }
-function encryptVaultValue(userId, key, value, masterKey = VAULT_MASTER_KEY) {
+function encryptVaultValueWithKey(userId, key, value, masterKey) {
   const iv = randomBytes2(IV_BYTES);
   const cipher = createCipheriv("aes-256-gcm", encryptionKey(masterKey), iv);
   cipher.setAAD(aad(userId, key));
@@ -430,7 +430,7 @@ function encryptVaultValue(userId, key, value, masterKey = VAULT_MASTER_KEY) {
   const tag = cipher.getAuthTag();
   return `${ENVELOPE_PREFIX}${iv.toString("base64url")}.${ciphertext.toString("base64url")}.${tag.toString("base64url")}`;
 }
-function decryptVaultValue(userId, key, storedValue, masterKey = VAULT_MASTER_KEY) {
+function decryptVaultValueWithKey(userId, key, storedValue, masterKey) {
   if (!isEncryptedVaultValue(storedValue)) {
     return { value: storedValue, legacyPlaintext: true };
   }
@@ -452,8 +452,18 @@ function decryptVaultValue(userId, key, storedValue, masterKey = VAULT_MASTER_KE
   return { value: plaintext.toString("utf8"), legacyPlaintext: false };
 }
 var ENVELOPE_PREFIX = "otium-vault:v1:", IV_BYTES = 12, KEY_BYTES = 32;
+var init_vault_crypto_core = () => {};
+
+// ../../packages/core/src/storage/vault-crypto.ts
+function encryptVaultValue(userId, key, value, masterKey = VAULT_MASTER_KEY) {
+  return encryptVaultValueWithKey(userId, key, value, masterKey);
+}
+function decryptVaultValue(userId, key, storedValue, masterKey = VAULT_MASTER_KEY) {
+  return decryptVaultValueWithKey(userId, key, storedValue, masterKey);
+}
 var init_vault_crypto = __esm(() => {
   init_config();
+  init_vault_crypto_core();
 });
 
 // ../../packages/core/src/storage/vault.ts
@@ -4584,7 +4594,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.2.0";
+var NEGOTIUM_VERSION = "0.2.2";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn3 } from "child_process";
@@ -43716,18 +43726,49 @@ function addDirectoryContents(operations, sourceDir, destinationDir, stagingDir)
     });
   }
 }
-function assertNoCollisions(operations) {
+function pathWithin(path, root) {
+  return path === root || path.startsWith(`${root}/`);
+}
+function collisionPolicy(operation, stateDir2) {
+  const destination = operation.destination;
+  if (!destination || !existsSync36(destination))
+    return;
+  if (pathWithin(destination, join42(stateDir2, "runtime")))
+    return "keep-destination";
+  if (pathWithin(destination, join42(stateDir2, "binaries")))
+    return "keep-destination";
+  if (pathWithin(destination, join42(stateDir2, "secrets")))
+    return "replace-destination";
+  if (destination === join42(stateDir2, "data", "vault", "vault.db")) {
+    return "replace-destination";
+  }
+  if (pathWithin(destination, join42(stateDir2, "browser", "profiles"))) {
+    return "replace-destination";
+  }
+  if (pathWithin(destination, join42(stateDir2, "data", "conversations")) && destination.endsWith(".jsonl")) {
+    return "merge-jsonl";
+  }
+  if (pathWithin(destination, join42(stateDir2, "data", "tasks")) && destination.endsWith(".json")) {
+    return "merge-tasks";
+  }
+  if (statSync19(operation.source).isFile() && statSync19(destination).isFile() && readFileSync27(operation.source).equals(readFileSync27(destination))) {
+    return "keep-destination";
+  }
+  throw new Error(`Migration collision at ${destination}.`);
+}
+function configureCollisions(operations, stateDir2, stagingRoot) {
   const destinations = new Set;
   for (const operation of operations) {
     if (!operation.destination)
       continue;
-    if (existsSync36(operation.destination)) {
-      throw new Error(`Migration collision at ${operation.destination}.`);
-    }
     if (destinations.has(operation.destination)) {
       throw new Error(`Multiple legacy paths target ${operation.destination}.`);
     }
     destinations.add(operation.destination);
+    operation.collision = collisionPolicy(operation, stateDir2);
+    if (operation.collision && operation.collision !== "keep-destination") {
+      operation.destinationStaged = join42(stagingRoot, randomUUID34());
+    }
   }
 }
 function writeJournal(path, journal) {
@@ -43736,16 +43777,96 @@ function writeJournal(path, journal) {
 }
 function rollbackFilesystem(journal, journalPath) {
   for (const operation of [...journal.operations].reverse()) {
-    const current3 = operation.state === "placed" ? operation.destination : operation.staged;
-    if (!current3 || !existsSync36(current3) || existsSync36(operation.source))
-      continue;
-    mkdirSync35(dirname23(operation.source), { recursive: true });
-    renameSync16(current3, operation.source);
+    if (operation.state === "placed") {
+      if (operation.collision === "keep-destination" || !operation.destination) {
+        if (existsSync36(operation.staged) && !existsSync36(operation.source)) {
+          mkdirSync35(dirname23(operation.source), { recursive: true });
+          renameSync16(operation.staged, operation.source);
+        }
+      } else if (operation.destination && existsSync36(operation.destination)) {
+        if (operation.collision === "merge-jsonl" || operation.collision === "merge-tasks") {
+          rmSync11(operation.destination, { recursive: true, force: true });
+          if (existsSync36(operation.staged) && !existsSync36(operation.source)) {
+            mkdirSync35(dirname23(operation.source), { recursive: true });
+            renameSync16(operation.staged, operation.source);
+          }
+        } else if (!existsSync36(operation.source)) {
+          mkdirSync35(dirname23(operation.source), { recursive: true });
+          renameSync16(operation.destination, operation.source);
+        }
+      }
+    } else if (existsSync36(operation.staged) && !existsSync36(operation.source)) {
+      mkdirSync35(dirname23(operation.source), { recursive: true });
+      renameSync16(operation.staged, operation.source);
+    }
+    if (operation.destination && operation.destinationStaged && existsSync36(operation.destinationStaged) && !existsSync36(operation.destination)) {
+      mkdirSync35(dirname23(operation.destination), { recursive: true });
+      renameSync16(operation.destinationStaged, operation.destination);
+    }
     operation.state = "pending";
   }
   journal.phase = "filesystem";
   writeJournal(journalPath, journal);
 }
+function mergedJsonl(source, destination) {
+  const lines = new Set;
+  for (const path of [source, destination]) {
+    for (const line2 of readFileSync27(path, "utf8").split(/\r?\n/)) {
+      if (line2)
+        lines.add(line2);
+    }
+  }
+  return lines.size > 0 ? `${[...lines].join(`
+`)}
+` : "";
+}
+function readTaskFile(path) {
+  const parsed = JSON.parse(readFileSync27(path, "utf8"));
+  if (parsed.version !== 1 || !Array.isArray(parsed.tasks)) {
+    throw new Error(`Invalid task file during migration: ${path}`);
+  }
+  return parsed;
+}
+function mergedTasks(source, destination) {
+  const legacy = readTaskFile(source).tasks;
+  const current3 = readTaskFile(destination).tasks;
+  const merged = legacy.map((task) => ({ ...task }));
+  const usedIds = new Set(merged.map((task) => String(task.id)));
+  let nextId = Math.max(0, ...[...usedIds].map(Number).filter(Number.isInteger)) + 1;
+  const remapped = new Map;
+  for (const task of current3) {
+    const originalId = String(task.id);
+    const exact = merged.find((candidate) => candidate.id === originalId && JSON.stringify(candidate) === JSON.stringify(task));
+    if (exact) {
+      remapped.set(originalId, originalId);
+      continue;
+    }
+    const id = usedIds.has(originalId) ? String(nextId++) : originalId;
+    usedIds.add(id);
+    remapped.set(originalId, id);
+    merged.push({ ...task, id });
+  }
+  for (const task of merged.slice(legacy.length)) {
+    if (task.blockedBy)
+      task.blockedBy = task.blockedBy.map((id) => remapped.get(id) ?? id);
+  }
+  return `${JSON.stringify({ version: 1, tasks: merged }, null, 2)}
+`;
+}
+function placeOperation(operation) {
+  if (!operation.destination || operation.collision === "keep-destination")
+    return;
+  mkdirSync35(dirname23(operation.destination), { recursive: true });
+  if (operation.collision === "merge-jsonl") {
+    writeFileSync25(operation.destination, mergedJsonl(operation.staged, operation.destinationStaged));
+    return;
+  }
+  if (operation.collision === "merge-tasks") {
+    writeFileSync25(operation.destination, mergedTasks(operation.staged, operation.destinationStaged));
+    return;
+  }
+  renameSync16(operation.staged, operation.destination);
+}
 function tablesWithColumn(database, columnName) {
   const tables = database.query("SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'").all();
   return tables.map((row) => row.name).filter((table) => database.query(`PRAGMA table_info("${table.replaceAll('"', '""')}")`).all().some((column) => column.name === columnName));
@@ -43800,8 +43921,8 @@ function migrateDatabase(dbPath, source, masterKey, legacyTopicProfiles = []) {
           throw new Error("Cannot migrate encrypted vault rows without vault-master-key.");
         const rows = database.query("SELECT key, value FROM vault WHERE user_id = ?").all(source);
         for (const row of rows) {
-          const plaintext = decryptVaultValue(source, row.key, row.value, masterKey).value;
-          database.query("UPDATE vault SET value = ? WHERE user_id = ? AND key = ?").run(encryptVaultValue(CANONICAL_LOCAL_USER_ID, row.key, plaintext, masterKey), source, row.key);
+          const plaintext = decryptVaultValueWithKey(source, row.key, row.value, masterKey).value;
+          database.query("UPDATE vault SET value = ? WHERE user_id = ? AND key = ?").run(encryptVaultValueWithKey(CANONICAL_LOCAL_USER_ID, row.key, plaintext, masterKey), source, row.key);
         }
       }
       database.query(`UPDATE ${quote(table)} SET user_id = ? WHERE user_id = ?`).run(CANONICAL_LOCAL_USER_ID, source);
@@ -43983,7 +44104,7 @@ function migrateSingleUserState(options) {
         state: "pending"
       });
     }
-    assertNoCollisions(operations);
+    configureCollisions(operations, stateDir2, stagingRoot);
     journal = {
       id: SINGLE_USER_MIGRATION_ID,
       sourcePrincipal: source,
@@ -43999,21 +44120,43 @@ function migrateSingleUserState(options) {
   const vaultDbBackup = join42(stagingRoot, "vault.db.rollback");
   try {
     for (const operation of journal.operations) {
-      if (operation.state === "pending" && !existsSync36(operation.source) && existsSync36(operation.staged)) {
-        operation.state = "staged";
-      }
-      if (operation.state === "staged" && operation.destination && !existsSync36(operation.staged) && existsSync36(operation.destination)) {
-        operation.state = "placed";
+      if (operation.state === "staged")
+        operation.state = "source-staged";
+      if (operation.state === "pending" && !existsSync36(operation.source)) {
+        if (existsSync36(operation.staged))
+          operation.state = "source-staged";
+        else if (operation.destination && existsSync36(operation.destination)) {
+          operation.state = "placed";
+        }
       }
       if (operation.state === "pending") {
         mkdirSync35(dirname23(operation.staged), { recursive: true });
         renameSync16(operation.source, operation.staged);
-        operation.state = "staged";
+        operation.state = "source-staged";
         writeJournal(journalPath, journal);
       }
-      if (operation.state === "staged" && operation.destination) {
-        mkdirSync35(dirname23(operation.destination), { recursive: true });
-        renameSync16(operation.staged, operation.destination);
+      if (operation.state === "source-staged" && operation.collision === "replace-destination" && operation.destination && operation.destinationStaged && !existsSync36(operation.staged) && existsSync36(operation.destination) && existsSync36(operation.destinationStaged)) {
+        operation.state = "placed";
+        writeJournal(journalPath, journal);
+      }
+      if (operation.state === "destination-staged" && operation.collision !== "merge-jsonl" && operation.collision !== "merge-tasks" && operation.collision !== "keep-destination" && operation.destination && !existsSync36(operation.staged) && existsSync36(operation.destination)) {
+        operation.state = "placed";
+        writeJournal(journalPath, journal);
+      }
+      if (operation.state === "source-staged") {
+        if (operation.destination && operation.destinationStaged) {
+          if (existsSync36(operation.destination) && !existsSync36(operation.destinationStaged)) {
+            renameSync16(operation.destination, operation.destinationStaged);
+          }
+          if (!existsSync36(operation.destinationStaged)) {
+            throw new Error(`Missing collision backup for ${operation.destination}.`);
+          }
+        }
+        operation.state = "destination-staged";
+        writeJournal(journalPath, journal);
+      }
+      if (operation.state === "destination-staged") {
+        placeOperation(operation);
         operation.state = "placed";
         writeJournal(journalPath, journal);
       }
@@ -44056,11 +44199,22 @@ function migrateSingleUserState(options) {
       migratedTables
     };
     for (const store of ["conversations", "tasks", "users"]) {
-      rmSync11(join42(stateDir2, "data", store, source), { recursive: true, force: true });
+      rmSync11(join42(stateDir2, "data", store, source), {
+        recursive: true,
+        force: true
+      });
     }
-    rmSync11(join42(stateDir2, "workspace", "browser-profiles"), { recursive: true, force: true });
+    rmSync11(join42(stateDir2, "run"), { recursive: true, force: true });
+    rmSync11(join42(stateDir2, "bin"), { recursive: true, force: true });
+    rmSync11(join42(stateDir2, "workspace", "browser-profiles"), {
+      recursive: true,
+      force: true
+    });
     writeFileSync25(markerPath, `${JSON.stringify(marker, null, 2)}
-`, { mode: 384, flag: "wx" });
+`, {
+      mode: 384,
+      flag: "wx"
+    });
     journal.phase = "complete";
     rmSync11(stagingRoot, { recursive: true, force: true });
     return {
@@ -44082,7 +44236,7 @@ function migrateSingleUserState(options) {
 }
 var CANONICAL_LOCAL_USER_ID = "local", SINGLE_USER_MIGRATION_ID = "negotium-0.2.0-single-user";
 var init_single_user = __esm(async () => {
-  init_vault_crypto();
+  init_vault_crypto_core();
   await init_sqlite();
 });
 
@@ -44788,4 +44942,4 @@ switch (command) {
   }
 }
 
-//# debugId=0E990AB8BEC23DD564756E2164756E21
+//# debugId=29CE1495263F2C6864756E2164756E21