@volter/teams 0.1.56 → 0.1.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/teams",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "type": "module",
   "description": "Volter Teams, the neutral team plane: machine identity and daemon core, the local door and server link, admission from machine grants, product doors, and the Teams server's neutral routes (company RFC 0008).",
   "license": "MIT",

package/server/core.mjs

@@ -69,6 +69,21 @@ export async function maintain(api){const now=api.clock.nowMs();
   // they go (a backlog of them filled the database).
   const parts=await api.store.query(`SELECT p.team_id,p.capture_id,p.part_index FROM capture_parts p JOIN captures c ON c.team_id=p.team_id AND c.id=p.capture_id WHERE c.state='committed' LIMIT ${PART_PRUNE_BATCH}`,[]);
   for(let at=0;at<parts.length;at+=50)await api.store.transaction(parts.slice(at,at+50).map(({team_id,capture_id,part_index})=>({sql:'DELETE FROM capture_parts WHERE team_id=? AND capture_id=? AND part_index=?',params:[team_id,capture_id,part_index]})));
+  // Retired versions release their native bundles. Keep every bundle still named by a version,
+  // continuation (including completed receipts), or in-flight capture. Never-committed uploads retain their one-day grace.
+  const orphaned=await api.store.query(`SELECT u.team_id,u.id FROM uploads u WHERE u.committed=1
+    AND NOT EXISTS (SELECT 1 FROM session_artifacts a WHERE a.team_id=u.team_id AND a.upload_id=u.id)
+    AND NOT EXISTS (SELECT 1 FROM continuations c WHERE c.team_id=u.team_id AND instr(c.value_json,u.id)>0)
+    AND NOT EXISTS (SELECT 1 FROM captures c WHERE c.team_id=u.team_id AND c.state='staging' AND instr(c.begin_json,u.id)>0)
+    LIMIT 10`,[]);
+  for(const upload of orphaned)await api.store.transaction([{sql:`DELETE FROM uploads AS u WHERE team_id=? AND id=? AND committed=1
+    AND NOT EXISTS (SELECT 1 FROM session_artifacts a WHERE a.team_id=u.team_id AND a.upload_id=u.id)
+    AND NOT EXISTS (SELECT 1 FROM continuations c WHERE c.team_id=u.team_id AND instr(c.value_json,u.id)>0)
+    AND NOT EXISTS (SELECT 1 FROM captures c WHERE c.team_id=u.team_id AND c.state='staging' AND instr(c.begin_json,u.id)>0)`,params:[upload.team_id,upload.id]}]);
+  const unusedBlobs = await api.store.query(`SELECT team_id,sha256 FROM artifact_blobs b
+    WHERE NOT EXISTS (SELECT 1 FROM artifact_chunk_refs r WHERE r.team_id=b.team_id AND r.sha256=b.sha256) LIMIT 50`);
+  for (const blob of unusedBlobs) await api.store.transaction([{sql:`DELETE FROM artifact_blobs AS b WHERE team_id=? AND sha256=?
+    AND NOT EXISTS (SELECT 1 FROM artifact_chunk_refs r WHERE r.team_id=b.team_id AND r.sha256=b.sha256)`,params:[blob.team_id,blob.sha256]}]);
   // Every capture writes its session a new version (its messages are carried, not copied: schema 9), so versions pile
   // up (hundreds per session) until listing them outgrew a Worker's memory. Kept: each session's current version, the newest
   // version from each of its sources (the next capture and a correlation read that one), and every version an
@@ -76,6 +91,10 @@ export async function maintain(api){const now=api.clock.nowMs();
   const stale=await api.store.query(`SELECT v.team_id,v.session_id,v.revision FROM session_versions v JOIN sessions s ON s.team_id=v.team_id AND s.id=v.session_id
     WHERE v.revision<>s.revision
     AND EXISTS (SELECT 1 FROM session_versions n WHERE n.team_id=v.team_id AND n.session_id=v.session_id AND n.revision>v.revision AND json_extract(n.source_projection_json,'$.source_id') IS json_extract(v.source_projection_json,'$.source_id'))
+    AND (NOT EXISTS (SELECT 1 FROM session_artifacts a WHERE a.team_id=v.team_id AND a.session_id=v.session_id AND a.revision=v.revision AND a.provenance='capture')
+      OR EXISTS (SELECT 1 FROM session_artifacts a JOIN session_versions n ON n.team_id=a.team_id AND n.session_id=a.session_id AND n.revision=a.revision
+        WHERE a.team_id=v.team_id AND a.session_id=v.session_id AND a.revision>v.revision AND a.provenance='capture'
+        AND json_extract(n.source_projection_json,'$.source_id') IS json_extract(v.source_projection_json,'$.source_id')))
     AND NOT EXISTS (SELECT 1 FROM cursors c, json_each(c.snapshot_json) j WHERE c.team_id=v.team_id AND c.kind IN ('list','search') AND c.expires_at>? AND json_extract(j.value,'$[0]')=v.session_id AND json_extract(j.value,'$[1]')=v.revision)
     AND NOT EXISTS (SELECT 1 FROM cursors c WHERE c.team_id=v.team_id AND c.kind='history' AND c.expires_at>? AND json_extract(c.snapshot_json,'$.session_id')=v.session_id AND json_extract(c.snapshot_json,'$.revision')=v.revision)
     LIMIT ${VERSION_PRUNE_BATCH}`,[now,now]);
@@ -85,14 +104,6 @@ export async function maintain(api){const now=api.clock.nowMs();
     {sql:'UPDATE messages SET revision=(SELECT MIN(k.revision) FROM session_versions k WHERE k.team_id=messages.team_id AND k.session_id=messages.session_id AND k.revision>messages.revision AND k.revision<COALESCE(messages.until_revision,messages.revision+1)) WHERE team_id=? AND session_id=? AND revision=? AND EXISTS (SELECT 1 FROM session_versions k WHERE k.team_id=messages.team_id AND k.session_id=messages.session_id AND k.revision>messages.revision AND k.revision<COALESCE(messages.until_revision,messages.revision+1))',params:[team_id,session_id,revision]},
     ...['messages','session_artifacts','session_versions'].map(table=>({sql:`DELETE FROM ${table} WHERE team_id=? AND session_id=? AND revision=?`,params:[team_id,session_id,revision]})),
   ]);
-  // Retired versions release their native bundles. Keep every bundle still named by a version,
-  // continuation (including completed receipts), or in-flight capture, and leave a full day for uploads.
-  const orphaned=await api.store.query(`SELECT u.team_id,u.id FROM uploads u WHERE u.committed=1 AND u.created_at+86400000<=?
-    AND NOT EXISTS (SELECT 1 FROM session_artifacts a WHERE a.team_id=u.team_id AND a.upload_id=u.id)
-    AND NOT EXISTS (SELECT 1 FROM continuations c WHERE c.team_id=u.team_id AND instr(c.value_json,u.id)>0)
-    AND NOT EXISTS (SELECT 1 FROM captures c WHERE c.team_id=u.team_id AND c.state='staging' AND instr(c.begin_json,u.id)>0)
-    LIMIT 10`,[now]);
-  for(const upload of orphaned)await api.store.transaction([{sql:'DELETE FROM uploads WHERE team_id=? AND id=?',params:[upload.team_id,upload.id]}]);
   await api.store.transaction([
         {sql:'DELETE FROM cursors WHERE expires_at<=?',params:[now]},
         {sql:'DELETE FROM global_cursors WHERE expires_at<=?',params:[now]},
@@ -108,7 +119,7 @@ export async function maintain(api){const now=api.clock.nowMs();
   // Presence reconciliation can INSERT. Never put it ahead of the deletes
   // that make room when the database is full.
   await reconcileMachinePresence(api);
-  const result={pruned_versions:stale.length,pruned_parts:parts.length,pruned_idempotency:expired.length,pruned_uploads:orphaned.length,backlog:orphaned.length>=10||expired.length>=1000||stale.length>=VERSION_PRUNE_BATCH||parts.length>=PART_PRUNE_BATCH};
+  const result={pruned_versions:stale.length,pruned_parts:parts.length,pruned_idempotency:expired.length,pruned_uploads:orphaned.length,pruned_blobs:unusedBlobs.length,backlog:unusedBlobs.length>=50||orphaned.length>=10||expired.length>=1000||stale.length>=VERSION_PRUNE_BATCH||parts.length>=PART_PRUNE_BATCH};
   if(result.pruned_versions||result.pruned_parts||result.pruned_idempotency||result.pruned_uploads)console.log(`maintain: pruned ${result.pruned_uploads} unreachable bundles, ${result.pruned_idempotency} expired replay records, ${result.pruned_parts} parts, ${result.pruned_versions} versions${result.backlog?' (backlog)':''}`);
   return result;}
 /** Session versions `maintain` removes per run: small enough for one Durable Object alarm; a backlog runs again in seconds. */

package/server/migrations/011.mjs

@@ -0,0 +1,20 @@
+// New captures share immutable chunk contents. Legacy uploads stay readable
+// without copying their bytes during migration; ordinary retention retires them.
+export default `
+CREATE TABLE artifact_blobs (
+  team_id TEXT NOT NULL, sha256 TEXT NOT NULL, bytes BLOB NOT NULL,
+  PRIMARY KEY(team_id,sha256), CHECK(length(bytes)<=1048576)
+) STRICT;
+CREATE TABLE artifact_chunk_refs (
+  team_id TEXT NOT NULL, upload_id TEXT NOT NULL, chunk_index INTEGER NOT NULL,
+  sha256 TEXT NOT NULL, PRIMARY KEY(team_id,upload_id,chunk_index),
+  FOREIGN KEY(team_id,upload_id) REFERENCES uploads(team_id,id) ON DELETE CASCADE,
+  FOREIGN KEY(team_id,sha256) REFERENCES artifact_blobs(team_id,sha256)
+) STRICT;
+CREATE INDEX artifact_chunk_refs_blob ON artifact_chunk_refs(team_id,sha256);
+CREATE VIEW artifact_chunk_data AS
+  SELECT team_id,upload_id,chunk_index,sha256,bytes FROM artifact_chunks
+  UNION ALL
+  SELECT r.team_id,r.upload_id,r.chunk_index,r.sha256,b.bytes
+    FROM artifact_chunk_refs r JOIN artifact_blobs b ON b.team_id=r.team_id AND b.sha256=r.sha256;
+`;

package/server/migrations/index.mjs

@@ -9,7 +9,8 @@ import m007 from './007.mjs';
 import m008 from './008.mjs';
 import m009 from './009.mjs';
 import m010 from './010.mjs';
-export const MIGRATIONS = [m001, m002, m003, m004, m005, m006, m007, m008, m009, m010];
+import m011 from './011.mjs';
+export const MIGRATIONS = [m001, m002, m003, m004, m005, m006, m007, m008, m009, m010, m011];
 /** A message row's `until_revision` while its session's current version still holds it (schema 9). */
 export const OPEN_REVISION = Number.MAX_SAFE_INTEGER;
 /** SQL: message row `m` belongs to the version at revision ?1 (bind the revision twice). */