@inerrata-corporation/errata 2.0.7-dev.2821 → 2.0.7-dev.2829

package/errata.mjs

@@ -79931,7 +79931,7 @@ function createWatchBreaker(deps) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.7-dev.2821" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.7-dev.2829" : "2.0.0-alpha.0";
 var IGNORED_PATH = /[\\/](?:\.git|node_modules|\.errata|\.claude|\.codex|\.cursor|\.turbo|\.next|dist|coverage|test-results|playwright-report|__pycache__)(?:[\\/]|$)/;
 var IGNORED_NOISE = /castalia\.db|eventlog\.sqlite|turn-cursors/;
 var GIT_OP_MUTE_MS = 4e3;
@@ -82219,6 +82219,14 @@ B: ${b}`,
         const pending = existsSync25(paths.outbox) ? readdirSync10(paths.outbox).filter((f) => f.endsWith(".json")).length : 0;
         return { uploaded: 0, failed: 0, remaining: pending };
       }
+      const onDisk = loadProfile(opts.workspaceRoot);
+      if (!onDisk?.projectId && onDisk?.projectLinkHold) {
+        console.log(
+          "[errata] sync held \u2014 this repo is already on errata in another workspace; run `errata link` to join it or create your own project"
+        );
+        const pending = existsSync25(paths.outbox) ? readdirSync10(paths.outbox).filter((f) => f.endsWith(".json")).length : 0;
+        return { uploaded: 0, failed: 0, remaining: pending };
+      }
       try {
         const ignorePatterns = loadClaimIgnorePatterns(opts.workspaceRoot);
         const claimPayload = buildClaimIngest(store, profile, DAEMON_VERSION, 1, ignorePatterns);
@@ -83715,6 +83723,11 @@ init_profile2();
 import { execFile as execFile3 } from "node:child_process";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile3);
+function isClaimedElsewhere(err2) {
+  if (!err2 || typeof err2 !== "object") return false;
+  const e = err2;
+  return e.status === 409 && e.code === "claimed_elsewhere";
+}
 async function readRootCommit(root) {
   try {
     const { stdout } = await execFileAsync("git", ["rev-list", "--max-parents=0", "HEAD"], {
@@ -83753,9 +83766,21 @@ async function ensureProjectLink(root, profile, client, rootCommit = readRootCom
     profile.projectId = res.project.id;
     profile.projectLocator = locator;
     if (sha2) profile.rootCommitReportedFor = res.project.id;
+    delete profile.projectLinkHold;
     saveProfile(root, profile);
     return { linked: true, projectId: res.project.id, created: res.created };
   } catch (err2) {
+    if (isClaimedElsewhere(err2)) {
+      if (profile.projectLinkHold?.locator !== locator) {
+        profile.projectLinkHold = { reason: "claimed-elsewhere", locator, since: Date.now() };
+        saveProfile(root, profile);
+      }
+      return {
+        linked: false,
+        reason: "held",
+        detail: "this repo is already on errata in another workspace \u2014 run `errata link` to join it or create your own project"
+      };
+    }
     return {
       linked: false,
       reason: "error",
@@ -84930,6 +84955,13 @@ function throttledPoll(res, intervalMs) {
     waitMs: Math.max(next, retryAfterMs(res.headers) ?? 0, THROTTLED_POLL_MIN_WAIT_MS)
   };
 }
+async function fetchDevicePoll(fetchFn, url2, init2) {
+  try {
+    return await fetchFn(url2, init2);
+  } catch {
+    return null;
+  }
+}
 function retryAfterMs(headers, now = Date.now()) {
   for (const name2 of ["retry-after", "x-retry-after"]) {
     const raw2 = headers.get(name2)?.trim();
@@ -85001,7 +85033,7 @@ async function loginOAuthDevice(opts) {
   while (Date.now() < deadline) {
     await (opts.sleep ?? ((ms) => new Promise((resolve7) => setTimeout(resolve7, ms))))(waitMs);
     waitMs = intervalMs;
-    const poll = await fetchFn(device.token, {
+    const poll = await fetchDevicePoll(fetchFn, device.token, {
       method: "POST",
       headers: { "content-type": "application/json", accept: "application/json" },
       body: JSON.stringify({
@@ -85010,6 +85042,7 @@ async function loginOAuthDevice(opts) {
         client_id: clientId
       })
     });
+    if (!poll) continue;
     const payload = await poll.json().catch(() => null);
     if (!poll.ok) {
       const throttle = throttledPoll(poll, intervalMs);
@@ -85249,7 +85282,7 @@ async function linkThroughConsole(opts) {
   while (Date.now() < deadline) {
     await sleep(waitMs);
     waitMs = intervalMs;
-    const poll = await fetchFn(device.token, {
+    const poll = await fetchDevicePoll(fetchFn, device.token, {
       method: "POST",
       headers: { "content-type": "application/json", accept: "application/json" },
       body: JSON.stringify({
@@ -85258,6 +85291,7 @@ async function linkThroughConsole(opts) {
         client_id: clientId
       })
     });
+    if (!poll) continue;
     const payload = await poll.json().catch(() => null);
     if (!poll.ok) {
       const throttle = throttledPoll(poll, intervalMs);
@@ -86477,6 +86511,8 @@ async function startMultiDaemon(opts = {}) {
         );
       } else if (out2.reason === "error") {
         console.warn(`[errata] project link failed for ${r.engine.profile.name}: ${out2.detail}`);
+      } else if (out2.reason === "held") {
+        noteProjectHold(r.id, r.engine.profile.name, out2.detail);
       }
       let primeSalt = null;
       if (r.engine.profile.projectId && !r.engine.profile.projectHydratedAt) {
@@ -86934,7 +86970,16 @@ async function startMultiDaemon(opts = {}) {
         const client = poolFor(recordIdentity);
         const store = r.engine.store;
         const projectName = r.engine.profile.name ?? r.engine.profile.id;
-        const onDiskProjectId = loadProfile(r.root)?.projectId;
+        const onDisk = loadProfile(r.root);
+        const onDiskProjectId = onDisk?.projectId;
+        if (!onDiskProjectId && onDisk?.projectLinkHold) {
+          noteProjectHold(
+            r.id,
+            r.entry.name,
+            "this repo is already on errata in another workspace \u2014 run `errata link` to join it or create your own project"
+          );
+          continue;
+        }
         if (onDiskProjectId !== r.engine.profile.projectId) {
           if (onDiskProjectId) r.engine.profile.projectId = onDiskProjectId;
           else delete r.engine.profile.projectId;
@@ -88694,6 +88739,11 @@ async function cmdStatus() {
     console.log(
       `    repo:      ${profile.repoLocator ? `${profile.repoLocator}${link}` : "(no git remote \u2014 unlinked)"}`
     );
+    if (!profile.projectId && profile.projectLinkHold) {
+      console.log(
+        `    HELD:      this repo is already on errata in another workspace. Nothing syncs until you decide: run \`errata link\` to join it or create your own project.`
+      );
+    }
     for (const h of await daemonHolds()) {
       if (h.workspace !== profile.name && h.workspace !== profile.id) continue;
       console.log(
@@ -89339,6 +89389,7 @@ async function cmdLink(args2) {
     return;
   }
   delete profile.projectLinkDisabled;
+  delete profile.projectLinkHold;
   const remote = flag("--remote");
   if (remote) {
     const loc = detectRepoLocator(ROOT, remote);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inerrata-corporation/errata",
-  "version": "2.0.7-dev.2821",
+  "version": "2.0.7-dev.2829",
   "description": "errata - local-first observation engine for AI coding agents",
   "type": "module",
   "bin": {