@inerrata-corporation/errata 2.0.6-dev.2081 → 2.0.6-dev.2115

package/errata.mjs

@@ -77056,7 +77056,7 @@ function createWatchBreaker(deps) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.6-dev.2081" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.6-dev.2115" : "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;
@@ -82578,10 +82578,21 @@ init_cloud_auth();
 import { createServer } from "node:http";
 var DEFAULT_OAUTH_SCOPE = "openid profile graph:read graph:write mcp:tools";
 var strip = (u) => u.replace(/\/+$/, "");
-function deviceEndpoints(tokenEndpoint) {
+function deviceEndpoints(tokenEndpoint, deviceAuthorizationEndpoint) {
   const token = new URL(tokenEndpoint);
   const authRoot = token.pathname.replace(/\/(?:oauth2|mcp)\/token\/?$/, "");
-  if (authRoot === token.pathname) throw new Error("authorization server exposes no device endpoint");
+  if (authRoot === token.pathname) {
+    if (deviceAuthorizationEndpoint) {
+      const device = new URL(deviceAuthorizationEndpoint);
+      const code = `${device.origin}${device.pathname.replace(/\/+$/, "")}`;
+      return {
+        code,
+        token: `${code}/token`,
+        resource: new URL("/api/gate/session-token", device.origin).toString()
+      };
+    }
+    throw new Error("authorization server exposes no device endpoint");
+  }
   const prefix = authRoot.replace(/\/api\/auth\/?$/, "");
   const at = (path2) => new URL(`${path2}`, `${token.origin}${prefix || "/"}`).toString();
   return {
@@ -82593,7 +82604,7 @@ function deviceEndpoints(tokenEndpoint) {
 async function loginOAuthDevice(opts) {
   const fetchFn = opts.fetchFn ?? fetch;
   const endpoints = await discoverEndpoints(opts.cloudUrl, fetchFn);
-  const device = deviceEndpoints(endpoints.tokenEndpoint);
+  const device = deviceEndpoints(endpoints.tokenEndpoint, endpoints.deviceAuthorizationEndpoint);
   const clientId = oauthClientId();
   const scope = opts.scope ?? DEFAULT_OAUTH_SCOPE;
   const codeResponse = await fetchFn(device.code, {
@@ -82692,7 +82703,8 @@ async function discoverEndpoints(cloudUrl, fetchFn = fetch) {
         return {
           authorizationEndpoint: j.authorization_endpoint,
           tokenEndpoint: j.token_endpoint,
-          ...j.registration_endpoint ? { registrationEndpoint: j.registration_endpoint } : {}
+          ...j.registration_endpoint ? { registrationEndpoint: j.registration_endpoint } : {},
+          ...j.device_authorization_endpoint ? { deviceAuthorizationEndpoint: j.device_authorization_endpoint } : {}
         };
       }
     }
@@ -82809,7 +82821,7 @@ function isDecision(value) {
 async function linkThroughConsole(opts) {
   const fetchFn = opts.fetchFn ?? fetch;
   const endpoints = await discoverEndpoints(opts.cloudUrl, fetchFn);
-  const device = deviceEndpoints(endpoints.tokenEndpoint);
+  const device = deviceEndpoints(endpoints.tokenEndpoint, endpoints.deviceAuthorizationEndpoint);
   const clientId = oauthClientId();
   const link = {
     locator: opts.facts.locator,
@@ -83159,6 +83171,76 @@ function codexWakeCandidates(input) {
   return out2;
 }
 
+// src/hook-route.ts
+function msysToWindowsPath(p, platform = process.platform) {
+  if (platform !== "win32") return p;
+  const m = /^\/([a-zA-Z])(\/.*)?$/.exec(p);
+  return m ? `${m[1].toUpperCase()}:${m[2] ?? "/"}` : p;
+}
+var SHELL_BREAK = /[\s"'`;&|()<>=]+/;
+function absolutePathsInCommand(command, platform = process.platform) {
+  const out2 = [];
+  for (const raw2 of command.split(SHELL_BREAK)) {
+    const token = raw2.replace(/^[:,]+/, "").replace(/[,:]+$/, "");
+    if (!token) continue;
+    if (/^[a-zA-Z]:[\\/]/.test(token)) {
+      out2.push(token);
+    } else if (token.startsWith("/") && !token.startsWith("//")) {
+      if (platform === "win32") {
+        if (/^\/[a-zA-Z](\/|$)/.test(token)) out2.push(msysToWindowsPath(token, platform));
+      } else if (token.length > 1) {
+        out2.push(token);
+      }
+    }
+  }
+  return out2;
+}
+function hookPathCandidates(body2, platform = process.platform) {
+  const input = body2["tool_input"] ?? {};
+  const str = (v) => typeof v === "string" && v.length > 0 ? v : void 0;
+  const out2 = [];
+  for (const key of ["file_path", "notebook_path", "path"]) {
+    const v = str(input[key]);
+    if (v) out2.push(msysToWindowsPath(v, platform));
+  }
+  const command = str(input["command"]);
+  if (command) out2.push(...absolutePathsInCommand(command, platform));
+  const cwd = str(body2["cwd"]);
+  if (cwd) out2.push(msysToWindowsPath(cwd, platform));
+  return [...new Set(out2)];
+}
+var SESSION_AFFINITY_TTL_MS = 30 * 6e4;
+var SessionAffinity = class {
+  constructor(ttlMs = SESSION_AFFINITY_TTL_MS, maxSessions = 500) {
+    this.ttlMs = ttlMs;
+    this.maxSessions = maxSessions;
+  }
+  bySession = /* @__PURE__ */ new Map();
+  note(sessionId, root, now = Date.now()) {
+    if (typeof sessionId !== "string" || sessionId.length === 0) return;
+    this.bySession.delete(sessionId);
+    this.bySession.set(sessionId, { root, at: now });
+    while (this.bySession.size > this.maxSessions) {
+      const oldest = this.bySession.keys().next().value;
+      if (oldest === void 0) break;
+      this.bySession.delete(oldest);
+    }
+  }
+  rootFor(sessionId, now = Date.now()) {
+    if (typeof sessionId !== "string" || sessionId.length === 0) return null;
+    const hit = this.bySession.get(sessionId);
+    if (!hit) return null;
+    if (now - hit.at > this.ttlMs) {
+      this.bySession.delete(sessionId);
+      return null;
+    }
+    return hit.root;
+  }
+  forget(sessionId) {
+    if (typeof sessionId === "string") this.bySession.delete(sessionId);
+  }
+};
+
 // src/multi.ts
 var projectSymbolSalts = /* @__PURE__ */ new Map();
 async function resolveProjectSymbolSalt(client, projectId) {
@@ -83609,7 +83691,8 @@ async function startMultiDaemon(opts = {}) {
       }))
     })
   );
-  const forward = async (c, pathInBody) => {
+  const sessionAffinity = new SessionAffinity();
+  const forward = async (c, pathInBody, opts2 = {}) => {
     const raw2 = await c.req.text();
     let body2 = {};
     try {
@@ -83618,7 +83701,21 @@ async function startMultiDaemon(opts = {}) {
       return c.json({ error: "bad-json" }, 400);
     }
     lastHook = { at: Date.now(), event: typeof body2["hook_event_name"] === "string" ? body2["hook_event_name"] : c.req.path };
-    let owner = ownerOf(records, pathInBody(body2));
+    const primary = pathInBody(body2);
+    const others = (opts2.extraPaths?.(body2) ?? []).filter((p) => p !== primary);
+    let owner = ownerOf(records, primary);
+    for (const p of others) {
+      if (owner) break;
+      owner = ownerOf(records, p);
+    }
+    if (!owner && others.length > 0) {
+      const registryRoots = listWorkspaceEntries().map((e) => e.path);
+      const registered = others.map((p) => pickOwnerRoot(registryRoots, p)).find((r) => r != null);
+      if (registered && attachWorkspace(registered).attached) {
+        owner = records.find((r) => r.root === registered) ?? null;
+        if (owner) console.log(`[errata] woke workspace ${owner.entry.name}`);
+      }
+    }
     if (!owner) {
       const missPath = pathInBody(body2);
       const registeredRoot = missPath ? pickOwnerRoot(listWorkspaceEntries().map((e) => e.path), missPath) : null;
@@ -83628,10 +83725,18 @@ async function startMultiDaemon(opts = {}) {
         if (owner) console.log(`[errata] woke workspace ${owner.entry.name}`);
       }
     }
+    if (!owner && opts2.affinity === "follow") {
+      const root = sessionAffinity.rootFor(body2["session_id"]);
+      if (root) {
+        owner = records.find((r) => r.root === root) ?? null;
+        if (!owner && attachWorkspace(root).attached) owner = records.find((r) => r.root === root) ?? null;
+      }
+    }
     if (!owner) {
-      rootAdopter.noteMiss(pathInBody(body2));
+      rootAdopter.noteMiss(primary);
       return c.json({ error: "no-matching-project" }, 404);
     }
+    if (opts2.affinity === "note") sessionAffinity.note(body2["session_id"], owner.root);
     owner.lastHookAt = Date.now();
     const sub = c.req.path;
     const done = markPass(`${sub}:${owner.entry.name}`);
@@ -83654,7 +83759,7 @@ async function startMultiDaemon(opts = {}) {
       const fp = input["file_path"];
       const cwd = b["cwd"];
       return (typeof fp === "string" ? fp : void 0) ?? (typeof cwd === "string" ? cwd : void 0);
-    })
+    }, { extraPaths: (b) => hookPathCandidates(b), affinity: "note" })
   );
   app.post(
     "/api/diagnostics",
@@ -83664,10 +83769,10 @@ async function startMultiDaemon(opts = {}) {
     })
   );
   const cwdOf = (b) => typeof b["cwd"] === "string" ? b["cwd"] : void 0;
-  app.post("/api/turn", (c) => forward(c, cwdOf));
-  app.post("/api/message", (c) => forward(c, cwdOf));
-  app.post("/api/session-end", (c) => forward(c, cwdOf));
-  app.post("/api/context-inject", (c) => forward(c, cwdOf));
+  app.post("/api/turn", (c) => forward(c, cwdOf, { affinity: "follow" }));
+  app.post("/api/message", (c) => forward(c, cwdOf, { affinity: "follow" }));
+  app.post("/api/session-end", (c) => forward(c, cwdOf, { affinity: "follow" }));
+  app.post("/api/context-inject", (c) => forward(c, cwdOf, { affinity: "follow" }));
   for (const r of records) {
     mountedIds.add(r.id);
     app.route(`/ws/${r.id}`, r.webApp);

package/package.json

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