@arcblock/did-connect-service 4.1.10 → 4.1.12

package/dist/store/d1-store.js

@@ -6,7 +6,7 @@
  */
 import { dbToAccessType, invalidateRegexCache } from "../access/access-policy.js";
 const SCHEMA_SQL = `
-CREATE TABLE IF NOT EXISTS users (
+CREATE TABLE IF NOT EXISTS cs_users (
   did TEXT PRIMARY KEY,
   pk TEXT NOT NULL DEFAULT '',
   fullName TEXT,
@@ -40,10 +40,10 @@ CREATE TABLE IF NOT EXISTS users (
   updatedBy TEXT
 );
 
-CREATE TABLE IF NOT EXISTS connected_accounts (
+CREATE TABLE IF NOT EXISTS cs_connected_accounts (
   did TEXT PRIMARY KEY,
   pk TEXT,
-  userDid TEXT REFERENCES users(did),
+  userDid TEXT REFERENCES cs_users(did),
   provider TEXT NOT NULL,
   id TEXT,
   firstLoginAt TEXT,
@@ -58,14 +58,14 @@ CREATE TABLE IF NOT EXISTS connected_accounts (
   updatedBy TEXT
 );
 
-CREATE TABLE IF NOT EXISTS challenges (
+CREATE TABLE IF NOT EXISTS cs_challenges (
   id TEXT PRIMARY KEY,
   challenge TEXT NOT NULL,
   invitationId TEXT,
   createdAt TEXT DEFAULT (datetime('now'))
 );
 
-CREATE TABLE IF NOT EXISTS invitations (
+CREATE TABLE IF NOT EXISTS cs_invitations (
   id TEXT PRIMARY KEY,
   teamDid TEXT NOT NULL,
   role TEXT NOT NULL,
@@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS invitations (
   updatedBy TEXT
 );
 
-CREATE TABLE IF NOT EXISTS audit_logs (
+CREATE TABLE IF NOT EXISTS cs_audit_logs (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   action TEXT NOT NULL,
   operatorDid TEXT NOT NULL,
@@ -91,20 +91,20 @@ CREATE TABLE IF NOT EXISTS audit_logs (
   createdAt TEXT DEFAULT (datetime('now'))
 );
 
-CREATE INDEX IF NOT EXISTS idx_users_email ON users(email);
-CREATE INDEX IF NOT EXISTS idx_users_pk ON users(pk);
-CREATE INDEX IF NOT EXISTS idx_users_createdAt ON users(createdAt);
-CREATE INDEX IF NOT EXISTS idx_connected_accounts_userDid ON connected_accounts(userDid);
-CREATE INDEX IF NOT EXISTS idx_connected_accounts_pk ON connected_accounts(pk);
-CREATE INDEX IF NOT EXISTS idx_invitations_status ON invitations(status);
-CREATE INDEX IF NOT EXISTS idx_invitations_expireAt ON invitations(expireAt);
-CREATE INDEX IF NOT EXISTS idx_audit_logs_action ON audit_logs(action);
-CREATE INDEX IF NOT EXISTS idx_audit_logs_operatorDid ON audit_logs(operatorDid);
-CREATE INDEX IF NOT EXISTS idx_audit_logs_createdAt ON audit_logs(createdAt);
-CREATE INDEX IF NOT EXISTS idx_audit_logs_targetDid ON audit_logs(targetDid);
-CREATE INDEX IF NOT EXISTS idx_audit_logs_ip ON audit_logs(ip);
+CREATE INDEX IF NOT EXISTS idx_users_email ON cs_users(email);
+CREATE INDEX IF NOT EXISTS idx_users_pk ON cs_users(pk);
+CREATE INDEX IF NOT EXISTS idx_users_createdAt ON cs_users(createdAt);
+CREATE INDEX IF NOT EXISTS idx_connected_accounts_userDid ON cs_connected_accounts(userDid);
+CREATE INDEX IF NOT EXISTS idx_connected_accounts_pk ON cs_connected_accounts(pk);
+CREATE INDEX IF NOT EXISTS idx_invitations_status ON cs_invitations(status);
+CREATE INDEX IF NOT EXISTS idx_invitations_expireAt ON cs_invitations(expireAt);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_action ON cs_audit_logs(action);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_operatorDid ON cs_audit_logs(operatorDid);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_createdAt ON cs_audit_logs(createdAt);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_targetDid ON cs_audit_logs(targetDid);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_ip ON cs_audit_logs(ip);
 
-CREATE TABLE IF NOT EXISTS access_policies (
+CREATE TABLE IF NOT EXISTS cs_access_policies (
   id TEXT PRIMARY KEY,
   name TEXT NOT NULL,
   description TEXT DEFAULT '',
@@ -117,11 +117,11 @@ CREATE TABLE IF NOT EXISTS access_policies (
   updatedBy TEXT
 );
 
-CREATE TABLE IF NOT EXISTS security_rules (
+CREATE TABLE IF NOT EXISTS cs_security_rules (
   id TEXT PRIMARY KEY,
   pathPattern TEXT NOT NULL,
   priority INTEGER DEFAULT 0,
-  accessPolicyId TEXT NOT NULL REFERENCES access_policies(id),
+  accessPolicyId TEXT NOT NULL REFERENCES cs_access_policies(id),
   enabled INTEGER DEFAULT 1,
   remark TEXT DEFAULT '',
   createdAt TEXT DEFAULT (datetime('now')),
@@ -130,10 +130,10 @@ CREATE TABLE IF NOT EXISTS security_rules (
   updatedBy TEXT
 );
 
-CREATE INDEX IF NOT EXISTS idx_security_rules_priority ON security_rules(priority);
-CREATE INDEX IF NOT EXISTS idx_security_rules_accessPolicyId ON security_rules(accessPolicyId);
+CREATE INDEX IF NOT EXISTS idx_security_rules_priority ON cs_security_rules(priority);
+CREATE INDEX IF NOT EXISTS idx_security_rules_accessPolicyId ON cs_security_rules(accessPolicyId);
 
-CREATE TABLE IF NOT EXISTS access_keys (
+CREATE TABLE IF NOT EXISTS cs_access_keys (
   accessKeyId TEXT PRIMARY KEY,
   accessKeyPublic TEXT NOT NULL,
   role TEXT NOT NULL,
@@ -146,22 +146,43 @@ CREATE TABLE IF NOT EXISTS access_keys (
   updatedBy TEXT
 );
 
-CREATE INDEX IF NOT EXISTS idx_access_keys_createdBy ON access_keys(createdBy);
-CREATE INDEX IF NOT EXISTS idx_access_keys_expireAt ON access_keys(expireAt);
-CREATE INDEX IF NOT EXISTS idx_access_keys_lastUsedAt ON access_keys(lastUsedAt);
+CREATE INDEX IF NOT EXISTS idx_access_keys_createdBy ON cs_access_keys(createdBy);
+CREATE INDEX IF NOT EXISTS idx_access_keys_expireAt ON cs_access_keys(expireAt);
+CREATE INDEX IF NOT EXISTS idx_access_keys_lastUsedAt ON cs_access_keys(lastUsedAt);
 
-CREATE TABLE IF NOT EXISTS connect_tokens (
+CREATE TABLE IF NOT EXISTS cs_connect_tokens (
   token TEXT PRIMARY KEY,
   data TEXT NOT NULL,
   expiresAt INTEGER NOT NULL
 );
 
-CREATE TABLE IF NOT EXISTS kv_cache (
+CREATE TABLE IF NOT EXISTS cs_kv_cache (
   key TEXT PRIMARY KEY,
   value TEXT NOT NULL,
   expires_at INTEGER NOT NULL
 );
 `;
+// Upgrade map (cs_ table prefix): pre-cs_ unprefixed name → cs_ name.
+// Consumed by the runtime rename guard in migrate() (the non-assumeMigrated
+// path), mirroring migrations/0010_rename_tables.sql for deploy-time DBs.
+const TABLE_RENAMES = [
+    ["users", "cs_users"],
+    ["connected_accounts", "cs_connected_accounts"],
+    ["challenges", "cs_challenges"],
+    ["invitations", "cs_invitations"],
+    ["audit_logs", "cs_audit_logs"],
+    ["access_policies", "cs_access_policies"],
+    ["security_rules", "cs_security_rules"],
+    ["access_keys", "cs_access_keys"],
+    ["access_key_sessions", "cs_access_key_sessions"],
+    ["connect_tokens", "cs_connect_tokens"],
+    ["kv_cache", "cs_kv_cache"],
+    ["memberships", "cs_memberships"],
+    ["settings", "cs_settings"],
+    ["instance_hosts", "cs_instance_hosts"],
+    ["login_tickets", "cs_login_tickets"],
+    ["verify_codes", "cs_verify_codes"],
+];
 // Module-level flag: schema migration runs once per isolate lifetime.
 // Safe because CREATE TABLE IF NOT EXISTS is idempotent — if the isolate
 // is recycled the flag resets and the migration re-runs harmlessly.
@@ -247,6 +268,23 @@ export class D1Store {
             schemaMigrated = true;
             return;
         }
