@runeya/runeya 2.0.123 → 2.0.124

package/{src-DN2IGASI.js → src-SGSG2RSF.js}

@@ -62,7 +62,7 @@ import {
   soleAccountScope,
   startCliSession,
   vaultOfProject
-} from "./chunk-DUHCY3JU.js";
+} from "./chunk-GKK3ACWB.js";
 import {
   resolveCliInvocation,
   whichCommand
@@ -85,13 +85,15 @@ import {
   stopClaudeTranscriptWatcher,
   stopCodexTranscriptWatcher,
   verifyJwt
-} from "./chunk-TNJFDWJX.js";
+} from "./chunk-H22YLVQE.js";
 import "./chunk-MD3VW4HQ.js";
 import {
   agentManager,
   agentSpawner,
   agentStore,
+  clearDetached,
   clearEncryptionKey,
+  clearLocalRemoval,
   clearPendingLegacyKey,
   clearVaultLock,
   decryptValue,
@@ -105,7 +107,9 @@ import {
   hasEncryptionKey,
   hasPendingLegacyKey,
   isCiMode,
+  isDetached,
   isEncryptedValue,
+  isLocallyRemoved,
   isVaultLocked,
   killInstance,
   listInstances,
@@ -123,7 +127,7 @@ import {
   stableEncryptValue,
   traefikManager,
   unregisterInstance
-} from "./chunk-MSLFR2EN.js";
+} from "./chunk-4PN7QBNM.js";
 import {
   settingsManager
 } from "./chunk-N3ZI35SC.js";
@@ -7050,13 +7054,16 @@ var OrgSyncConnection = class {
       const projectId = fields["projectId"];
       return typeof projectId === "string" && this.tracked.has(projectId);
     }
+    return this.trackedProjectOf(id) !== null;
+  }
+  /** The tracked project whose `serviceIds` list this service, per the doc. */
+  trackedProjectOf(serviceId) {
     const projects = this.collection("projects");
     for (const projectId of this.tracked) {
-      const project = readEntity(projects, projectId);
-      const serviceIds = project?.["serviceIds"];
-      if (Array.isArray(serviceIds) && serviceIds.includes(id)) return true;
+      const serviceIds = readEntity(projects, projectId)?.["serviceIds"];
+      if (Array.isArray(serviceIds) && serviceIds.includes(serviceId)) return projectId;
     }
-    return false;
+    return null;
   }
   /** Re-read which projects of this org have a vault on this machine. */
   async refreshTracked() {
@@ -7249,7 +7256,7 @@ var OrgSyncConnection = class {
   }
   async upsertLocally(name, id, fields) {
     if (name === "services") {
-      await serviceStore.applyRemoteUpsert(id, fields, this.link.orgId);
+      await serviceStore.applyRemoteUpsert(id, fields, this.link.orgId, this.trackedProjectOf(id) ?? void 0);
       return;
     }
     if (name === "environments") {
@@ -7345,23 +7352,52 @@ var OrgSyncConnection = class {
         const entities = local[name];
         const ids = new Set(entities.map((e) => e.id));
         for (const entity of entities) {
-          if (!touchedSinceRead(name, entity.id)) writeEntity(collection, entity.id, entity);
+          if (touchedSinceRead(name, entity.id)) continue;
+          writeEntity(
+            collection,
+            entity.id,
+            name === "projects" ? this.keepUnknownLinks(entity) : entity
+          );
         }
         if (name === "projects") continue;
         for (const id of Array.from(collection.keys())) {
           if (ids.has(id) || touchedSinceRead(name, id)) continue;
+          if (!isLocallyRemoved(name, id)) continue;
           if (this.belongsToOwnedProject(name, id, ownedProjectIds)) collection.delete(id);
+          clearLocalRemoval(name, id);
         }
       }
       const parserIds = new Set(parsers.map((p) => p.id));
       for (const parser of parsers) writeEntity(this.logParsers, parser.id, parser);
       if (this.applyingParsers === 0) {
         for (const id of Array.from(this.logParsers.keys())) {
-          if (!parserIds.has(id)) this.logParsers.delete(id);
+          if (parserIds.has(id) || !isLocallyRemoved("logParsers", id)) continue;
+          this.logParsers.delete(id);
+          clearLocalRemoval("logParsers", id);
         }
       }
     }, LOCAL_ORIGIN);
   }
+  /**
+   * Le projet local tel qu'il doit partir : ses listes gardent les ids que le
+   * document connaît et pas cette machine, sauf ceux qu'elle a détachés.
+   *
+   * Un projet local en retard (coffre relu tard, autre version) repoussait
+   * sinon d'anciens `serviceIds` : le service récent sortait du projet pour
+   * toute l'organisation, et sa suppression suivait.
+   */
+  keepUnknownLinks(project) {
+    const inDoc = readEntity(this.collection("projects"), project.id);
+    const merged = { ...project };
+    for (const field of ["serviceIds", "environmentIds"]) {
+      const local = project[field] ?? [];
+      const remote = inDoc?.[field];
+      const extra = Array.isArray(remote) ? remote.filter((id) => typeof id === "string" && !local.includes(id) && !isDetached(project.id, field, id)) : [];
+      merged[field] = [...local, ...extra];
+      clearDetached(project.id, field);
+    }
+    return merged;
+  }
   /**
    * Whether a doc entity belongs to a project this machine holds — i.e. whether
    * its absence locally is a real removal rather than a project we never pulled.
@@ -10573,7 +10609,7 @@ async function createLocalServer() {
     ]);
     console.log("[server] Shutdown complete");
   };
-  const { initCompanion } = await import("./companion-7VOV4W3T.js");
+  const { initCompanion } = await import("./companion-OZODV5BR.js");
   initCompanion();
   return { app, server, wss, shutdown };
 }
@@ -11020,4 +11056,4 @@ export {
   startProcess,
   stopProcess
 };
-//# sourceMappingURL=src-DN2IGASI.js.map
+//# sourceMappingURL=src-SGSG2RSF.js.map