@inerrata-corporation/errata 2.0.17-dev.3562 → 2.0.17-dev.3571

package/errata.mjs

@@ -22314,20 +22314,13 @@ var init_intent = __esm({
 function isLegacyAnchor(attrs) {
   return attrs?.["captureTime"] === true && attrs["anchorProvenance"] === void 0;
 }
-function repairLegacyAnchorsFromStatement(store, ts) {
-  const report = {
-    repaired: [],
-    retiredGuesses: 0,
-    noPathNamed: 0,
-    pathUnknown: 0,
-    alreadyCorrect: 0
-  };
+function filePathResolver(store) {
   const byPath = /* @__PURE__ */ new Map();
   for (const f of store.findNodesByLabel("File")) {
     const path2 = String(f.attrs["relPath"] ?? f.description ?? "");
     if (path2) byPath.set(path2, { id: f.id, path: path2 });
   }
-  const resolvePath2 = (named) => {
+  return (named) => {
     const exact = byPath.get(named);
     if (exact) return exact;
     const hits = [...byPath.values()].filter(
@@ -22335,6 +22328,40 @@ function repairLegacyAnchorsFromStatement(store, ts) {
     );
     return hits.length === 1 ? hits[0] : null;
   };
+}
+function statementTarget(statement, resolvePath2) {
+  for (const m of statement.matchAll(STATEMENT_PATH_RE)) {
+    const f = resolvePath2(m[0]);
+    if (f) return f;
+  }
+  return null;
+}
+function restatedAnchor(problemId, fileId, restatedFrom, ts) {
+  return {
+    id: `edge_${digest({ from: problemId, type: "ANCHORED_AT", to: fileId })}`.slice(0, 24),
+    from: problemId,
+    to: fileId,
+    type: "ANCHORED_AT",
+    // Same confidence a capture-time anchor enters at: the source is the
+    // agent's own statement either way, only the moment of reading differs.
+    confidence: 0.4,
+    extractionSource: "agent-observed",
+    createdAt: ts,
+    lastSeenAt: ts,
+    navSuccesses: 0,
+    navFailures: 0,
+    attrs: { anchorProvenance: "restated", restatedFrom, restatedAt: ts }
+  };
+}
+function repairLegacyAnchorsFromStatement(store, ts) {
+  const report = {
+    repaired: [],
+    retiredGuesses: 0,
+    noPathNamed: 0,
+    pathUnknown: 0,
+    alreadyCorrect: 0
+  };
+  const resolvePath2 = filePathResolver(store);
   for (const p of store.findNodesByLabel("Problem")) {
     try {
       const anchors = store.outEdges(p.id, ["ANCHORED_AT"]);
@@ -22374,25 +22401,7 @@ function repairLegacyAnchorsFromStatement(store, ts) {
         report.pathUnknown++;
         continue;
       }
-      store.mergeEdge({
-        id: `edge_${digest({ from: p.id, type: "ANCHORED_AT", to: target.id })}`.slice(0, 24),
-        from: p.id,
-        to: target.id,
-        type: "ANCHORED_AT",
-        // Same confidence a capture-time anchor enters at: the source is the
-        // agent's own statement either way, only the moment of reading differs.
-        confidence: 0.4,
-        extractionSource: "agent-observed",
-        createdAt: ts,
-        lastSeenAt: ts,
-        navSuccesses: 0,
-        navFailures: 0,
-        attrs: {
-          anchorProvenance: "restated",
-          restatedFrom: guessedPaths[0] ?? "",
-          restatedAt: ts
-        }
-      });
+      store.mergeEdge(restatedAnchor(p.id, target.id, guessedPaths[0] ?? "", ts));
       for (const e of legacy) {
         if (e.to !== target.id) store.closeEdge(e.id, ts);
       }
@@ -22412,23 +22421,35 @@ function backfillLegacyAnchors(store, ts) {
   const report = {
     demotedEdges: 0,
     demotedProblems: 0,
+    restatedProblems: 0,
     labeledEdges: 0,
     suspects: []
   };
+  let resolvePath2;
   for (const p of store.findNodesByLabel("Problem")) {
-    const legacy = store.outEdges(p.id, ["ANCHORED_AT"]).filter((e) => isLegacyAnchor(e.attrs));
-    if (legacy.length === 0) continue;
     const resolved = p.attrs["resolvedAt"] !== void 0;
+    const legacy = store.outEdges(p.id, ["ANCHORED_AT"]).filter((e) => isLegacyAnchor(e.attrs) || !resolved && e.attrs?.["anchorProvenance"] === "legacy");
+    if (legacy.length === 0) continue;
     try {
       if (!resolved) {
-        for (const e of legacy) {
+        resolvePath2 ??= filePathResolver(store);
+        const target = statementTarget(String(p.description ?? ""), resolvePath2);
+        if (target) {
+          const guessed = store.getNode(legacy[0].to);
+          store.mergeEdge(
+            restatedAnchor(p.id, target.id, String(guessed?.attrs["relPath"] ?? guessed?.description ?? ""), ts)
+          );
+          report.restatedProblems++;
+        }
+        const retired = legacy.filter((e) => !(target && e.to === target.id));
+        for (const e of retired) {
           const file2 = store.getNode(e.to);
           const path2 = String(file2?.attrs["relPath"] ?? file2?.description ?? "");
           if (path2) recordAnchorHint(store, p.id, path2, "legacy", ts);
-          store.deleteEdge(e.id);
+          store.closeEdge(e.id, ts);
           report.demotedEdges++;
         }
-        report.demotedProblems++;
+        if (retired.length > 0) report.demotedProblems++;
         continue;
       }
       for (const e of legacy) {
@@ -33036,6 +33057,7 @@ var init_consent = __esm({
 });
 
 // src/git-remote.ts
+import { spawnSync } from "node:child_process";
 import { existsSync as existsSync10, readFileSync as readFileSync8, statSync } from "node:fs";
 import { isAbsolute as isAbsolute2, join as join8, resolve as resolve2 } from "node:path";
 function resolveGitDir(root) {
@@ -33083,12 +33105,41 @@ function detectRepoLocator(root, remote) {
   const remotes = readRemotes(root);
   if (remotes.length === 0) return null;
   const pick2 = remote ? remotes.find((r) => r.name === remote) ?? null : remotes.find((r) => r.name === "origin") ?? (remotes.length === 1 ? remotes[0] : null);
-  return pick2 ? normalizeRepoLocator(pick2.url) : null;
+  return pick2 ? normalizeRepoLocator(resolveSshHostAlias(pick2.url)) : null;
+}
+function sshConfigHostname(alias) {
+  if (resolvedAliases.has(alias)) return resolvedAliases.get(alias);
+  let host = null;
+  try {
+    const out2 = spawnSync("ssh", ["-G", alias], { encoding: "utf8", timeout: 3e3, windowsHide: true });
+    if (out2.status === 0) host = /^hostname\s+(\S+)\s*$/im.exec(out2.stdout)?.[1]?.toLowerCase() ?? null;
+  } catch {
+    host = null;
+  }
+  resolvedAliases.set(alias, host);
+  return host;
 }
+function resolveSshHostAlias(remoteUrl, resolveHost = sshConfigHostname) {
+  const raw2 = remoteUrl.trim();
+  const m = SSH_URL_REMOTE.exec(raw2) ?? (/^[a-z][a-z0-9+.-]*:\/\//i.test(raw2) ? null : SSH_SCP_REMOTE.exec(raw2));
+  if (!m) return raw2;
+  const prefix = m[1];
+  const alias = m[2];
+  const rest2 = m[3];
+  if (alias.length === 1 || CANONICAL_FORGE_HOSTS.has(alias.toLowerCase())) return raw2;
+  const real = resolveHost(alias);
+  if (!real || real === alias.toLowerCase()) return raw2;
+  return SSH_URL_REMOTE.test(raw2) ? `${prefix}${real}${rest2}` : `${prefix}${real}:${rest2}`;
+}
+var CANONICAL_FORGE_HOSTS, SSH_SCP_REMOTE, SSH_URL_REMOTE, resolvedAliases;
 var init_git_remote = __esm({
   "src/git-remote.ts"() {
     "use strict";
     init_src();
+    CANONICAL_FORGE_HOSTS = /* @__PURE__ */ new Set(["github.com", "gitlab.com", "bitbucket.org", "codeberg.org"]);
+    SSH_SCP_REMOTE = /^((?:[^@/]+@)?)([^:/@]+):(?!\/\/)(.+)$/;
+    SSH_URL_REMOTE = /^(ssh:\/\/(?:[^@/]+@)?)([^:/@]+)((?::\d+)?\/.*)$/i;
+    resolvedAliases = /* @__PURE__ */ new Map();
   }
 });
 
@@ -82634,7 +82685,7 @@ function createWatchBreaker(deps) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.17-dev.3562" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.17-dev.3571" : "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;
@@ -91838,7 +91889,7 @@ function shouldUseOAuthLogin(flags2, env2 = process.env) {
 }
 
 // src/doctor.ts
-import { spawnSync } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 
 // src/codex-runtime.ts
 import { readdirSync as readdirSync12, statSync as statSync9 } from "node:fs";
@@ -91873,7 +91924,7 @@ function resolveCodexExecutable(options = {}) {
 // src/doctor.ts
 function installedHarnessVersion(bin) {
   try {
-    const r = spawnSync(bin === "codex" ? resolveCodexExecutable() : bin, ["--version"], { encoding: "utf8", timeout: 3e3, windowsHide: true });
+    const r = spawnSync2(bin === "codex" ? resolveCodexExecutable() : bin, ["--version"], { encoding: "utf8", timeout: 3e3, windowsHide: true });
     if (r.status !== 0 && !r.stdout) return null;
     const m = /(\d+\.\d+\.\d+)/.exec(`${r.stdout ?? ""}${r.stderr ?? ""}`);
     return m ? m[1] : null;
@@ -92991,8 +93042,9 @@ async function cmdInit() {
     console.log("");
     console.log("Privacy: your code, file contents, and raw error text never leave");
     console.log("this machine \u2014 only scrubbed, canonical lessons can (consent-gated).");
-    console.log("Cloud sync + telemetry are OFF in this alpha \u2014 turn them on with:");
-    console.log("    errata consent sync on        # contribute canonical, scrubbed deltas");
+    console.log("Cloud sync + telemetry are OFF until you choose otherwise:");
+    console.log("    errata link                   # per repo: pick its project + what it shares, in the Console");
+    console.log("    errata consent sync on        # machine default for repos you haven't linked");
     console.log("    errata consent telemetry on   # counts-only product metrics");
     console.log("To CONTRIBUTE to the shared graph you must ALSO attest this daemon:");
     console.log("    errata login                  # console sign-in (OAuth) \u2014 grants graph-write");
@@ -93014,7 +93066,7 @@ async function cmdInit() {
       return;
     }
     console.log("");
-    console.log("connecting your cloud account (init links this repo to its project)...");
+    console.log("connecting your cloud account...");
     await cmdLoginOAuth(cfgNow);
     cfgNow = loadConfig();
     if (!hasCloudCredential(cfgNow)) {
@@ -93023,14 +93075,32 @@ async function cmdInit() {
       return;
     }
   }
+  let profileNow = loadProfile(ROOT);
+  if (process.stdout.isTTY && !rest.includes("--no-link") && !rest.includes("--no-login") && profileNow && !profileNow.projectId) {
+    refreshRepoLocator(ROOT, profileNow);
+    if (profileNow.repoLocator) {
+      console.log("");
+      console.log(`linking ${profileNow.repoLocator} to its project (choose org, team and privacy in the Console)...`);
+      await cmdLink(rest.includes("--no-browser") ? ["--no-browser"] : []);
+      if (process.exitCode === 1) {
+        console.log("  (init itself succeeded \u2014 retry the link any time with `errata link`)");
+        process.exitCode = 0;
+      }
+      profileNow = loadProfile(ROOT);
+    }
+  }
   console.log("");
   console.log("Next:");
   console.log("  errata start                 # observe this repo");
   if (!hasCloudCredential(cfgNow)) {
     console.log("  errata login                 # connect a cloud account (or: --token <key>)");
   }
-  if (!cfgNow.consent.sync) {
-    console.log("  errata consent sync on       # contribute scrubbed, canonical lessons");
+  if (!profileNow?.projectId) {
+    if (profileNow?.repoLocator) {
+      console.log("  errata link                  # link this repo to its project (sets its privacy choices)");
+    } else {
+      console.log("  git remote add origin <url>  # then: errata link (a project is found by its remote)");
+    }
   }
   console.log("  errata status                # verify the whole chain");
 }
@@ -93794,6 +93864,8 @@ async function cmdLink(args2) {
     }
     profile.repoRemote = remote;
     profile.repoLocator = loc;
+  } else {
+    refreshRepoLocator(ROOT, profile);
   }
   if (!wantsLocal) {
     if (!profile.repoLocator) {

package/package.json

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

package/pass-worker.mjs

@@ -27547,20 +27547,13 @@ var STATEMENT_PATH_RE = new RegExp(
   String.raw`(?:[\w.+-]+\/)+[\w.+-]+\.(?:${anchorableExtensionAlternation()})`,
   "g"
 );
-function repairLegacyAnchorsFromStatement(store2, ts) {
-  const report = {
-    repaired: [],
-    retiredGuesses: 0,
-    noPathNamed: 0,
-    pathUnknown: 0,
-    alreadyCorrect: 0
-  };
+function filePathResolver(store2) {
   const byPath = /* @__PURE__ */ new Map();
   for (const f of store2.findNodesByLabel("File")) {
     const path = String(f.attrs["relPath"] ?? f.description ?? "");
     if (path) byPath.set(path, { id: f.id, path });
   }
-  const resolvePath = (named) => {
+  return (named) => {
     const exact = byPath.get(named);
     if (exact) return exact;
     const hits = [...byPath.values()].filter(
@@ -27568,6 +27561,40 @@ function repairLegacyAnchorsFromStatement(store2, ts) {
     );
     return hits.length === 1 ? hits[0] : null;
   };
+}
+function statementTarget(statement, resolvePath) {
+  for (const m of statement.matchAll(STATEMENT_PATH_RE)) {
+    const f = resolvePath(m[0]);
+    if (f) return f;
+  }
+  return null;
+}
+function restatedAnchor(problemId, fileId, restatedFrom, ts) {
+  return {
+    id: `edge_${digest({ from: problemId, type: "ANCHORED_AT", to: fileId })}`.slice(0, 24),
+    from: problemId,
+    to: fileId,
+    type: "ANCHORED_AT",
+    // Same confidence a capture-time anchor enters at: the source is the
+    // agent's own statement either way, only the moment of reading differs.
+    confidence: 0.4,
+    extractionSource: "agent-observed",
+    createdAt: ts,
+    lastSeenAt: ts,
+    navSuccesses: 0,
+    navFailures: 0,
+    attrs: { anchorProvenance: "restated", restatedFrom, restatedAt: ts }
+  };
+}
+function repairLegacyAnchorsFromStatement(store2, ts) {
+  const report = {
+    repaired: [],
+    retiredGuesses: 0,
+    noPathNamed: 0,
+    pathUnknown: 0,
+    alreadyCorrect: 0
+  };
+  const resolvePath = filePathResolver(store2);
   for (const p of store2.findNodesByLabel("Problem")) {
     try {
       const anchors = store2.outEdges(p.id, ["ANCHORED_AT"]);
@@ -27607,25 +27634,7 @@ function repairLegacyAnchorsFromStatement(store2, ts) {
         report.pathUnknown++;
         continue;
       }
-      store2.mergeEdge({
-        id: `edge_${digest({ from: p.id, type: "ANCHORED_AT", to: target.id })}`.slice(0, 24),
-        from: p.id,
-        to: target.id,
-        type: "ANCHORED_AT",
-        // Same confidence a capture-time anchor enters at: the source is the
-        // agent's own statement either way, only the moment of reading differs.
-        confidence: 0.4,
-        extractionSource: "agent-observed",
-        createdAt: ts,
-        lastSeenAt: ts,
-        navSuccesses: 0,
-        navFailures: 0,
-        attrs: {
-          anchorProvenance: "restated",
-          restatedFrom: guessedPaths[0] ?? "",
-          restatedAt: ts
-        }
-      });
+      store2.mergeEdge(restatedAnchor(p.id, target.id, guessedPaths[0] ?? "", ts));
       for (const e of legacy) {
         if (e.to !== target.id) store2.closeEdge(e.id, ts);
       }
@@ -27645,23 +27654,35 @@ function backfillLegacyAnchors(store2, ts) {
   const report = {
     demotedEdges: 0,
     demotedProblems: 0,
+    restatedProblems: 0,
     labeledEdges: 0,
     suspects: []
   };
+  let resolvePath;
   for (const p of store2.findNodesByLabel("Problem")) {
-    const legacy = store2.outEdges(p.id, ["ANCHORED_AT"]).filter((e) => isLegacyAnchor(e.attrs));
-    if (legacy.length === 0) continue;
     const resolved = p.attrs["resolvedAt"] !== void 0;
+    const legacy = store2.outEdges(p.id, ["ANCHORED_AT"]).filter((e) => isLegacyAnchor(e.attrs) || !resolved && e.attrs?.["anchorProvenance"] === "legacy");
+    if (legacy.length === 0) continue;
     try {
       if (!resolved) {
-        for (const e of legacy) {
+        resolvePath ??= filePathResolver(store2);
+        const target = statementTarget(String(p.description ?? ""), resolvePath);
+        if (target) {
+          const guessed = store2.getNode(legacy[0].to);
+          store2.mergeEdge(
+            restatedAnchor(p.id, target.id, String(guessed?.attrs["relPath"] ?? guessed?.description ?? ""), ts)
+          );
+          report.restatedProblems++;
+        }
+        const retired = legacy.filter((e) => !(target && e.to === target.id));
+        for (const e of retired) {
           const file2 = store2.getNode(e.to);
           const path = String(file2?.attrs["relPath"] ?? file2?.description ?? "");
           if (path) recordAnchorHint(store2, p.id, path, "legacy", ts);
-          store2.deleteEdge(e.id);
+          store2.closeEdge(e.id, ts);
           report.demotedEdges++;
         }
-        report.demotedProblems++;
+        if (retired.length > 0) report.demotedProblems++;
         continue;
       }
       for (const e of legacy) {