+        // Upgrade guard (cs_ table prefix): rename any pre-cs_ unprefixed tables
+        // to their cs_* names BEFORE the CREATE TABLE IF NOT EXISTS batch below.
+        // Without this, CREATE IF NOT EXISTS would create a new empty cs_* table
+        // alongside the old one, silently losing all existing rows. Runtime analogue
+        // of migrations/0010_rename_tables.sql for the non-assumeMigrated path.
+        // "no such table" = fresh install / already migrated; "already … table named"
+        // = concurrent-open race — both are safe to ignore.
+        for (const [oldName, newName] of TABLE_RENAMES) {
+            try {
+                await this.db.prepare(`ALTER TABLE ${oldName} RENAME TO ${newName}`).run();
+            }
+            catch (err) {
+                const msg = String(err?.message ?? err);
+                if (!/no such table|already .*table|already exists/i.test(msg))
+                    throw err;
+            }
+        }
         // Batch 1: core tables + indexes from SCHEMA_SQL
         const statements = SCHEMA_SQL.split(";")
             .map((s) => s.trim())
@@ -254,43 +292,43 @@ export class D1Store {
         await this.db.batch(statements.map((sql) => this.db.prepare(sql)));
         // ALTER TABLE — run in parallel (each is independent; failure = column already exists)
         await Promise.allSettled([
-            this.db.prepare("ALTER TABLE challenges ADD COLUMN invitationId TEXT").run(),
-            this.db.prepare("ALTER TABLE users ADD COLUMN sourceDomain TEXT").run(),
-            this.db.prepare("ALTER TABLE users ADD COLUMN lastLoginDomain TEXT").run(),
-            this.db.prepare("ALTER TABLE security_rules ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
-            this.db.prepare("ALTER TABLE access_keys ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
-            this.db.prepare("ALTER TABLE audit_logs ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
-            this.db.prepare("ALTER TABLE access_policies ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
-            this.db.prepare("ALTER TABLE invitations ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
-            this.db.prepare("ALTER TABLE connected_accounts ADD COLUMN createdAt TEXT").run(),
-            this.db.prepare("ALTER TABLE connected_accounts ADD COLUMN updatedAt TEXT").run(),
-            this.db.prepare("ALTER TABLE memberships ADD COLUMN created_at TEXT").run(),
-            this.db.prepare("ALTER TABLE memberships ADD COLUMN updated_at TEXT").run(),
-            this.db.prepare("ALTER TABLE settings ADD COLUMN created_at TEXT").run(),
-            this.db.prepare("ALTER TABLE instance_hosts ADD COLUMN updated_at TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_challenges ADD COLUMN invitationId TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_users ADD COLUMN sourceDomain TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_users ADD COLUMN lastLoginDomain TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_security_rules ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
+            this.db.prepare("ALTER TABLE cs_access_keys ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
+            this.db.prepare("ALTER TABLE cs_audit_logs ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
+            this.db.prepare("ALTER TABLE cs_access_policies ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
+            this.db.prepare("ALTER TABLE cs_invitations ADD COLUMN instance_did TEXT DEFAULT NULL").run(),
+            this.db.prepare("ALTER TABLE cs_connected_accounts ADD COLUMN createdAt TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_connected_accounts ADD COLUMN updatedAt TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_memberships ADD COLUMN created_at TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_memberships ADD COLUMN updated_at TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_settings ADD COLUMN created_at TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_instance_hosts ADD COLUMN updated_at TEXT").run(),
             // Phase 3: createdBy/updatedBy audit columns
-            this.db.prepare("ALTER TABLE users ADD COLUMN createdBy TEXT").run(),
-            this.db.prepare("ALTER TABLE users ADD COLUMN updatedBy TEXT").run(),
-            this.db.prepare("ALTER TABLE connected_accounts ADD COLUMN createdBy TEXT").run(),
-            this.db.prepare("ALTER TABLE connected_accounts ADD COLUMN updatedBy TEXT").run(),
-            this.db.prepare("ALTER TABLE invitations ADD COLUMN createdBy TEXT").run(),
-            this.db.prepare("ALTER TABLE invitations ADD COLUMN updatedBy TEXT").run(),
-            this.db.prepare("ALTER TABLE access_policies ADD COLUMN createdBy TEXT").run(),
-            this.db.prepare("ALTER TABLE access_policies ADD COLUMN updatedBy TEXT").run(),
-            this.db.prepare("ALTER TABLE security_rules ADD COLUMN createdBy TEXT").run(),
-            this.db.prepare("ALTER TABLE security_rules ADD COLUMN updatedBy TEXT").run(),
-            this.db.prepare("ALTER TABLE access_keys ADD COLUMN updatedBy TEXT").run(),
-            this.db.prepare("ALTER TABLE memberships ADD COLUMN created_by TEXT").run(),
-            this.db.prepare("ALTER TABLE memberships ADD COLUMN updated_by TEXT").run(),
-            this.db.prepare("ALTER TABLE settings ADD COLUMN created_by TEXT").run(),
-            this.db.prepare("ALTER TABLE settings ADD COLUMN updated_by TEXT").run(),
-            this.db.prepare("ALTER TABLE instance_hosts ADD COLUMN created_by TEXT").run(),
-            this.db.prepare("ALTER TABLE instance_hosts ADD COLUMN updated_by TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_users ADD COLUMN createdBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_users ADD COLUMN updatedBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_connected_accounts ADD COLUMN createdBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_connected_accounts ADD COLUMN updatedBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_invitations ADD COLUMN createdBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_invitations ADD COLUMN updatedBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_access_policies ADD COLUMN createdBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_access_policies ADD COLUMN updatedBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_security_rules ADD COLUMN createdBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_security_rules ADD COLUMN updatedBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_access_keys ADD COLUMN updatedBy TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_memberships ADD COLUMN created_by TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_memberships ADD COLUMN updated_by TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_settings ADD COLUMN created_by TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_settings ADD COLUMN updated_by TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_instance_hosts ADD COLUMN created_by TEXT").run(),
+            this.db.prepare("ALTER TABLE cs_instance_hosts ADD COLUMN updated_by TEXT").run(),
         ]);
         // Batch 2: additional tables + indexes (all CREATE IF NOT EXISTS, safe in one batch)
         await this.db.batch([
             this.db.prepare(`
-        CREATE TABLE IF NOT EXISTS memberships (
+        CREATE TABLE IF NOT EXISTS cs_memberships (
           user_did TEXT NOT NULL,
           instance_did TEXT NOT NULL,
           role TEXT NOT NULL DEFAULT 'guest',
@@ -303,8 +341,8 @@ export class D1Store {
           PRIMARY KEY (user_did, instance_did)
         )
       `),
-            this.db.prepare(`CREATE INDEX IF NOT EXISTS idx_memberships_instance ON memberships(instance_did)`),
-            this.db.prepare(`CREATE TABLE IF NOT EXISTS settings (
+            this.db.prepare(`CREATE INDEX IF NOT EXISTS idx_memberships_instance ON cs_memberships(instance_did)`),
+            this.db.prepare(`CREATE TABLE IF NOT EXISTS cs_settings (
           instance_did TEXT NOT NULL,
           key TEXT NOT NULL,
           value TEXT,
@@ -314,7 +352,7 @@ export class D1Store {
           updated_by TEXT,
           PRIMARY KEY (instance_did, key)
         )`),
-            this.db.prepare(`CREATE TABLE IF NOT EXISTS verify_codes (
+            this.db.prepare(`CREATE TABLE IF NOT EXISTS cs_verify_codes (
           id INTEGER PRIMARY KEY AUTOINCREMENT,
           code TEXT NOT NULL UNIQUE,
           subject TEXT NOT NULL,
@@ -325,15 +363,15 @@ export class D1Store {
           sent_at TEXT,
           created_at TEXT DEFAULT (datetime('now'))
         )`),
-            this.db.prepare("CREATE INDEX IF NOT EXISTS idx_vc_subject ON verify_codes(subject)"),
-            this.db.prepare(`CREATE TABLE IF NOT EXISTS login_tickets (
+            this.db.prepare("CREATE INDEX IF NOT EXISTS idx_vc_subject ON cs_verify_codes(subject)"),
+            this.db.prepare(`CREATE TABLE IF NOT EXISTS cs_login_tickets (
           ticket TEXT PRIMARY KEY,
           did TEXT NOT NULL,
           target_origin TEXT,
           created_at TEXT DEFAULT (datetime('now')),
           expires_at TEXT NOT NULL
         )`),
-            this.db.prepare(`CREATE TABLE IF NOT EXISTS access_key_sessions (
+            this.db.prepare(`CREATE TABLE IF NOT EXISTS cs_access_key_sessions (
           id TEXT PRIMARY KEY,
           challenge TEXT NOT NULL,
           status TEXT DEFAULT 'pending',
@@ -343,7 +381,7 @@ export class D1Store {
           created_at TEXT DEFAULT (datetime('now')),
           expires_at TEXT NOT NULL
         )`),
-            this.db.prepare(`CREATE TABLE IF NOT EXISTS instance_hosts (
+            this.db.prepare(`CREATE TABLE IF NOT EXISTS cs_instance_hosts (
           host TEXT PRIMARY KEY,
           instance_did TEXT NOT NULL,
           created_at TEXT DEFAULT (datetime('now')),
@@ -351,7 +389,7 @@ export class D1Store {
           created_by TEXT,
           updated_by TEXT
         )`),
-            this.db.prepare("CREATE INDEX IF NOT EXISTS idx_instance_hosts_instance ON instance_hosts(instance_did)"),
+            this.db.prepare("CREATE INDEX IF NOT EXISTS idx_instance_hosts_instance ON cs_instance_hosts(instance_did)"),
         ]);
         // Seed built-in access policies + default rule (idempotent via INSERT OR IGNORE)
         await this.ensureBuiltinPolicies();
@@ -365,13 +403,13 @@ export class D1Store {
     // ─── Challenge operations ──────────────────────────────────────────────
     async saveChallenge(id, challenge, invitationId) {
         await this.db
-            .prepare("INSERT OR REPLACE INTO challenges (id, challenge, invitationId) VALUES (?, ?, ?)")
+            .prepare("INSERT OR REPLACE INTO cs_challenges (id, challenge, invitationId) VALUES (?, ?, ?)")
             .bind(id, challenge, invitationId ?? null)
             .run();
     }
     async getChallenge(id) {
         const row = await this.db
-            .prepare("SELECT challenge, invitationId FROM challenges WHERE id = ?")
+            .prepare("SELECT challenge, invitationId FROM cs_challenges WHERE id = ?")
             .bind(id)
             .first();
         return row ?? null;
@@ -379,25 +417,25 @@ export class D1Store {
     /** Find challenge by its value (not by ID). Returns id + challenge + invitationId. */
     async getChallengeByValue(challenge) {
         const row = await this.db
-            .prepare("SELECT id, challenge, invitationId FROM challenges WHERE challenge = ?")
+            .prepare("SELECT id, challenge, invitationId FROM cs_challenges WHERE challenge = ?")
             .bind(challenge)
             .first();
         return row ?? null;
     }
     async deleteChallenge(id) {
-        await this.db.prepare("DELETE FROM challenges WHERE id = ?").bind(id).run();
+        await this.db.prepare("DELETE FROM cs_challenges WHERE id = ?").bind(id).run();
     }
     async purgeExpiredChallenges() {
         // Purge challenges older than 5 minutes
         await this.db
-            .prepare("DELETE FROM challenges WHERE createdAt < datetime('now', '-5 minutes')")
+            .prepare("DELETE FROM cs_challenges WHERE createdAt < datetime('now', '-5 minutes')")
             .run();
     }
     async isRegistrationOpen(instanceDid) {
         // Check instance-specific default rule first, fall back to global
         if (instanceDid) {
             const instanceRule = await this.db
-                .prepare("SELECT accessPolicyId FROM security_rules WHERE id = ?")
+                .prepare("SELECT accessPolicyId FROM cs_security_rules WHERE id = ?")
                 .bind(`default-${instanceDid}`)
                 .first();
             if (instanceRule) {
@@ -408,7 +446,7 @@ export class D1Store {
         }
         // Global fallback
         const row = await this.db
-            .prepare("SELECT accessPolicyId FROM security_rules WHERE id = 'default'")
+            .prepare("SELECT accessPolicyId FROM cs_security_rules WHERE id = 'default'")
             .first();
         return row?.accessPolicyId === "public";
     }
@@ -419,34 +457,34 @@ export class D1Store {
         // admin代建 passes createdBy = caller.did explicitly.
         const actor = params.createdBy ?? params.did;
         await this.db
-            .prepare(`INSERT INTO users (did, pk, fullName, email, avatar, sourceProvider, emailVerified, firstLoginAt, lastLoginAt, lastLoginIp, sourceDomain, lastLoginDomain, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT INTO cs_users (did, pk, fullName, email, avatar, sourceProvider, emailVerified, firstLoginAt, lastLoginAt, lastLoginIp, sourceDomain, lastLoginDomain, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
             .bind(params.did, params.pk, params.fullName ?? null, params.email ?? null, params.avatar ?? null, params.sourceProvider, params.emailVerified ?? 0, now, now, params.ip ?? null, params.domain ?? null, params.domain ?? null, now, now, actor, actor)
             .run();
     }
     async getUserByDid(did) {
-        return this.db.prepare("SELECT * FROM users WHERE did = ?").bind(did).first();
+        return this.db.prepare("SELECT * FROM cs_users WHERE did = ?").bind(did).first();
     }
     async getUserByEmail(email) {
-        return this.db.prepare("SELECT * FROM users WHERE email = ? LIMIT 1").bind(email).first();
+        return this.db.prepare("SELECT * FROM cs_users WHERE email = ? LIMIT 1").bind(email).first();
     }
     async updateLastLogin(did, ip, domain) {
         const now = new Date().toISOString();
         await this.db
-            .prepare("UPDATE users SET lastLoginAt = ?, lastLoginIp = ?, lastLoginDomain = ?, updatedAt = ? WHERE did = ?")
+            .prepare("UPDATE cs_users SET lastLoginAt = ?, lastLoginIp = ?, lastLoginDomain = ?, updatedAt = ? WHERE did = ?")
             .bind(now, ip ?? null, domain ?? null, now, did)
             .run();
     }
     async incrementPasskeyCount(did) {
         await this.db
-            .prepare("UPDATE users SET passkeyCount = passkeyCount + 1, updatedAt = ? WHERE did = ?")
+            .prepare("UPDATE cs_users SET passkeyCount = passkeyCount + 1, updatedAt = ? WHERE did = ?")
             .bind(new Date().toISOString(), did)
             .run();
     }
     // ─── Team: User queries ────────────────────────────────────────────────
     async getUserCount() {
         const row = await this.db
-            .prepare("SELECT COUNT(*) as count FROM users")
+            .prepare("SELECT COUNT(*) as count FROM cs_users")
             .first();
         return Number(row?.count ?? 0);
     }
@@ -487,14 +525,14 @@ export class D1Store {
         const orderBy = `ORDER BY ${sortExpr} ${direction}, u.did ASC`;
         // Batch COUNT + SELECT into one D1 roundtrip
         const [countResult, dataResult] = await this.db.batch([
-            this.db.prepare(`SELECT COUNT(*) as count FROM users u ${where}`).bind(...params),
+            this.db.prepare(`SELECT COUNT(*) as count FROM cs_users u ${where}`).bind(...params),
             this.db
                 .prepare(`SELECT u.did, u.fullName, u.email, u.avatar, u.role, u.approved,
                 COALESCE(u.createdAt, u.firstLoginAt) as createdAt,
                 u.lastLoginAt, u.passkeyCount, u.sourceDomain, u.lastLoginDomain, u.sourceProvider, u.inviter,
                 inv.fullName as inviterName
-         FROM users u
-         LEFT JOIN users inv ON u.inviter = inv.did
+         FROM cs_users u
+         LEFT JOIN cs_users inv ON u.inviter = inv.did
          ${where}
          ${orderBy}
          LIMIT ? OFFSET ?`)
@@ -508,8 +546,8 @@ export class D1Store {
         const row = await this.db
             .prepare(`SELECT u.did, u.fullName, u.email, u.avatar, u.role, u.approved, u.createdAt, u.lastLoginAt, u.passkeyCount, u.sourceDomain, u.lastLoginDomain, u.sourceProvider, u.inviter, u.emailVerified,
                 inv.fullName as inviterName
-         FROM users u
-         LEFT JOIN users inv ON u.inviter = inv.did
+         FROM cs_users u
+         LEFT JOIN cs_users inv ON u.inviter = inv.did
          WHERE u.did = ?`)
             .bind(did)
             .first();
@@ -517,13 +555,13 @@ export class D1Store {
     }
     async updateUserRole(did, role, actor) {
         await this.db
-            .prepare("UPDATE users SET role = ?, updatedAt = ?, updatedBy = ? WHERE did = ?")
+            .prepare("UPDATE cs_users SET role = ?, updatedAt = ?, updatedBy = ? WHERE did = ?")
             .bind(role, new Date().toISOString(), actor, did)
             .run();
     }
     async updateUserApproval(did, approved, actor) {
         await this.db
-            .prepare("UPDATE users SET approved = ?, updatedAt = ?, updatedBy = ? WHERE did = ?")
+            .prepare("UPDATE cs_users SET approved = ?, updatedAt = ?, updatedBy = ? WHERE did = ?")
             .bind(approved ? 1 : 0, new Date().toISOString(), actor, did)
             .run();
     }
@@ -554,20 +592,20 @@ export class D1Store {
         params.push(actor);
         params.push(did);
         await this.db
-            .prepare(`UPDATE users SET ${sets.join(", ")} WHERE did = ?`)
+            .prepare(`UPDATE cs_users SET ${sets.join(", ")} WHERE did = ?`)
             .bind(...params)
             .run();
     }
     async removeUser(did) {
         // Delete connected accounts first, then user
         await this.db.batch([
-            this.db.prepare("DELETE FROM connected_accounts WHERE userDid = ?").bind(did),
-            this.db.prepare("DELETE FROM users WHERE did = ?").bind(did),
+            this.db.prepare("DELETE FROM cs_connected_accounts WHERE userDid = ?").bind(did),
+            this.db.prepare("DELETE FROM cs_users WHERE did = ?").bind(did),
         ]);
     }
     async setUserInviter(did, inviterDid, actor) {
         await this.db
-            .prepare("UPDATE users SET inviter = ?, updatedAt = ?, updatedBy = ? WHERE did = ? AND inviter IS NULL")
+            .prepare("UPDATE cs_users SET inviter = ?, updatedAt = ?, updatedBy = ? WHERE did = ? AND inviter IS NULL")
             .bind(inviterDid, new Date().toISOString(), actor, did)
             .run();
     }
@@ -579,10 +617,10 @@ export class D1Store {
         const now = new Date().toISOString();
         await this.db.batch([
             this.db
-                .prepare("UPDATE users SET role = 'owner', updatedAt = ?, updatedBy = ? WHERE did = ?")
+                .prepare("UPDATE cs_users SET role = 'owner', updatedAt = ?, updatedBy = ? WHERE did = ?")
                 .bind(now, actor, newOwnerDid),
             this.db
-                .prepare("UPDATE users SET role = 'admin', updatedAt = ?, updatedBy = ? WHERE did = ?")
+                .prepare("UPDATE cs_users SET role = 'admin', updatedAt = ?, updatedBy = ? WHERE did = ?")
                 .bind(now, actor, currentOwnerDid),
         ]);
     }
@@ -596,7 +634,7 @@ export class D1Store {
         // Default actor = inviter (the invitation's creator) per plan §五A.
         const actor = input.actor ?? input.inviterDid;
         await this.db
-            .prepare(`INSERT INTO invitations (id, teamDid, role, remark, inviterDid, expireAt, maxUses, useCount, status, instance_did, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT INTO cs_invitations (id, teamDid, role, remark, inviterDid, expireAt, maxUses, useCount, status, instance_did, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, ?, ?, ?, ?, ?, ?, 0, 'active', ?, ?, ?, ?, ?)`)
             .bind(id, input.teamDid, input.role, input.remark ?? "", input.inviterDid, expireAt, maxUses, input.instanceDid ?? null, now, now, actor, actor)
             .run();
@@ -619,7 +657,7 @@ export class D1Store {
     }
     async getInvitation(id) {
         return this.db
-            .prepare("SELECT * FROM invitations WHERE id = ?")
+            .prepare("SELECT * FROM cs_invitations WHERE id = ?")
             .bind(id)
             .first();
     }
@@ -637,11 +675,11 @@ export class D1Store {
         const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
         // Batch COUNT + SELECT into one D1 roundtrip
         const [countResult, dataResult] = await this.db.batch([
-            this.db.prepare(`SELECT COUNT(*) as count FROM invitations i ${where}`).bind(...params),
+            this.db.prepare(`SELECT COUNT(*) as count FROM cs_invitations i ${where}`).bind(...params),
             this.db
                 .prepare(`SELECT i.*, u.fullName as inviterName
-         FROM invitations i
-         LEFT JOIN users u ON i.inviterDid = u.did
+         FROM cs_invitations i
+         LEFT JOIN cs_users u ON i.inviterDid = u.did
          ${where}
          ORDER BY i.createdAt DESC
          LIMIT ? OFFSET ?`)
@@ -656,7 +694,7 @@ export class D1Store {
      */
     async incrementInvitationUseCount(id) {
         const result = await this.db
-            .prepare(`UPDATE invitations SET useCount = useCount + 1, updatedAt = ?
+            .prepare(`UPDATE cs_invitations SET useCount = useCount + 1, updatedAt = ?
          WHERE id = ? AND useCount < maxUses AND status = 'active'`)
             .bind(new Date().toISOString(), id)
             .run();
@@ -664,23 +702,23 @@ export class D1Store {
     }
     async updateInvitationStatus(id, status, actor) {
         await this.db
-            .prepare("UPDATE invitations SET status = ?, updatedAt = ?, updatedBy = ? WHERE id = ?")
+            .prepare("UPDATE cs_invitations SET status = ?, updatedAt = ?, updatedBy = ? WHERE id = ?")
             .bind(status, new Date().toISOString(), actor, id)
             .run();
     }
     async deleteInvitation(id) {
-        await this.db.prepare("DELETE FROM invitations WHERE id = ?").bind(id).run();
+        await this.db.prepare("DELETE FROM cs_invitations WHERE id = ?").bind(id).run();
     }
     async purgeExpiredInvitations() {
         await this.db
-            .prepare("UPDATE invitations SET status = 'expired', updatedAt = ? WHERE status = 'active' AND expireAt < datetime('now')")
+            .prepare("UPDATE cs_invitations SET status = 'expired', updatedAt = ? WHERE status = 'active' AND expireAt < datetime('now')")
             .bind(new Date().toISOString())
             .run();
     }
     // ─── Team: Audit logs ─────────────────────────────────────────────────
     async createAuditLog(input) {
         await this.db
-            .prepare(`INSERT INTO audit_logs (action, operatorDid, targetDid, metadata, ip, instance_did, createdAt)
+            .prepare(`INSERT INTO cs_audit_logs (action, operatorDid, targetDid, metadata, ip, instance_did, createdAt)
          VALUES (?, ?, ?, ?, ?, ?, ?)`)
             .bind(input.action, input.operatorDid, input.targetDid ?? null, JSON.stringify(input.metadata ?? {}), input.ip ?? null, input.instanceDid ?? null, new Date().toISOString())
             .run();
@@ -731,12 +769,12 @@ export class D1Store {
         const offset = (opts.page - 1) * opts.pageSize;
         // Batch COUNT + SELECT into one D1 roundtrip
         const [countResult, dataResult] = await this.db.batch([
-            this.db.prepare(`SELECT COUNT(*) as count FROM audit_logs a ${where}`).bind(...params),
+            this.db.prepare(`SELECT COUNT(*) as count FROM cs_audit_logs a ${where}`).bind(...params),
             this.db
                 .prepare(`SELECT a.*, op.fullName as operatorName, op.role as operatorRole, tgt.fullName as targetName
-         FROM audit_logs a
-         LEFT JOIN users op ON a.operatorDid = op.did
-         LEFT JOIN users tgt ON a.targetDid = tgt.did
+         FROM cs_audit_logs a
+         LEFT JOIN cs_users op ON a.operatorDid = op.did
+         LEFT JOIN cs_users tgt ON a.targetDid = tgt.did
          ${where}
          ORDER BY a.createdAt DESC
          LIMIT ? OFFSET ?`)
@@ -749,9 +787,9 @@ export class D1Store {
     async getAuditLogById(id, instanceDid) {
         return this.db
             .prepare(`SELECT a.*, op.fullName as operatorName, op.role as operatorRole, tgt.fullName as targetName
-         FROM audit_logs a
-         LEFT JOIN users op ON a.operatorDid = op.did
-         LEFT JOIN users tgt ON a.targetDid = tgt.did
+         FROM cs_audit_logs a
+         LEFT JOIN cs_users op ON a.operatorDid = op.did
+         LEFT JOIN cs_users tgt ON a.targetDid = tgt.did
          WHERE a.id = ? AND a.instance_did = ?`)
             .bind(id, instanceDid)
             .first();
@@ -762,7 +800,7 @@ export class D1Store {
         // Self-serve account link: default actor = the user's own DID (plan §二).
         const actor = params.actor ?? params.userDid;
         await this.db
-            .prepare(`INSERT INTO connected_accounts (did, pk, userDid, provider, id, extra, userInfo, firstLoginAt, lastLoginAt, lastLoginIp, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT INTO cs_connected_accounts (did, pk, userDid, provider, id, extra, userInfo, firstLoginAt, lastLoginAt, lastLoginIp, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
             .bind(params.did, params.pk, params.userDid, params.provider, params.id, params.extra, params.userInfo, now, now, params.ip ?? null, now, now, actor, actor)
             .run();
@@ -775,49 +813,49 @@ export class D1Store {
             .prepare(
         // Bind all timestamps as ISO `?` params (consistent with createConnectedAccount;
         // avoids mixing `datetime('now')` literals with `?` placeholders).
-        `INSERT INTO connected_accounts (did, pk, userDid, provider, id, userInfo, firstLoginAt, lastLoginAt, createdAt, updatedAt, createdBy, updatedBy)
+        `INSERT INTO cs_connected_accounts (did, pk, userDid, provider, id, userInfo, firstLoginAt, lastLoginAt, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT (did) DO UPDATE SET
            pk = excluded.pk, lastLoginAt = excluded.lastLoginAt, updatedAt = excluded.updatedAt,
-           userInfo = COALESCE(excluded.userInfo, connected_accounts.userInfo)`)
+           userInfo = COALESCE(excluded.userInfo, cs_connected_accounts.userInfo)`)
             .bind(account.did, account.pk, account.userDid, account.provider, account.id, account.userInfo || null, now, now, now, now, actor, actor)
             .run();
     }
     async getConnectedAccountById(credentialId) {
         return this.db
-            .prepare("SELECT * FROM connected_accounts WHERE id = ?")
+            .prepare("SELECT * FROM cs_connected_accounts WHERE id = ?")
             .bind(credentialId)
             .first();
     }
     async getConnectedAccountByDid(did) {
         return this.db
-            .prepare("SELECT * FROM connected_accounts WHERE did = ?")
+            .prepare("SELECT * FROM cs_connected_accounts WHERE did = ?")
             .bind(did)
             .first();
     }
     async updateCounter(did, counter) {
         const now = new Date().toISOString();
         await this.db
-            .prepare("UPDATE connected_accounts SET counter = ?, lastLoginAt = ?, updatedAt = ? WHERE did = ?")
+            .prepare("UPDATE cs_connected_accounts SET counter = ?, lastLoginAt = ?, updatedAt = ? WHERE did = ?")
             .bind(counter, now, now, did)
             .run();
     }
     async getConnectedAccountsByUserDid(userDid) {
         const rows = await this.db
-            .prepare("SELECT * FROM connected_accounts WHERE userDid = ?")
+            .prepare("SELECT * FROM cs_connected_accounts WHERE userDid = ?")
             .bind(userDid)
             .all();
         return rows.results ?? [];
     }
     async getConnectedAccountByProviderAndUser(provider, userDid) {
         return this.db
-            .prepare("SELECT * FROM connected_accounts WHERE provider = ? AND userDid = ?")
+            .prepare("SELECT * FROM cs_connected_accounts WHERE provider = ? AND userDid = ?")
             .bind(provider, userDid)
             .first();
     }
     async getConnectedAccountsByProviderAndUser(provider, userDid) {
         const rows = await this.db
-            .prepare("SELECT * FROM connected_accounts WHERE provider = ? AND userDid = ?")
+            .prepare("SELECT * FROM cs_connected_accounts WHERE provider = ? AND userDid = ?")
             .bind(provider, userDid)
             .all();
         return rows.results ?? [];
@@ -826,33 +864,33 @@ export class D1Store {
         // Single query: direct DID match OR indirect via connected_accounts.
         // UNION ALL + LIMIT 1 ensures direct match is preferred.
         return this.db
-            .prepare(`SELECT u.* FROM users u WHERE u.did = ?
+            .prepare(`SELECT u.* FROM cs_users u WHERE u.did = ?
          UNION ALL
-         SELECT u.* FROM connected_accounts ca JOIN users u ON ca.userDid = u.did WHERE ca.did = ?
+         SELECT u.* FROM cs_connected_accounts ca JOIN cs_users u ON ca.userDid = u.did WHERE ca.did = ?
          LIMIT 1`)
             .bind(did, did)
             .first();
     }
     async decrementPasskeyCount(did) {
         await this.db
-            .prepare("UPDATE users SET passkeyCount = MAX(passkeyCount - 1, 0), updatedAt = ? WHERE did = ?")
+            .prepare("UPDATE cs_users SET passkeyCount = MAX(passkeyCount - 1, 0), updatedAt = ? WHERE did = ?")
             .bind(new Date().toISOString(), did)
             .run();
     }
     async updateConnectedAccountName(did, name, actor) {
         await this.db
-            .prepare("UPDATE connected_accounts SET userInfo = ?, updatedAt = ?, updatedBy = ? WHERE did = ?")
+            .prepare("UPDATE cs_connected_accounts SET userInfo = ?, updatedAt = ?, updatedBy = ? WHERE did = ?")
             .bind(JSON.stringify({ name }), new Date().toISOString(), actor, did)
             .run();
     }
     async deleteConnectedAccount(did) {
-        await this.db.prepare("DELETE FROM connected_accounts WHERE did = ?").bind(did).run();
+        await this.db.prepare("DELETE FROM cs_connected_accounts WHERE did = ?").bind(did).run();
     }
     // ─── Access keys ────────────────────────────────────────────────────────
     async createAccessKey(input) {
         const now = new Date().toISOString();
         await this.db
-            .prepare(`INSERT INTO access_keys (accessKeyId, accessKeyPublic, role, remark, createdBy, expireAt, instance_did, createdAt, updatedAt, updatedBy)
+            .prepare(`INSERT INTO cs_access_keys (accessKeyId, accessKeyPublic, role, remark, createdBy, expireAt, instance_did, createdAt, updatedAt, updatedBy)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
             .bind(input.accessKeyId, input.accessKeyPublic, input.role, input.remark ?? "", input.createdBy, input.expireAt ?? null, input.instanceDid ?? null, now, now, input.createdBy)
             .run();
@@ -873,8 +911,8 @@ export class D1Store {
     async getAccessKeyById(accessKeyId) {
         const row = await this.db
             .prepare(`SELECT k.*, u.fullName as createdByName
-         FROM access_keys k
-         LEFT JOIN users u ON k.createdBy = u.did
+         FROM cs_access_keys k
+         LEFT JOIN cs_users u ON k.createdBy = u.did
          WHERE k.accessKeyId = ?`)
             .bind(accessKeyId)
             .first();
@@ -906,11 +944,11 @@ export class D1Store {
         const offset = (opts.page - 1) * opts.pageSize;
         // Batch COUNT + SELECT into one D1 roundtrip
         const [countResult, dataResult] = await this.db.batch([
-            this.db.prepare(`SELECT COUNT(*) as count FROM access_keys k ${where}`).bind(...params),
+            this.db.prepare(`SELECT COUNT(*) as count FROM cs_access_keys k ${where}`).bind(...params),
             this.db
                 .prepare(`SELECT k.*, u.fullName as createdByName
-         FROM access_keys k
-         LEFT JOIN users u ON k.createdBy = u.did
+         FROM cs_access_keys k
+         LEFT JOIN cs_users u ON k.createdBy = u.did
          ${where}
          ORDER BY k.createdAt DESC
          LIMIT ? OFFSET ?`)
@@ -948,18 +986,18 @@ export class D1Store {
             params.push(actor);
             params.push(accessKeyId);
             await this.db
-                .prepare(`UPDATE access_keys SET ${sets.join(", ")} WHERE accessKeyId = ?`)
+                .prepare(`UPDATE cs_access_keys SET ${sets.join(", ")} WHERE accessKeyId = ?`)
                 .bind(...params)
                 .run();
         }
         return this.getAccessKeyById(accessKeyId);
     }
     async deleteAccessKey(accessKeyId) {
-        await this.db.prepare("DELETE FROM access_keys WHERE accessKeyId = ?").bind(accessKeyId).run();
+        await this.db.prepare("DELETE FROM cs_access_keys WHERE accessKeyId = ?").bind(accessKeyId).run();
     }
     async refreshAccessKeyLastUsed(accessKeyId) {
         await this.db
-            .prepare("UPDATE access_keys SET lastUsedAt = ? WHERE accessKeyId = ?")
+            .prepare("UPDATE cs_access_keys SET lastUsedAt = ? WHERE accessKeyId = ?")
             .bind(new Date().toISOString(), accessKeyId)
             .run();
     }
@@ -997,7 +1035,7 @@ export class D1Store {
         ];
         const now = new Date().toISOString();
         await this.db.batch(policies.map((p) => this.db
-            .prepare(`INSERT OR IGNORE INTO access_policies (id, name, description, roles, reverse, isProtected, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT OR IGNORE INTO cs_access_policies (id, name, description, roles, reverse, isProtected, createdAt, updatedAt, createdBy, updatedBy)
              VALUES (?, ?, ?, ?, ?, 1, ?, ?, 'system', 'system')`)
             .bind(p.id, p.name, p.description, p.roles, p.reverse, now, now)));
         invalidateRulesCache();
@@ -1005,7 +1043,7 @@ export class D1Store {
     async ensureDefaultRule() {
         const now = new Date().toISOString();
         await this.db
-            .prepare(`INSERT OR IGNORE INTO security_rules (id, pathPattern, priority, accessPolicyId, enabled, remark, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT OR IGNORE INTO cs_security_rules (id, pathPattern, priority, accessPolicyId, enabled, remark, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'system', 'system')`)
             .bind("default", "*", -1, "public", 1, "Default fallback rule", now, now)
             .run();
@@ -1013,7 +1051,7 @@ export class D1Store {
     }
     // ─── Access policies: CRUD ─────────────────────────────────────────────
     async getAccessPolicies(instanceDid) {
-        let sql = "SELECT * FROM access_policies";
+        let sql = "SELECT * FROM cs_access_policies";
         const params = [];
         if (instanceDid !== undefined) {
             sql += " WHERE instance_did = ?";
@@ -1032,7 +1070,7 @@ export class D1Store {
             return [];
         // Batch-fetch all rule counts in one D1 roundtrip (instead of N+1 individual queries)
         const countResults = await this.db.batch(policies.map((p) => this.db
-            .prepare("SELECT COUNT(*) as count FROM security_rules WHERE accessPolicyId = ?")
+            .prepare("SELECT COUNT(*) as count FROM cs_security_rules WHERE accessPolicyId = ?")
             .bind(p.id)));
         return policies.map((p, i) => {
             const ruleCount = countResults[i]?.results?.[0]?.count ?? 0;
@@ -1055,9 +1093,9 @@ export class D1Store {
     async getAccessPolicy(id) {
         // Batch policy + rule count into one D1 roundtrip
         const [policyResult, countResult] = await this.db.batch([
-            this.db.prepare("SELECT * FROM access_policies WHERE id = ?").bind(id),
+            this.db.prepare("SELECT * FROM cs_access_policies WHERE id = ?").bind(id),
             this.db
-                .prepare("SELECT COUNT(*) as count FROM security_rules WHERE accessPolicyId = ?")
+                .prepare("SELECT COUNT(*) as count FROM cs_security_rules WHERE accessPolicyId = ?")
                 .bind(id),
         ]);
         const p = policyResult.results?.[0];
@@ -1084,7 +1122,7 @@ export class D1Store {
         const now = new Date().toISOString();
         const { roles: dbRoles, reverse } = await import("../access/access-policy.js").then((m) => m.accessTypeToDb(input.accessType, input.roles));
         await this.db
-            .prepare(`INSERT INTO access_policies (id, name, description, roles, reverse, isProtected, instance_did, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT INTO cs_access_policies (id, name, description, roles, reverse, isProtected, instance_did, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, ?, ?, ?, ?, 0, ?, ?, ?, ?, ?)`)
             .bind(id, input.name, input.description ?? "", dbRoles, reverse, input.instanceDid ?? null, now, now, actor, actor)
             .run();
@@ -1117,7 +1155,7 @@ export class D1Store {
             params.push(actor);
             params.push(id);
             await this.db
-                .prepare(`UPDATE access_policies SET ${sets.join(", ")} WHERE id = ?`)
+                .prepare(`UPDATE cs_access_policies SET ${sets.join(", ")} WHERE id = ?`)
                 .bind(...params)
                 .run();
         }
@@ -1125,12 +1163,12 @@ export class D1Store {
         return (await this.getAccessPolicy(id));
     }
     async deleteAccessPolicy(id) {
-        await this.db.prepare("DELETE FROM access_policies WHERE id = ?").bind(id).run();
+        await this.db.prepare("DELETE FROM cs_access_policies WHERE id = ?").bind(id).run();
         invalidateRulesCache();
     }
     async getAccessPolicyRuleCount(id) {
         const row = await this.db
-            .prepare("SELECT COUNT(*) as count FROM security_rules WHERE accessPolicyId = ?")
+            .prepare("SELECT COUNT(*) as count FROM cs_security_rules WHERE accessPolicyId = ?")
             .bind(id)
             .first();
         return Number(row?.count ?? 0);
@@ -1138,8 +1176,8 @@ export class D1Store {
     // ─── Security rules: CRUD ─────────────────────────────────────────────
     async getSecurityRules(instanceDid) {
         let sql = `SELECT r.*, p.name as accessPolicyName
-         FROM security_rules r
-         LEFT JOIN access_policies p ON r.accessPolicyId = p.id`;
+         FROM cs_security_rules r
+         LEFT JOIN cs_access_policies p ON r.accessPolicyId = p.id`;
         const params = [];
         if (instanceDid !== undefined) {
             sql += ` WHERE r.instance_did = ?`;
@@ -1169,8 +1207,8 @@ export class D1Store {
     async getSecurityRule(id) {
         const r = await this.db
             .prepare(`SELECT r.*, p.name as accessPolicyName
-         FROM security_rules r
-         LEFT JOIN access_policies p ON r.accessPolicyId = p.id
+         FROM cs_security_rules r
+         LEFT JOIN cs_access_policies p ON r.accessPolicyId = p.id
          WHERE r.id = ?`)
             .bind(id)
             .first();
@@ -1193,7 +1231,7 @@ export class D1Store {
         const id = crypto.randomUUID();
         const now = new Date().toISOString();
         await this.db
-            .prepare(`INSERT INTO security_rules (id, pathPattern, priority, accessPolicyId, enabled, remark, instance_did, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT INTO cs_security_rules (id, pathPattern, priority, accessPolicyId, enabled, remark, instance_did, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?)`)
             .bind(id, input.pathPattern, input.priority ?? 0, input.accessPolicyId, input.remark ?? "", input.instanceDid ?? null, now, now, actor, actor)
             .run();
@@ -1231,7 +1269,7 @@ export class D1Store {
             params.push(actor);
             params.push(id);
             await this.db
-                .prepare(`UPDATE security_rules SET ${sets.join(", ")} WHERE id = ?`)
+                .prepare(`UPDATE cs_security_rules SET ${sets.join(", ")} WHERE id = ?`)
                 .bind(...params)
                 .run();
         }
@@ -1239,14 +1277,14 @@ export class D1Store {
         return (await this.getSecurityRule(id));
     }
     async deleteSecurityRule(id) {
-        await this.db.prepare("DELETE FROM security_rules WHERE id = ?").bind(id).run();
+        await this.db.prepare("DELETE FROM cs_security_rules WHERE id = ?").bind(id).run();
         invalidateRulesCache();
     }
     // ─── Membership operations ──────────────────────────────────────────────
     async createMembership(userDid, instanceDid, role, invitedBy, actor) {
         const now = new Date().toISOString();
         await this.db
-            .prepare(`INSERT OR IGNORE INTO memberships (user_did, instance_did, role, invited_by, created_at, updated_at, created_by, updated_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`)
+            .prepare(`INSERT OR IGNORE INTO cs_memberships (user_did, instance_did, role, invited_by, created_at, updated_at, created_by, updated_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`)
             .bind(userDid, instanceDid, role, invitedBy ?? null, now, now, actor, actor)
             .run();
         invalidateMembership(userDid, instanceDid);
@@ -1258,7 +1296,7 @@ export class D1Store {
             return cached.result;
         }
         const result = await this.db
-            .prepare("SELECT * FROM memberships WHERE user_did = ? AND instance_did = ?")
+            .prepare("SELECT * FROM cs_memberships WHERE user_did = ? AND instance_did = ?")
             .bind(userDid, instanceDid)
             .first();
         _membershipCache.set(cacheKey, { result: result ?? null, at: Date.now() });
@@ -1267,14 +1305,14 @@ export class D1Store {
     /** Get all instance DIDs where user has owner role (single query). */
     async getOwnerInstanceDids(userDid) {
         const { results } = await this.db
-            .prepare("SELECT instance_did FROM memberships WHERE user_did = ? AND role = 'owner'")
+            .prepare("SELECT instance_did FROM cs_memberships WHERE user_did = ? AND role = 'owner'")
             .bind(userDid)
             .all();
         return new Set((results ?? []).map((r) => r.instance_did));
     }
     async listMemberships(instanceDid) {
         const rows = await this.db
-            .prepare("SELECT * FROM memberships WHERE instance_did = ? ORDER BY joined_at ASC")
+            .prepare("SELECT * FROM cs_memberships WHERE instance_did = ? ORDER BY joined_at ASC")
             .bind(instanceDid)
             .all();
         return rows.results ?? [];
@@ -1284,8 +1322,8 @@ export class D1Store {
             .prepare(`SELECT m.user_did, m.instance_did, m.role, m.invited_by, m.joined_at,
                 u.fullName, u.email, u.avatar, COALESCE(u.approved, 1) as approved,
                 u.sourceProvider, u.sourceDomain, u.lastLoginDomain, u.createdAt
-         FROM memberships m
-         LEFT JOIN users u ON m.user_did = u.did
+         FROM cs_memberships m
+         LEFT JOIN cs_users u ON m.user_did = u.did
          WHERE m.instance_did = ?
          ORDER BY
            CASE m.role WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 WHEN 'member' THEN 2 ELSE 3 END,
@@ -1298,8 +1336,8 @@ export class D1Store {
         const rows = await this.db
             .prepare(`SELECT m.user_did, m.instance_did, m.role, m.joined_at,
                 u.fullName, u.email, u.sourceProvider, COALESCE(u.approved, 1) as approved
-         FROM memberships m
-         LEFT JOIN users u ON m.user_did = u.did
+         FROM cs_memberships m
+         LEFT JOIN cs_users u ON m.user_did = u.did
          ORDER BY m.instance_did, m.role, m.joined_at ASC`)
             .all();
         return rows.results ?? [];
@@ -1314,8 +1352,8 @@ export class D1Store {
                 CASE MIN(CASE m.role WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 WHEN 'member' THEN 2 ELSE 3 END)
                   WHEN 0 THEN 'owner' WHEN 1 THEN 'admin' WHEN 2 THEN 'member' ELSE 'guest' END as role,
                 json_group_array(json_object('instance_did', m.instance_did, 'role', m.role, 'joined_at', m.joined_at)) as instances_json
-         FROM memberships m
-         LEFT JOIN users u ON m.user_did = u.did
+         FROM cs_memberships m
+         LEFT JOIN cs_users u ON m.user_did = u.did
          GROUP BY m.user_did
          ORDER BY MIN(CASE m.role WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 WHEN 'member' THEN 2 ELSE 3 END) ASC,
                   MIN(m.joined_at) ASC`)
@@ -1324,26 +1362,26 @@ export class D1Store {
     }
     async updateMembershipRole(userDid, instanceDid, role, actor) {
         await this.db
-            .prepare("UPDATE memberships SET role = ?, updated_at = ?, updated_by = ? WHERE user_did = ? AND instance_did = ?")
+            .prepare("UPDATE cs_memberships SET role = ?, updated_at = ?, updated_by = ? WHERE user_did = ? AND instance_did = ?")
             .bind(role, new Date().toISOString(), actor, userDid, instanceDid)
             .run();
         invalidateMembership(userDid, instanceDid);
     }
     async deleteMembership(userDid, instanceDid) {
         await this.db
-            .prepare("DELETE FROM memberships WHERE user_did = ? AND instance_did = ?")
+            .prepare("DELETE FROM cs_memberships WHERE user_did = ? AND instance_did = ?")
             .bind(userDid, instanceDid)
             .run();
         invalidateMembership(userDid, instanceDid);
     }
     async deleteMembershipsByInstance(instanceDid) {
-        await this.db.prepare("DELETE FROM memberships WHERE instance_did = ?").bind(instanceDid).run();
+        await this.db.prepare("DELETE FROM cs_memberships WHERE instance_did = ?").bind(instanceDid).run();
         invalidateMembershipsByInstance(instanceDid);
     }
     // ─── Settings CRUD ─────────────────────────────────────────────────────
     async getSetting(instanceDid, key) {
         const row = await this.db
-            .prepare("SELECT value FROM settings WHERE instance_did = ? AND key = ?")
+            .prepare("SELECT value FROM cs_settings WHERE instance_did = ? AND key = ?")
             .bind(instanceDid, key)
             .first();
         return row?.value ?? null;
@@ -1351,7 +1389,7 @@ export class D1Store {
     async setSetting(instanceDid, key, value, actor) {
         try {
             await this.db
-                .prepare(`INSERT INTO settings (instance_did, key, value, updated_at, created_at, created_by, updated_by)
+                .prepare(`INSERT INTO cs_settings (instance_did, key, value, updated_at, created_at, created_by, updated_by)
            VALUES (?, ?, ?, datetime('now'), datetime('now'), ?, ?)
            ON CONFLICT(instance_did, key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at, updated_by = excluded.updated_by`)
                 .bind(instanceDid, key, value, actor, actor)
@@ -1362,7 +1400,7 @@ export class D1Store {
             const msg = err instanceof Error ? err.message : String(err);
             if (msg.includes("UNIQUE constraint")) {
                 await this.db
-                    .prepare(`UPDATE settings SET value = ?, updated_at = datetime('now'), updated_by = ? WHERE instance_did = ? AND key = ?`)
+                    .prepare(`UPDATE cs_settings SET value = ?, updated_at = datetime('now'), updated_by = ? WHERE instance_did = ? AND key = ?`)
                     .bind(value, actor, instanceDid, key)
                     .run();
             }
@@ -1373,14 +1411,14 @@ export class D1Store {
     }
     async listSettings(instanceDid) {
         const rows = await this.db
-            .prepare("SELECT key, value, updated_at FROM settings WHERE instance_did = ? ORDER BY key")
+            .prepare("SELECT key, value, updated_at FROM cs_settings WHERE instance_did = ? ORDER BY key")
             .bind(instanceDid)
             .all();
         return rows.results ?? [];
     }
     async deleteSetting(instanceDid, key) {
         await this.db
-            .prepare("DELETE FROM settings WHERE instance_did = ? AND key = ?")
+            .prepare("DELETE FROM cs_settings WHERE instance_did = ? AND key = ?")
             .bind(instanceDid, key)
             .run();
     }
@@ -1388,13 +1426,13 @@ export class D1Store {
     async batchDeleteSettings(entries) {
         if (entries.length === 0)
             return;
-        const stmts = entries.map(({ instanceDid, key }) => this.db.prepare("DELETE FROM settings WHERE instance_did = ? AND key = ?").bind(instanceDid, key));
+        const stmts = entries.map(({ instanceDid, key }) => this.db.prepare("DELETE FROM cs_settings WHERE instance_did = ? AND key = ?").bind(instanceDid, key));
         await this.db.batch(stmts);
     }
     async listSettingsByPrefix(instanceDid, keyPrefix) {
         await this.ensureSchema();
         const rows = await this.db
-            .prepare("SELECT key, value, updated_at FROM settings WHERE instance_did = ? AND key LIKE ? ORDER BY key")
+            .prepare("SELECT key, value, updated_at FROM cs_settings WHERE instance_did = ? AND key LIKE ? ORDER BY key")
             .bind(instanceDid, `${keyPrefix}%`)
             .all();
         return rows.results ?? [];
@@ -1403,7 +1441,7 @@ export class D1Store {
     async findSettingByKey(key) {
         await this.ensureSchema();
         const rows = await this.db
-            .prepare("SELECT instance_did, value FROM settings WHERE key = ? ORDER BY instance_did")
+            .prepare("SELECT instance_did, value FROM cs_settings WHERE key = ? ORDER BY instance_did")
             .bind(key)
             .all();
         return (rows.results ?? []).map((r) => ({ instanceDid: r.instance_did, value: r.value }));
@@ -1434,7 +1472,7 @@ export class D1Store {
         if (cached && Date.now() - cached.at < HOST_CACHE_TTL)
             return cached.instanceDid;
         const row = await this.db
-            .prepare("SELECT instance_did FROM instance_hosts WHERE host = ?")
+            .prepare("SELECT instance_did FROM cs_instance_hosts WHERE host = ?")
             .bind(h)
             .first();
         if (row)
@@ -1449,7 +1487,7 @@ export class D1Store {
         if (!h)
             return { ok: false, reason: "invalid" };
         const res = await this.db
-            .prepare("INSERT INTO instance_hosts (host, instance_did, updated_at, created_by, updated_by) VALUES (?, ?, datetime('now'), ?, ?) ON CONFLICT(host) DO NOTHING")
+            .prepare("INSERT INTO cs_instance_hosts (host, instance_did, updated_at, created_by, updated_by) VALUES (?, ?, datetime('now'), ?, ?) ON CONFLICT(host) DO NOTHING")
             .bind(h, instanceDid, actor, actor)
             .run();
         if ((res.meta?.changes ?? 0) > 0) {
@@ -1458,7 +1496,7 @@ export class D1Store {
         }
         // Row already existed — read committed value from D1 (not cache) to decide.
         const owner = await this.db
-            .prepare("SELECT instance_did FROM instance_hosts WHERE host = ?")
+            .prepare("SELECT instance_did FROM cs_instance_hosts WHERE host = ?")
             .bind(h)
             .first();
         if (owner?.instance_did === instanceDid)
@@ -1470,26 +1508,26 @@ export class D1Store {
         const h = this.normalizeHost(host);
         if (!h)
             return;
-        await this.db.prepare("DELETE FROM instance_hosts WHERE host = ?").bind(h).run();
+        await this.db.prepare("DELETE FROM cs_instance_hosts WHERE host = ?").bind(h).run();
         invalidateHostCache();
     }
     /** List all hosts bound to an instance (normalized form). */
     async listInstanceHosts(instanceDid) {
         const rows = await this.db
-            .prepare("SELECT host FROM instance_hosts WHERE instance_did = ? ORDER BY host")
+            .prepare("SELECT host FROM cs_instance_hosts WHERE instance_did = ? ORDER BY host")
             .bind(instanceDid)
             .all();
         return (rows.results ?? []).map((r) => r.host);
     }
     /** Delete all host bindings for an instance (used during instance removal). */
     async deleteInstanceHosts(instanceDid) {
-        await this.db.prepare("DELETE FROM instance_hosts WHERE instance_did = ?").bind(instanceDid).run();
+        await this.db.prepare("DELETE FROM cs_instance_hosts WHERE instance_did = ?").bind(instanceDid).run();
         invalidateHostCache();
     }
     // ─── Verify codes (Email Login) ────────────────────────────────────────
     async createVerifyCode(code, subject, purpose) {
         const result = await this.db
-            .prepare("INSERT INTO verify_codes (code, subject, purpose) VALUES (?, ?, ?)")
+            .prepare("INSERT INTO cs_verify_codes (code, subject, purpose) VALUES (?, ?, ?)")
             .bind(code, subject, purpose)
             .run();
         // D1 returns last_row_id in meta
@@ -1500,11 +1538,11 @@ export class D1Store {
         // then SELECT to retrieve data. batch() is transactional in D1.
         const [updateResult, selectResult] = await this.db.batch([
             this.db
-                .prepare(`UPDATE verify_codes SET verified = 1, verified_at = datetime('now')
+                .prepare(`UPDATE cs_verify_codes SET verified = 1, verified_at = datetime('now')
            WHERE code = ? AND verified = 0
            AND created_at > datetime('now', '-30 minutes')`)
                 .bind(code),
-            this.db.prepare("SELECT id, subject FROM verify_codes WHERE code = ?").bind(code),
+            this.db.prepare("SELECT id, subject FROM cs_verify_codes WHERE code = ?").bind(code),
         ]);
         if (!updateResult.meta?.changes)
             return null;
@@ -1512,7 +1550,7 @@ export class D1Store {
     }
     async isVerifyCodeSent(subject) {
         const row = await this.db
-            .prepare(`SELECT 1 FROM verify_codes
+            .prepare(`SELECT 1 FROM cs_verify_codes
          WHERE subject = ? AND sent = 1
          AND sent_at > datetime('now', '-1 minute')`)
             .bind(subject)
@@ -1521,46 +1559,46 @@ export class D1Store {
     }
     async markVerifyCodeSent(code) {
         await this.db
-            .prepare("UPDATE verify_codes SET sent = 1, sent_at = datetime('now') WHERE code = ?")
+            .prepare("UPDATE cs_verify_codes SET sent = 1, sent_at = datetime('now') WHERE code = ?")
             .bind(code)
             .run();
     }
     async purgeExpiredVerifyCodes() {
         await this.db
-            .prepare("DELETE FROM verify_codes WHERE created_at < datetime('now', '-1 hour')")
+            .prepare("DELETE FROM cs_verify_codes WHERE created_at < datetime('now', '-1 hour')")
             .run();
     }
     // ─── Login tickets (Federation) ────────────────────────────────────────
     async createLoginTicket(ticket, did, targetOrigin, ttlSeconds = 300) {
         await this.db
-            .prepare(`INSERT INTO login_tickets (ticket, did, target_origin, expires_at)
+            .prepare(`INSERT INTO cs_login_tickets (ticket, did, target_origin, expires_at)
          VALUES (?, ?, ?, datetime('now', '+' || ? || ' seconds'))`)
             .bind(ticket, did, targetOrigin || null, ttlSeconds)
             .run();
     }
     async getLoginTicket(ticket) {
         return this.db
-            .prepare(`SELECT ticket, did, target_origin FROM login_tickets
+            .prepare(`SELECT ticket, did, target_origin FROM cs_login_tickets
          WHERE ticket = ? AND expires_at > datetime('now')`)
             .bind(ticket)
             .first();
     }
     async deleteLoginTicket(ticket) {
-        await this.db.prepare("DELETE FROM login_tickets WHERE ticket = ?").bind(ticket).run();
+        await this.db.prepare("DELETE FROM cs_login_tickets WHERE ticket = ?").bind(ticket).run();
     }
     async purgeExpiredLoginTickets() {
-        await this.db.prepare("DELETE FROM login_tickets WHERE expires_at < datetime('now')").run();
+        await this.db.prepare("DELETE FROM cs_login_tickets WHERE expires_at < datetime('now')").run();
     }
     async deleteLoginTicketsByOrigin(origin) {
         await this.ensureSchema();
         await this.db
-            .prepare("DELETE FROM login_tickets WHERE target_origin = ?")
+            .prepare("DELETE FROM cs_login_tickets WHERE target_origin = ?")
             .bind(origin)
             .run();
     }
     async deleteAllLoginTickets() {
         await this.ensureSchema();
-        await this.db.prepare("DELETE FROM login_tickets").run();
+        await this.db.prepare("DELETE FROM cs_login_tickets").run();
     }
     // ─── Instance default rule seeding ──────────────────────────────────────
     async seedInstanceDefaults(instanceDid) {
@@ -1597,13 +1635,13 @@ export class D1Store {
             },
         ];
         await this.db.batch(policies.map((p) => this.db
-            .prepare(`INSERT OR IGNORE INTO access_policies (id, name, description, roles, reverse, isProtected, instance_did, createdAt, updatedAt, createdBy, updatedBy)
+            .prepare(`INSERT OR IGNORE INTO cs_access_policies (id, name, description, roles, reverse, isProtected, instance_did, createdAt, updatedAt, createdBy, updatedBy)
              VALUES (?, ?, ?, ?, ?, 1, ?, ?, ?, 'system', 'system')`)
             .bind(p.id, p.name, p.description, p.roles, p.reverse, instanceDid, now, now)));
         // Seed instance default rule referencing the instance-scoped public policy
         const ruleId = `default-${instanceDid}`;
         await this.db
-            .prepare(`INSERT OR IGNORE INTO security_rules
+            .prepare(`INSERT OR IGNORE INTO cs_security_rules
          (id, pathPattern, priority, accessPolicyId, enabled, remark, instance_did, createdAt, updatedAt, createdBy, updatedBy)
          VALUES (?, '*', 0, ?, 1, 'Instance default: public access', ?, ?, ?, 'system', 'system')`)
             .bind(ruleId, `public-${instanceDid}`, instanceDid, now, now)
@@ -1618,8 +1656,8 @@ export class D1Store {
         }
         const rows = await this.db
             .prepare(`SELECT r.id, r.pathPattern, r.priority, p.roles, p.reverse, r.enabled
-         FROM security_rules r
-         JOIN access_policies p ON r.accessPolicyId = p.id
+         FROM cs_security_rules r
+         JOIN cs_access_policies p ON r.accessPolicyId = p.id
          WHERE r.enabled = 1
            AND (r.instance_did = ?1 OR r.instance_did IS NULL)
            AND (p.instance_did = ?1 OR p.instance_did IS NULL)
@@ -1642,8 +1680,8 @@ export class D1Store {
         }
         const rows = await this.db
             .prepare(`SELECT r.id, r.pathPattern, r.priority, p.roles, p.reverse, r.enabled
-         FROM security_rules r
-         JOIN access_policies p ON r.accessPolicyId = p.id
+         FROM cs_security_rules r
+         JOIN cs_access_policies p ON r.accessPolicyId = p.id
          WHERE r.enabled = 1
          ORDER BY CASE WHEN r.id = 'default' THEN 1 ELSE 0 END, r.priority ASC`)
             .all();
@@ -1655,46 +1693,46 @@ export class D1Store {
     async createAccessKeySession(params) {
         const now = new Date().toISOString();
         await this.db
-            .prepare(`INSERT INTO access_key_sessions (id, challenge, status, access_key_id, access_key_secret_encrypted, source, created_at, expires_at)
+            .prepare(`INSERT INTO cs_access_key_sessions (id, challenge, status, access_key_id, access_key_secret_encrypted, source, created_at, expires_at)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?)`)
             .bind(params.id, params.challenge, "pending", null, null, params.source, now, params.expiresAt)
             .run();
     }
     async getAccessKeySession(id) {
         const row = await this.db
-            .prepare(`SELECT * FROM access_key_sessions WHERE id = ? AND expires_at > datetime('now')`)
+            .prepare(`SELECT * FROM cs_access_key_sessions WHERE id = ? AND expires_at > datetime('now')`)
             .bind(id)
             .first();
         return row ?? null;
     }
     async updateAccessKeySession(id, updates) {
         await this.db
-            .prepare(`UPDATE access_key_sessions SET status = ?, access_key_id = ?, access_key_secret_encrypted = ? WHERE id = ?`)
+            .prepare(`UPDATE cs_access_key_sessions SET status = ?, access_key_id = ?, access_key_secret_encrypted = ? WHERE id = ?`)
             .bind(updates.status, updates.accessKeyId, updates.accessKeySecretEncrypted, id)
             .run();
     }
     async deleteAccessKeySession(id) {
         await this.db
-            .prepare(`DELETE FROM access_key_sessions WHERE id = ?`)
+            .prepare(`DELETE FROM cs_access_key_sessions WHERE id = ?`)
             .bind(id)
             .run();
     }
     async purgeExpiredAccessKeySessions() {
         await this.db
-            .prepare(`DELETE FROM access_key_sessions WHERE expires_at <= datetime('now')`)
+            .prepare(`DELETE FROM cs_access_key_sessions WHERE expires_at <= datetime('now')`)
             .run();
     }
     // ── Generic KV cache (kv_cache table) ─────────────────────────────────
     /** Read a cached value. Returns null if missing or expired (lazy-deletes expired rows). */
     async cacheGet(key) {
         const row = await this.db
-            .prepare("SELECT value, expires_at FROM kv_cache WHERE key = ?")
+            .prepare("SELECT value, expires_at FROM cs_kv_cache WHERE key = ?")
             .bind(key)
             .first();
         if (!row)
             return null;
         if (row.expires_at < Math.floor(Date.now() / 1000)) {
-            this.db.prepare("DELETE FROM kv_cache WHERE key = ?").bind(key).run().catch(() => { });
+            this.db.prepare("DELETE FROM cs_kv_cache WHERE key = ?").bind(key).run().catch(() => { });
             return null;
         }
         return row.value;
@@ -1703,7 +1741,7 @@ export class D1Store {
     async cachePut(key, value, ttlSeconds) {
         const expiresAt = Math.floor(Date.now() / 1000) + ttlSeconds;
         await this.db
-            .prepare("INSERT OR REPLACE INTO kv_cache (key, value, expires_at) VALUES (?, ?, ?)")
+            .prepare("INSERT OR REPLACE INTO cs_kv_cache (key, value, expires_at) VALUES (?, ?, ?)")
             .bind(key, value, expiresAt)
             .run();
         if (Math.random() < 0.05) {
@@ -1712,12 +1750,12 @@ export class D1Store {
     }
     /** Delete a cached value. */
     async cacheDelete(key) {
-        await this.db.prepare("DELETE FROM kv_cache WHERE key = ?").bind(key).run();
+        await this.db.prepare("DELETE FROM cs_kv_cache WHERE key = ?").bind(key).run();
     }
     /** Purge all expired cache rows. */
     async purgeExpiredCache() {
         const now = Math.floor(Date.now() / 1000);
-        await this.db.prepare("DELETE FROM kv_cache WHERE expires_at < ?").bind(now).run();
+        await this.db.prepare("DELETE FROM cs_kv_cache WHERE expires_at < ?").bind(now).run();
     }
     // ─── Instance registration queries ──────────────────────────────────────
     /** List all registered instances (those with an app:sk setting). */
@@ -1727,10 +1765,10 @@ export class D1Store {
                 COALESCE(s2.value, json_extract(s4.value, '$.name')) as app_name,
                 CASE WHEN s3.value IS NOT NULL THEN 1 ELSE 0 END as has_psk,
                 s1.updated_at as registered_at
-         FROM settings s1
-         LEFT JOIN settings s2 ON s1.instance_did = s2.instance_did AND s2.key = 'app:name'
-         LEFT JOIN settings s3 ON s1.instance_did = s3.instance_did AND s3.key = 'app:psk'
-         LEFT JOIN settings s4 ON s1.instance_did = s4.instance_did AND s4.key = 'app:branding'
+         FROM cs_settings s1
+         LEFT JOIN cs_settings s2 ON s1.instance_did = s2.instance_did AND s2.key = 'app:name'
+         LEFT JOIN cs_settings s3 ON s1.instance_did = s3.instance_did AND s3.key = 'app:psk'
+         LEFT JOIN cs_settings s4 ON s1.instance_did = s4.instance_did AND s4.key = 'app:branding'
          WHERE s1.key = 'app:sk'
          ORDER BY s1.updated_at DESC`)
             .all();
@@ -1749,7 +1787,7 @@ export class D1Store {
         const withPrefix = appSk.startsWith("0x") ? appSk : `0x${appSk}`;
         const withoutPrefix = appSk.startsWith("0x") ? appSk.slice(2) : appSk;
         const { results } = await this.db
-            .prepare(`SELECT DISTINCT instance_did FROM settings
+            .prepare(`SELECT DISTINCT instance_did FROM cs_settings
          WHERE key = 'app:sk' AND value IN (?, ?)`)
             .bind(withPrefix, withoutPrefix)
             .all();
@@ -1758,7 +1796,7 @@ export class D1Store {
     /** Delete all security rules for a specific instance. */
     async deleteSecurityRulesByInstance(instanceDid) {
         await this.db
-            .prepare("DELETE FROM security_rules WHERE instance_did = ?")
+            .prepare("DELETE FROM cs_security_rules WHERE instance_did = ?")
             .bind(instanceDid)
             .run();
         invalidateRulesCache();
@@ -1766,7 +1804,7 @@ export class D1Store {
     /** Delete all access policies for a specific instance. */
     async deleteAccessPoliciesByInstance(instanceDid) {
         await this.db
-            .prepare("DELETE FROM access_policies WHERE instance_did = ?")
+            .prepare("DELETE FROM cs_access_policies WHERE instance_did = ?")
             .bind(instanceDid)
             .run();
         invalidateRulesCache();