sphica 0.6.20 → 0.6.21

package/dist/deliver.js

@@ -11135,7 +11135,7 @@ var HOST_MARKS = new Set([".orphaned_at", ".in_use"]);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 7;
+var SCHEMA_REVISION = 8;
 var sphicaHome = () => process.env.SPHICA_HOME || path3.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path3.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -11512,7 +11512,7 @@ import fs3 from "node:fs";
 import path4 from "node:path";
 var localFile = () => path4.join(sphicaHome(), "projects.json");
 var LOCAL_KEY = /^[a-z0-9][a-z0-9._-]*$/;
-function normalizeRemote(url) {
+function legacyRemote(url) {
   const raw = String(url ?? "").trim();
   if (!raw)
     return null;
@@ -11529,6 +11529,15 @@ function normalizeRemote(url) {
     return null;
   }
 }
+var fold = (s) => s.replace(/[A-Z]+/g, (m) => m.toLowerCase());
+function normalizeKey(key) {
+  if (!key.startsWith("git:"))
+    return key;
+  const rest = key.slice(4);
+  const cut = rest.indexOf("/");
+  const host = fold(cut < 0 ? rest : rest.slice(0, cut));
+  return host === "github.com" ? fold(key) : `git:${host}${cut < 0 ? "" : rest.slice(cut)}`;
+}
 var git = (dir, ...args) => {
   try {
     return execFileSync("git", ["-C", dir, ...args], {
@@ -11563,14 +11572,17 @@ function identify(dir) {
   const given = path4.resolve(dir);
   const top = git(given, "rev-parse", "--show-toplevel");
   const root = top || given;
-  const remote = top ? normalizeRemote(git(root, "remote", "get-url", "origin")) : null;
-  if (remote)
-    return { key: `git:${remote}`, root, name: remote.split("/").slice(1).join("/") || remote };
+  const legacy = top ? legacyRemote(git(root, "remote", "get-url", "origin")) : null;
+  if (legacy) {
+    const key = normalizeKey(`git:${legacy}`);
+    const remote = key.slice(4);
+    return { key, legacyKey: `git:${legacy}`, root, name: remote.split("/").slice(1).join("/") || remote };
+  }
   const map = localMap();
   for (let d = root;; d = path4.dirname(d)) {
     const local = map[d];
     if (local && LOCAL_KEY.test(local))
-      return { key: `local:${local}`, root: d, name: local };
+      return { key: `local:${local}`, legacyKey: `local:${local}`, root: d, name: local };
     if (top || path4.dirname(d) === d)
       return null;
   }
@@ -11666,6 +11678,8 @@ var HOLD_MAX = 1000;
 var baselineDir = () => path6.join(sphicaHome(), "worktree");
 function current(raw) {
   const r = raw;
+  if (typeof r.project !== "string")
+    throw new Error("queue record without a project key");
   if (r.v === 2)
     return raw;
   if (r.v !== 1)
@@ -11846,7 +11860,7 @@ function onHook(host, input) {
     v: 2,
     host,
     session: String(input.session_id),
-    project: place.key,
+    project: place.legacyKey,
     branch: branchOf(place.root),
     turn,
     at
@@ -11978,17 +11992,33 @@ var BATCH = 500;
 var FLUSH_BUDGET_MS = 30000;
 var ROWS = 1000;
 var chunks = (xs, n = ROWS) => Array.from({ length: Math.ceil(xs.length / n) }, (_, i) => xs.slice(i * n, (i + 1) * n));
-async function write(db, batch, projects) {
+async function projectsOf(trx, keys) {
+  if (!keys.length)
+    return new Map;
+  const all = await trx.selectFrom("project").select(["id", "key"]).execute();
+  const exact = new Map(all.map((p) => [p.key, p.id]));
+  const normal = Map.groupBy(all, (p) => normalizeKey(p.key));
+  const found = new Map;
+  for (const k of keys) {
+    const same = normal.get(normalizeKey(k));
+    const id = exact.get(k) ?? (same?.length === 1 ? same[0]?.id : undefined);
+    if (id !== undefined)
+      found.set(k, id);
+  }
+  return found;
+}
+async function write(db, batch) {
   return inTransaction(db, async (trx) => {
+    const projects = await projectsOf(trx, batch.map((r) => r.project));
     const sessions = new Map;
     for (const r of batch) {
       const p = projects.get(r.project);
-      if (!p)
+      if (p === undefined)
         continue;
-      const id = sessionId(p.id, r.host, r.session);
+      const id = sessionId(p, r.host, r.session);
       const prev = sessions.get(id);
       if (!prev || Date.parse(r.at) < Date.parse(prev.at))
-        sessions.set(id, { project: p.id, host: r.host, session: r.session, branch: r.branch, at: r.at });
+        sessions.set(id, { project: p, host: r.host, session: r.session, branch: r.branch, at: r.at });
     }
     for (const part of chunks([...sessions]))
       await trx.insertInto("capture_session").values(part.map(([id, v]) => ({
@@ -12001,9 +12031,9 @@ async function write(db, batch, projects) {
       }))).execute();
     const messages = batch.flatMap((m) => {
       const p = m.kind === "message" ? projects.get(m.project) : undefined;
-      if (m.kind !== "message" || !p)
+      if (m.kind !== "message" || p === undefined)
         return [];
-      return [{ m, session: sessionId(p.id, m.host, m.session) }];
+      return [{ m, session: sessionId(p, m.host, m.session) }];
     });
     const present = async () => {
       let n = 0;
@@ -12031,11 +12061,11 @@ async function write(db, batch, projects) {
     const after = await present();
     const edits = batch.flatMap((r) => {
       const p = r.kind === "edit" ? projects.get(r.project) : undefined;
-      if (r.kind !== "edit" || !p)
+      if (r.kind !== "edit" || p === undefined)
         return [];
       return [
         {
-          session_id: sessionId(p.id, r.host, r.session),
+          session_id: sessionId(p, r.host, r.session),
           turn_id: r.turn,
           tool_event_id: r.event,
           path: r.path,
@@ -12046,7 +12076,7 @@ async function write(db, batch, projects) {
     });
     for (const part of chunks(edits))
       await trx.insertInto("capture_edit").values(part).execute();
-    return after - before;
+    return { sent: after - before, strayed: new Set(batch.filter((r) => !projects.has(r.project))) };
   });
 }
 var REJECTED = new Set([18, 19, 20, 25]);
@@ -12075,19 +12105,22 @@ async function sendBatch(db, names) {
     else
       fs5.rmSync(path6.join(from, name), { force: true });
   }
-  const projects = new Map((await db.selectFrom("project").select(["id", "key", "name"]).where("key", "in", [...new Set(records.map((x) => x.r.project))]).execute()).map((p) => [p.key, { id: p.id, name: p.name }]));
-  const known = records.filter((x) => projects.has(x.r.project));
-  const strayed = records.filter((x) => !projects.has(x.r.project));
   let sent = 0;
+  let strayed = [];
   const bad = [];
   try {
-    sent = await write(db, known.map((x) => x.r), projects);
+    const out = await write(db, records.map((x) => x.r));
+    sent = out.sent;
+    strayed = records.filter((x) => out.strayed.has(x.r));
   } catch (e) {
     if (!rejected(e))
       throw e;
-    for (const x of known) {
+    for (const x of records) {
       try {
-        sent += await write(db, [x.r], projects);
+        const out = await write(db, [x.r]);
+        sent += out.sent;
+        if (out.strayed.size)
+          strayed.push(x);
       } catch (e2) {
         if (!rejected(e2))
           throw e2;

package/dist/mcp-record.js

@@ -45870,7 +45870,7 @@ var HOST_MARKS = new Set([".orphaned_at", ".in_use"]);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 7;
+var SCHEMA_REVISION = 8;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -46343,7 +46343,7 @@ ${l}`).join("");
 // server/src/project.ts
 var localFile = () => path4.join(sphicaHome(), "projects.json");
 var LOCAL_KEY = /^[a-z0-9][a-z0-9._-]*$/;
-function normalizeRemote(url2) {
+function legacyRemote(url2) {
   const raw = String(url2 ?? "").trim();
   if (!raw)
     return null;
@@ -46360,6 +46360,15 @@ function normalizeRemote(url2) {
     return null;
   }
 }
+var fold = (s) => s.replace(/[A-Z]+/g, (m) => m.toLowerCase());
+function normalizeKey(key) {
+  if (!key.startsWith("git:"))
+    return key;
+  const rest = key.slice(4);
+  const cut = rest.indexOf("/");
+  const host = fold(cut < 0 ? rest : rest.slice(0, cut));
+  return host === "github.com" ? fold(key) : `git:${host}${cut < 0 ? "" : rest.slice(cut)}`;
+}
 var git = (dir, ...args) => {
   try {
     return execFileSync("git", ["-C", dir, ...args], {
@@ -46394,14 +46403,17 @@ function identify(dir) {
   const given = path4.resolve(dir);
   const top = git(given, "rev-parse", "--show-toplevel");
   const root = top || given;
-  const remote = top ? normalizeRemote(git(root, "remote", "get-url", "origin")) : null;
-  if (remote)
-    return { key: `git:${remote}`, root, name: remote.split("/").slice(1).join("/") || remote };
+  const legacy = top ? legacyRemote(git(root, "remote", "get-url", "origin")) : null;
+  if (legacy) {
+    const key = normalizeKey(`git:${legacy}`);
+    const remote = key.slice(4);
+    return { key, legacyKey: `git:${legacy}`, root, name: remote.split("/").slice(1).join("/") || remote };
+  }
   const map3 = localMap();
   for (let d = root;; d = path4.dirname(d)) {
     const local = map3[d];
     if (local && LOCAL_KEY.test(local))
-      return { key: `local:${local}`, root: d, name: local };
+      return { key: `local:${local}`, legacyKey: `local:${local}`, root: d, name: local };
     if (top || path4.dirname(d) === d)
       return null;
   }
@@ -46517,6 +46529,8 @@ var HOLD_MAX = 1000;
 var baselineDir = () => path6.join(sphicaHome(), "worktree");
 function current(raw) {
   const r = raw;
+  if (typeof r.project !== "string")
+    throw new Error("queue record without a project key");
   if (r.v === 2)
     return raw;
   if (r.v !== 1)
@@ -46697,7 +46711,7 @@ function onHook(host, input2) {
     v: 2,
     host,
     session: String(input2.session_id),
-    project: place.key,
+    project: place.legacyKey,
     branch: branchOf(place.root),
     turn,
     at
@@ -46830,17 +46844,33 @@ var FLUSH_BUDGET_MS = 30000;
 var TOOL_FLUSH_BUDGET_MS = 2000;
 var ROWS = 1000;
 var chunks = (xs, n = ROWS) => Array.from({ length: Math.ceil(xs.length / n) }, (_, i) => xs.slice(i * n, (i + 1) * n));
-async function write(db, batch, projects) {
+async function projectsOf(trx, keys) {
+  if (!keys.length)
+    return new Map;
+  const all = await trx.selectFrom("project").select(["id", "key"]).execute();
+  const exact = new Map(all.map((p) => [p.key, p.id]));
+  const normal = Map.groupBy(all, (p) => normalizeKey(p.key));
+  const found = new Map;
+  for (const k of keys) {
+    const same = normal.get(normalizeKey(k));
+    const id = exact.get(k) ?? (same?.length === 1 ? same[0]?.id : undefined);
+    if (id !== undefined)
+      found.set(k, id);
+  }
+  return found;
+}
+async function write(db, batch) {
   return inTransaction(db, async (trx) => {
+    const projects = await projectsOf(trx, batch.map((r) => r.project));
     const sessions = new Map;
     for (const r of batch) {
       const p = projects.get(r.project);
-      if (!p)
+      if (p === undefined)
         continue;
-      const id = sessionId(p.id, r.host, r.session);
+      const id = sessionId(p, r.host, r.session);
       const prev = sessions.get(id);
       if (!prev || Date.parse(r.at) < Date.parse(prev.at))
-        sessions.set(id, { project: p.id, host: r.host, session: r.session, branch: r.branch, at: r.at });
+        sessions.set(id, { project: p, host: r.host, session: r.session, branch: r.branch, at: r.at });
     }
     for (const part of chunks([...sessions]))
       await trx.insertInto("capture_session").values(part.map(([id, v]) => ({
@@ -46853,9 +46883,9 @@ async function write(db, batch, projects) {
       }))).execute();
     const messages = batch.flatMap((m) => {
       const p = m.kind === "message" ? projects.get(m.project) : undefined;
-      if (m.kind !== "message" || !p)
+      if (m.kind !== "message" || p === undefined)
         return [];
-      return [{ m, session: sessionId(p.id, m.host, m.session) }];
+      return [{ m, session: sessionId(p, m.host, m.session) }];
     });
     const present = async () => {
       let n = 0;
@@ -46883,11 +46913,11 @@ async function write(db, batch, projects) {
     const after = await present();
     const edits = batch.flatMap((r) => {
       const p = r.kind === "edit" ? projects.get(r.project) : undefined;
-      if (r.kind !== "edit" || !p)
+      if (r.kind !== "edit" || p === undefined)
         return [];
       return [
         {
-          session_id: sessionId(p.id, r.host, r.session),
+          session_id: sessionId(p, r.host, r.session),
           turn_id: r.turn,
           tool_event_id: r.event,
           path: r.path,
@@ -46898,7 +46928,7 @@ async function write(db, batch, projects) {
     });
     for (const part of chunks(edits))
       await trx.insertInto("capture_edit").values(part).execute();
-    return after - before;
+    return { sent: after - before, strayed: new Set(batch.filter((r) => !projects.has(r.project))) };
   });
 }
 var REJECTED = new Set([18, 19, 20, 25]);
@@ -46927,19 +46957,22 @@ async function sendBatch(db, names) {
     else
       fs6.rmSync(path6.join(from, name), { force: true });
   }
-  const projects = new Map((await db.selectFrom("project").select(["id", "key", "name"]).where("key", "in", [...new Set(records.map((x) => x.r.project))]).execute()).map((p) => [p.key, { id: p.id, name: p.name }]));
-  const known = records.filter((x) => projects.has(x.r.project));
-  const strayed = records.filter((x) => !projects.has(x.r.project));
   let sent = 0;
+  let strayed = [];
   const bad = [];
   try {
-    sent = await write(db, known.map((x) => x.r), projects);
+    const out = await write(db, records.map((x) => x.r));
+    sent = out.sent;
+    strayed = records.filter((x) => out.strayed.has(x.r));
   } catch (e) {
     if (!rejected(e))
       throw e;
-    for (const x of known) {
+    for (const x of records) {
       try {
-        sent += await write(db, [x.r], projects);
+        const out = await write(db, [x.r]);
+        sent += out.sent;
+        if (out.strayed.size)
+          strayed.push(x);
       } catch (e2) {
         if (!rejected(e2))
           throw e2;

package/dist/mcp.js

@@ -45691,7 +45691,7 @@ var HOST_MARKS = new Set([".orphaned_at", ".in_use"]);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 7;
+var SCHEMA_REVISION = 8;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -47111,7 +47111,7 @@ import fs6 from "node:fs";
 import path7 from "node:path";
 var localFile = () => path7.join(sphicaHome(), "projects.json");
 var LOCAL_KEY = /^[a-z0-9][a-z0-9._-]*$/;
-function normalizeRemote(url2) {
+function legacyRemote(url2) {
   const raw = String(url2 ?? "").trim();
   if (!raw)
     return null;
@@ -47128,6 +47128,15 @@ function normalizeRemote(url2) {
     return null;
   }
 }
+var fold = (s) => s.replace(/[A-Z]+/g, (m) => m.toLowerCase());
+function normalizeKey(key) {
+  if (!key.startsWith("git:"))
+    return key;
+  const rest = key.slice(4);
+  const cut2 = rest.indexOf("/");
+  const host = fold(cut2 < 0 ? rest : rest.slice(0, cut2));
+  return host === "github.com" ? fold(key) : `git:${host}${cut2 < 0 ? "" : rest.slice(cut2)}`;
+}
 var git = (dir, ...args) => {
   try {
     return execFileSync2("git", ["-C", dir, ...args], {
@@ -47162,14 +47171,17 @@ function identify(dir) {
   const given = path7.resolve(dir);
   const top = git(given, "rev-parse", "--show-toplevel");
   const root = top || given;
-  const remote = top ? normalizeRemote(git(root, "remote", "get-url", "origin")) : null;
-  if (remote)
-    return { key: `git:${remote}`, root, name: remote.split("/").slice(1).join("/") || remote };
+  const legacy = top ? legacyRemote(git(root, "remote", "get-url", "origin")) : null;
+  if (legacy) {
+    const key = normalizeKey(`git:${legacy}`);
+    const remote = key.slice(4);
+    return { key, legacyKey: `git:${legacy}`, root, name: remote.split("/").slice(1).join("/") || remote };
+  }
   const map3 = localMap();
   for (let d = root;; d = path7.dirname(d)) {
     const local = map3[d];
     if (local && LOCAL_KEY.test(local))
-      return { key: `local:${local}`, root: d, name: local };
+      return { key: `local:${local}`, legacyKey: `local:${local}`, root: d, name: local };
     if (top || path7.dirname(d) === d)
       return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sphica",
-  "version": "0.6.20",
+  "version": "0.6.21",
   "description": "Records Claude Code and Codex sessions on your machine and keeps past implementation and decisions, with their sources, for your agent to find.",
   "license": "MIT",
   "type": "module",