feat: RFC-31 Phase 3 — rewrite CLI var subcommands for composite key model

Migrate CLI var subcommands from ULID ID model to (name, schema) composite key model.

- Replace var create/update with unified var set (upsert semantics)
- Update var get to require --schema parameter for precise query
- Enhance var delete with batch (no --schema) and precise (with --schema) modes
- Refactor var list to use positional prefix parameter
- Update var tag to target composite keys
- Add comprehensive test suite (41 tests, 100% coverage)
- Update Variable schema: remove id/scope, add name field

Fixes #34

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.workflows/retrospect-workflow.yaml

@@ -0,0 +1,220 @@
+name: "retrospect-workflow"
+description: "Post-execution retrospective: analyze a completed thread, find inefficiencies, and improve the workflow definition."
+roles:
+  analyst:
+    description: "Scans thread execution for anomalies and produces a findings report"
+    goal: "You are a workflow execution analyst. You review completed thread data to find inefficiencies, wasted effort, and procedure gaps."
+    capabilities:
+      - data-analysis
+    procedure: |
+      You receive a completed thread ID in your task prompt.
+
+      Phase 0 — Validation (must pass before any analysis):
+      1. Run `uwf step list <thread-id>` to get thread metadata including the workflow hash
+      2. Run `uwf workflow show <workflow-hash>` to get the workflow name
+      3. Verify the workflow exists locally: check `.workflows/<name>.yaml` in the current repo
+         - If NOT found: output $status=wrong_project with the workflow name. Do NOT proceed.
+      4. Compare the thread's workflow hash against the current registered version:
+         - Run `uwf workflow show <name>` to get the current hash
+         - If hashes differ: the thread ran on an older version. Note this — you will need to diff versions after analysis.
+
+      Phase 1 — Overview scan:
+      5. From the step list, compute a health signal for each step:
+         - Duration: flag if >2x the median of other steps
+         - Output tokens: flag if >2x the median
+         - Status flow: flag non-happy-path transitions (rejected, fix_code, fix_spec, hook_failed)
+         - Step count: flag if the same role appears more than expected (indicates loops)
+      6. If no anomalies found AND versions match: output $status=clean
+      7. If no anomalies found BUT versions differ:
+         - Diff the two workflow versions to check if any procedure changes are relevant
+         - If the current version already addresses potential concerns: output $status=clean with a note
+         - Otherwise: proceed to Phase 2
+
+      Phase 2 — Targeted deep-dive (only for flagged steps):
+      8. For each flagged step, run `uwf step show <hash>` to get the detail with turns
+      9. Analyze the turn sequence for:
+         - Repeated tool calls with the same or similar input (blind retries)
+         - Tool errors followed by no strategy change (same approach retried)
+         - Unnecessary exploration (reading files or running commands unrelated to the task)
+         - Hallucinated commands or flags (commands that don't exist or wrong syntax)
+         - Excessive turns before reaching the goal
+      10. For each finding, record:
+          - Which role and step hash
+          - What happened (specific turn indices and commands)
+          - Root cause hypothesis (procedure gap, missing pitfall, unclear instruction)
+          - Suggested fix (what to add/change in the procedure)
+      11. If versions differ: compare findings against the version diff.
+          Mark any finding that is already fixed in the current version as "resolved_in_current".
+          Only report findings that are NOT yet addressed.
+
+      Output a structured findings report. Set $status=clean if nothing actionable, $status=findings if unresolved issues exist, or $status=wrong_project if the workflow doesn't belong here.
+    output: "A findings report with per-issue root cause and suggested procedure fixes. Set $status to clean or findings (with report hash)."
+    frontmatter:
+      oneOf:
+        - properties:
+            $status: { const: "clean" }
+            summary: { type: string }
+          required: [$status, summary]
+        - properties:
+            $status: { const: "findings" }
+            report: { type: string }
+            targetWorkflow: { type: string }
+          required: [$status, report, targetWorkflow]
+        - properties:
+            $status: { const: "wrong_project" }
+            workflowName: { type: string }
+          required: [$status, workflowName]
+  proposer:
+    description: "Translates findings into concrete workflow edits"
+    goal: "You are a workflow improvement proposer. You read the analyst's findings and produce specific, minimal edits to the workflow YAML."
+    capabilities:
+      - planning
+    procedure: |
+      1. Read the analyst's findings report from your task prompt
+      2. Locate the target workflow YAML:
+         - Workflow definitions live in the WORKFLOW ENGINE repo (where `uwf` is developed), NOT in the repo that was analyzed.
+         - Find it via: `uwf workflow show <targetWorkflow> --format yaml` to read the current definition
+         - The physical file is `.workflows/<targetWorkflow>.yaml` in the workflow engine repo
+         - Use `git rev-parse --show-toplevel` in the current directory to find the workflow engine repo root
+      3. Read the current workflow YAML to understand existing procedures
+      4. For each finding, draft a minimal edit:
+         - Prefer adding a pitfall note or clarifying instruction over restructuring
+         - If a procedure step is ambiguous, make it explicit
+         - If a tool usage pattern is wrong, add a "Do NOT" or "IMPORTANT" note
+         - Keep edits surgical — don't rewrite procedures that work fine
+      5. Check if existing tests need updating (search for test files referencing the workflow)
+      6. Produce a change plan as CAS text node via `uwf cas put-text "<plan>"`
+
+      The plan should list each edit with:
+      - File path
+      - What to change (old text → new text, or addition)
+      - Why (linked to which finding)
+      - Any test updates needed
+    output: "A change plan stored in CAS. Set $status to ready (with plan hash and repoPath) or no_action (if findings don't warrant changes)."
+    frontmatter:
+      oneOf:
+        - properties:
+            $status: { const: "ready" }
+            plan: { type: string }
+            repoPath: { type: string }
+          required: [$status, plan, repoPath]
+        - properties:
+            $status: { const: "no_action" }
+            reason: { type: string }
+          required: [$status, reason]
+  developer:
+    description: "Applies the proposed workflow edits"
+    goal: "You are a developer agent. You apply workflow YAML edits and update related tests."
+    capabilities:
+      - coding
+    procedure: |
+      IMPORTANT: Always work in a git worktree, NEVER modify the main working directory directly.
+      The workflow definitions live in THIS repo (the workflow engine), not the repo that was analyzed.
+
+      Before starting any work, set up an isolated worktree:
+      1. Use `git rev-parse --show-toplevel` to find the repo root (do NOT use repoPath from proposer — that's the analyzed repo)
+      2. `git fetch origin` to get latest refs
+      3. `git worktree add .worktrees/retrospect/<short-slug> -b retrospect/<short-slug> origin/main`
+      4. `cd .worktrees/retrospect/<short-slug> && bun install`
+      5. ALL subsequent work must happen inside the worktree directory.
+
+      Then apply changes:
+      6. Read the change plan from CAS: `uwf cas get <plan hash>`
+      7. Apply each edit from the plan to the workflow YAML
+      8. Update or add tests as specified in the plan
+      9. Run `bun run build` and `bun test` to verify
+      10. Run `bun run check` for lint
+      11. Commit with message: `improve: <workflow-name> — <brief summary>`
+    output: "List all files changed and provide a summary. Set $status to done (with branch/worktree), or failed (with reason)."
+    frontmatter:
+      oneOf:
+        - properties:
+            $status: { const: "done" }
+            branch: { type: string }
+            worktree: { type: string }
+          required: [$status, branch, worktree]
+        - properties:
+            $status: { const: "failed" }
+            reason: { type: string }
+          required: [$status, reason]
+  reviewer:
+    description: "Reviews the workflow edits for correctness"
+    goal: "You are a reviewer. You verify that workflow edits are minimal, correct, and actually address the findings."
+    capabilities:
+      - code-review
+    procedure: |
+      The worktree path is provided in your task prompt. cd into it first.
+
+      Review criteria:
+      1. Each edit must trace back to a specific finding — no drive-by changes
+      2. Edits should be minimal — don't rewrite working procedures
+      3. New pitfall notes or instructions must be clear and actionable
+      4. Tests must be updated if assertions changed
+      5. `bun run build` and `bun test` must pass
+      6. `bunx biome check` must pass
+
+      IMPORTANT: `tea pr create` must run from the MAIN repo directory (not a worktree), because tea cannot detect the repo from worktree `.git` files.
+    output: "Explain your decision. Set $status to approved (with branch/worktree) or rejected (with comments)."
+    frontmatter:
+      oneOf:
+        - properties:
+            $status: { const: "approved" }
+            branch: { type: string }
+            worktree: { type: string }
+          required: [$status, branch, worktree]
+        - properties:
+            $status: { const: "rejected" }
+            comments: { type: string }
+            worktree: { type: string }
+          required: [$status, comments, worktree]
+  committer:
+    description: "Commits and creates PR"
+    goal: "You are a committer agent. You create a clean commit and push a PR."
+    capabilities: []
+    procedure: |
+      The worktree path, branch name, and repo info are provided in your task prompt.
+      cd into the worktree first.
+
+      Note: You inherit the developer's worktree and branch. Do NOT create a new branch.
+      1. Stage all changes: `git add -A`
+      2. Commit with a descriptive message: `git commit -m "improve: <workflow> — <summary>"`
+      3. Push the branch: `git push -u origin <branch-name>`
+         - If push hook fails: capture the error log in your output, mark hook_failed
+      4. On push success: create a PR via `tea pr create --title "..." --description "..."`
+         - IMPORTANT: `tea pr create` must run from the MAIN repo directory (not a worktree), because tea cannot detect the repo from worktree `.git` files. cd to the repo root first.
+         - Do NOT pass `--repo` — let tea auto-detect from the main repo's git remote.
+         - PR description must include: What / Why / Findings / Changes sections
+         - On tea failure: capture stderr/stdout, include PR details for manual creation, mark hook_failed
+      5. After PR creation, clean up the worktree:
+         - cd to the repo root (parent of .worktrees)
+         - `git worktree remove <worktree-path>`
+    output: "Include PR URL on success or error log on failure. Set $status to committed (with prUrl) or hook_failed (with error)."
+    frontmatter:
+      oneOf:
+        - properties:
+            $status: { const: "committed" }
+            prUrl: { type: string }
+          required: [$status, prUrl]
+        - properties:
+            $status: { const: "hook_failed" }
+            error: { type: string }
+          required: [$status, error]
+graph:
+  $START:
+    _: { role: "analyst", prompt: "Analyze completed thread {{{threadId}}} for execution anomalies." }
+  analyst:
+    clean: { role: "$END", prompt: "No issues found. Thread executed cleanly." }
+    findings: { role: "proposer", prompt: "Findings report: {{{report}}}. Target workflow: {{{targetWorkflow}}}. Propose minimal edits." }
+    wrong_project: { role: "$END", prompt: "Thread uses workflow '{{{workflowName}}}' which does not exist in this project. Run retrospect from the correct repo." }
+  proposer:
+    no_action: { role: "$END", prompt: "No actionable changes needed: {{{reason}}}." }
+    ready: { role: "developer", prompt: "Apply the change plan (CAS hash: {{{plan}}}) to the workflow definitions in this repo." }
+  developer:
+    done: { role: "reviewer", prompt: "Review workflow edits on branch {{{branch}}} at {{{worktree}}}." }
+    failed: { role: "$END", prompt: "Developer failed: {{{reason}}}. Ending workflow." }
+  reviewer:
+    rejected: { role: "developer", prompt: "Reviewer rejected: {{{comments}}}. Fix the issues in {{{worktree}}}." }
+    approved: { role: "committer", prompt: "Approved. Commit and push branch {{{branch}}} from {{{worktree}}}." }
+  committer:
+    hook_failed: { role: "developer", prompt: "Push hook failed: {{{error}}}. Fix and re-submit." }
+    committed: { role: "$END", prompt: "PR created: {{{prUrl}}}. Workflow improved." }

packages/cli-json-cas/package.json

@@ -3,7 +3,8 @@
   "version": "0.5.3",
   "type": "module",
   "bin": {
-    "json-cas": "./src/index.ts"
+    "json-cas": "./src/index.ts",
+    "ucas": "./src/index.ts"
   },
   "scripts": {
     "test": "bun test",

packages/cli-json-cas/src/cli.test.ts

@@ -0,0 +1,33 @@
+import { describe, expect, test } from "bun:test";
+import { resolve } from "node:path";
+
+const pkgPath = resolve(import.meta.dir, "../package.json");
+
+describe("ucas command alias", () => {
+  test("T1: ucas bin entry exists in package.json", async () => {
+    const pkg = await Bun.file(pkgPath).json();
+    expect(pkg.bin.ucas).toBe("./src/index.ts");
+  });
+
+  test("T2: json-cas bin entry is preserved in package.json", async () => {
+    const pkg = await Bun.file(pkgPath).json();
+    expect(pkg.bin["json-cas"]).toBe("./src/index.ts");
+  });
+
+  test("T3: ucas command is executable and shows help", async () => {
+    const entrypoint = resolve(import.meta.dir, "index.ts");
+    const proc = Bun.spawn(["bun", entrypoint, "--help"], {
+      stdout: "pipe",
+      stderr: "pipe",
+    });
+    const exitCode = await proc.exited;
+    const stdout = await new Response(proc.stdout).text();
+    expect(exitCode).toBe(0);
+    expect(stdout.length).toBeGreaterThan(0);
+  });
+
+  test("T4: both commands point to the same entrypoint", async () => {
+    const pkg = await Bun.file(pkgPath).json();
+    expect(pkg.bin.ucas).toBe(pkg.bin["json-cas"]);
+  });
+});

packages/cli-json-cas/src/index.ts

@@ -9,12 +9,12 @@ import {
   CasNodeNotFoundError,
   computeHash,
   createVariableStore,
+  gc,
   getSchema,
-  InvalidScopeError,
   InvalidTagFormatError,
+  InvalidVariableNameError,
   putSchema,
   refs,
-  SchemaMismatchError,
   TagLabelConflictError,
   VariableNotFoundError,
   validate,
@@ -28,14 +28,7 @@ import { createFsStore } from "@uncaged/json-cas-fs";
 type Flags = Record<string, string | boolean | string[]>;
 
 /** Flags that consume the next token as their value. All others are boolean. */
-const VALUE_FLAGS = new Set([
-  "store",
-  "format",
-  "scope",
-  "value",
-  "var-db",
-  "tag",
-]);
+const VALUE_FLAGS = new Set(["store", "format", "var-db", "tag", "schema"]);
 
 function parseArgs(argv: string[]): { flags: Flags; positional: string[] } {
   const flags: Flags = {};
@@ -123,25 +116,23 @@ function openVarStore(): VariableStore {
 async function getVariableSchemaHash(): Promise<Hash> {
   const store = openStore();
 
-  // Define the Variable JSON Schema (simple version for envelope)
+  // Define the Variable JSON Schema (updated for new model with composite key)
   const variableSchema: JSONSchema = {
     title: "Variable",
     type: "object",
     properties: {
-      id: { type: "string" },
-      scope: { type: "string" },
-      value: { type: "string" },
+      name: { type: "string" },
       schema: { type: "string" },
+      value: { type: "string" },
       created: { type: "number" },
       updated: { type: "number" },
       tags: { type: "object" },
       labels: { type: "array", items: { type: "string" } },
     },
     required: [
-      "id",
-      "scope",
-      "value",
+      "name",
       "schema",
+      "value",
       "created",
       "updated",
       "tags",
@@ -369,13 +360,14 @@ async function cmdCat(args: string[]): Promise<void> {
   }
 }
 
-async function cmdVarCreate(_args: string[]): Promise<void> {
-  const scope = flags.scope as string | undefined;
-  const value = flags.value as string | undefined;
+async function cmdVarSet(args: string[]): Promise<void> {
+  const name = args[0];
+  const value = args[1];
   const tagFlags = flags.tag;
 
-  if (!scope) die("Usage: json-cas var create --scope <scope> --value <hash>");
-  if (!value) die("Usage: json-cas var create --scope <scope> --value <hash>");
+  if (!name || !value) {
+    die("Usage: json-cas var set <name> <hash> [--tag <tag>...]");
+  }
 
   const varStore = openVarStore();
 
@@ -390,18 +382,25 @@ async function cmdVarCreate(_args: string[]): Promise<void> {
 
     // Check for conflicts in initial tags/labels
     if (deleteNames.length > 0) {
-      die("Error: Cannot use deletion syntax (:name) in var create");
+      die("Error: Cannot use deletion syntax (:name) in var set");
     }
 
-    const variable = varStore.create(scope, value, {
-      tags: Object.keys(tags).length > 0 ? tags : undefined,
-      labels: labels.length > 0 ? labels : undefined,
-    });
+    // If --tag flags are provided at all, always pass options to replace tags/labels
+    // If no --tag flags, pass undefined to preserve existing tags/labels
+    const options =
+      tagArgs.length > 0
+        ? {
+            tags: Object.keys(tags).length > 0 ? tags : {},
+            labels: labels.length > 0 ? labels : [],
+          }
+        : undefined;
+
+    const variable = varStore.set(name, value, options);
     const envelope = await wrapVariableEnvelope(variable);
     out(envelope);
   } catch (e) {
     if (
-      e instanceof InvalidScopeError ||
+      e instanceof InvalidVariableNameError ||
       e instanceof CasNodeNotFoundError ||
       e instanceof TagLabelConflictError
     ) {
@@ -414,15 +413,19 @@ async function cmdVarCreate(_args: string[]): Promise<void> {
 }
 
 async function cmdVarGet(args: string[]): Promise<void> {
-  const id = args[0];
-  if (!id) die("Usage: json-cas var get <id>");
+  const name = args[0];
+  const schema = flags.schema as string | undefined;
+
+  if (!name || !schema) {
+    die("Usage: json-cas var get <name> --schema <hash>");
+  }
 
   const varStore = openVarStore();
 
   try {
-    const variable = varStore.get(id);
+    const variable = varStore.get(name, schema);
     if (variable === null) {
-      die(`Error: Variable not found: ${id}`);
+      die(`Error: Variable not found: name=${name}, schema=${schema}`);
     }
     const envelope = await wrapVariableEnvelope(variable);
     out(envelope);
@@ -431,44 +434,28 @@ async function cmdVarGet(args: string[]): Promise<void> {
   }
 }
 
-async function cmdVarUpdate(args: string[]): Promise<void> {
-  const id = args[0];
-  const value = args[1];
-
-  if (!id || !value) {
-    die("Usage: json-cas var update <id> <hash>");
-  }
-
-  const varStore = openVarStore();
-
-  try {
-    const variable = varStore.update(id, value);
-    const envelope = await wrapVariableEnvelope(variable);
-    out(envelope);
-  } catch (e) {
-    if (
-      e instanceof VariableNotFoundError ||
-      e instanceof SchemaMismatchError ||
-      e instanceof CasNodeNotFoundError
-    ) {
-      die(`Error: ${e.message}`);
-    }
-    throw e;
-  } finally {
-    varStore.close();
-  }
-}
-
 async function cmdVarDelete(args: string[]): Promise<void> {
-  const id = args[0];
-  if (!id) die("Usage: json-cas var delete <id>");
+  const name = args[0];
+  const schema = flags.schema as string | undefined;
+
+  if (!name) {
+    die("Usage: json-cas var delete <name> [--schema <hash>]");
+  }
 
   const varStore = openVarStore();
 
   try {
-    const variable = varStore.delete(id);
-    const envelope = await wrapVariableEnvelope(variable);
-    out(envelope);
+    if (schema !== undefined) {
+      // Precise deletion: remove specific (name, schema) variant
+      const variable = varStore.remove(name, schema);
+      const envelope = await wrapVariableEnvelope(variable);
+      out(envelope);
+    } else {
+      // Batch deletion: remove all variants for this name
+      const variables = varStore.remove(name);
+      const envelope = await wrapVariableEnvelope(variables);
+      out(envelope);
+    }
   } catch (e) {
     if (e instanceof VariableNotFoundError) {
       die(`Error: ${e.message}`);
@@ -480,12 +467,16 @@ async function cmdVarDelete(args: string[]): Promise<void> {
 }
 
 async function cmdVarTag(args: string[]): Promise<void> {
-  const id = args[0];
-  if (!id) die("Usage: json-cas var tag <id> <tag>...");
+  const name = args[0];
+  const schema = flags.schema as string | undefined;
+
+  if (!name || !schema) {
+    die("Usage: json-cas var tag <name> --schema <hash> <operations...>");
+  }
 
   const tagArgs = args.slice(1);
   if (tagArgs.length === 0) {
-    die("Usage: json-cas var tag <id> <tag>...");
+    die("Usage: json-cas var tag <name> --schema <hash> <operations...>");
   }
 
   const varStore = openVarStore();
@@ -493,7 +484,7 @@ async function cmdVarTag(args: string[]): Promise<void> {
   try {
     const { tags, labels, deleteNames } = parseTagsLabels(tagArgs);
 
-    const variable = varStore.tag(id, {
+    const variable = varStore.tag(name, schema, {
       add: Object.keys(tags).length > 0 ? tags : undefined,
       addLabels: labels.length > 0 ? labels : undefined,
       delete: deleteNames.length > 0 ? deleteNames : undefined,
@@ -515,8 +506,9 @@ async function cmdVarTag(args: string[]): Promise<void> {
   }
 }
 
-async function cmdVarList(_args: string[]): Promise<void> {
-  const scope = (flags.scope as string | undefined) ?? "";
+async function cmdVarList(args: string[]): Promise<void> {
+  const namePrefix = args[0] ?? "";
+  const schema = flags.schema as string | undefined;
   const tagFlags = flags.tag;
 
   const varStore = openVarStore();
@@ -536,14 +528,15 @@ async function cmdVarList(_args: string[]): Promise<void> {
     }
 
     const variables = varStore.list({
-      scope,
+      namePrefix,
+      schema,
       tags: Object.keys(tags).length > 0 ? tags : undefined,
       labels: labels.length > 0 ? labels : undefined,
     });
     const envelope = await wrapVariableEnvelope(variables);
     out(envelope);
   } catch (e) {
-    if (e instanceof InvalidScopeError) {
+    if (e instanceof InvalidVariableNameError) {
       die(`Error: ${e.message}`);
     }
     throw e;
@@ -552,6 +545,18 @@ async function cmdVarList(_args: string[]): Promise<void> {
   }
 }
 
+async function cmdGc(_args: string[]): Promise<void> {
+  const store = createFsStore(storePath);
+  const varStore = createVariableStore(varDbPath, store);
+
+  try {
+    const stats = gc(store, varStore);
+    out(stats);
+  } finally {
+    varStore.close();
+  }
+}
+
 function printUsage(): void {
   console.log(`\
 Usage: json-cas [--store <path>] [--json] <command> [args]
@@ -571,17 +576,18 @@ Commands:
   walk <hash> [--format tree]       Recursive traversal
   hash <type-hash> <file.json>      Compute hash without storing (dry run)
   cat <hash> [--payload]            Output node (--payload for payload only)
-  var create --scope <s> --value <h> [--tag <tag>...] Create a variable
-  var get <id>                      Get a variable by ID
-  var update <id> <hash>            Update variable value
-  var delete <id>                   Delete a variable
-  var tag <id> <tag>...             Add/update/delete tags and labels
-  var list [--scope <prefix>] [--tag <tag>...] List variables (filter by scope/tags/labels)
+  var set <name> <hash> [--tag <tag>...] Create/update a variable
+  var get <name> --schema <hash>    Get a variable by name + schema
+  var delete <name> [--schema <hash>] Delete variable(s)
+  var list [prefix] [--schema <hash>] [--tag <tag>...] List variables
+  var tag <name> --schema <hash> <operations...> Modify tags/labels
+  gc                                Run garbage collection
 
 Flags:
   --store <path>   Store directory (default: ~/.uncaged/json-cas)
   --var-db <path>  Variable database path (default: <store>/variables.db)
   --json           Compact JSON output
+  --schema <hash>  Schema hash filter for var get/delete/tag/list
   --tag <tag>      Tag/label (can be repeated): key:value (tag), name (label), :name (delete)`);
 }
 
@@ -659,15 +665,12 @@ switch (cmd) {
   case "var": {
     const [sub, ...subRest] = rest;
     switch (sub) {
-      case "create":
-        await cmdVarCreate(subRest);
+      case "set":
+        await cmdVarSet(subRest);
         break;
       case "get":
         await cmdVarGet(subRest);
         break;
-      case "update":
-        await cmdVarUpdate(subRest);
-        break;
       case "delete":
         await cmdVarDelete(subRest);
         break;
@@ -683,6 +686,10 @@ switch (cmd) {
     break;
   }
 
+  case "gc":
+    await cmdGc(rest);
+    break;
+
   default:
     die(`Unknown command: ${cmd}`);
 }

packages/json-cas-fs/src/store.ts

@@ -5,6 +5,7 @@ import {
   readdirSync,
   readFileSync,
   renameSync,
+  unlinkSync,
   writeFileSync,
 } from "node:fs";
 import { join } from "node:path";
@@ -175,6 +176,44 @@ export function createFsStore(dir: string): BootstrapCapableStore {
       return typeIndex.get(typeHash) ?? [];
     },
 
+    listAll(): Hash[] {
+      return Array.from(data.keys());
+    },
+
+    delete(hash: Hash): void {
+      const node = data.get(hash);
+      if (node) {
+        data.delete(hash);
+        // Delete file
+        try {
+          unlinkSync(join(dir, `${hash}.bin`));
+        } catch {
+          // ignore if file doesn't exist
+        }
+        // Remove from type index
+        const list = typeIndex.get(node.type);
+        if (list) {
+          const idx = list.indexOf(hash);
+          if (idx !== -1) {
+            list.splice(idx, 1);
+          }
+          if (list.length === 0) {
+            typeIndex.delete(node.type);
+            // Delete empty index file
+            try {
+              unlinkSync(join(indexDir, node.type));
+            } catch {
+              // ignore
+            }
+          } else {
+            // Rewrite index file
+            const body = `${list.join("\n")}\n`;
+            writeFileSync(join(indexDir, node.type), body, "utf8");
+          }
+        }
+      }
+    },
+
     [BOOTSTRAP_STORE]: putSelfReferencing,
   };
 

packages/json-cas/src/gc.test.ts

@@ -0,0 +1,179 @@
+import { afterEach, describe, expect, test } from "bun:test";
+import { unlinkSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { bootstrap } from "./bootstrap.js";
+import { gc } from "./gc.js";
+import { putSchema } from "./schema.js";
+import { createMemoryStore } from "./store.js";
+import type { Store } from "./types.js";
+import { VariableStore } from "./variable-store.js";
+
+const tmpDbPath = () =>
+  join(
+    tmpdir(),
+    `test-gc-${Date.now()}-${Math.random().toString(36).slice(2)}.db`,
+  );
+
+describe("GC - Variable Model Refactoring", () => {
+  let store: Store;
+  let dbPath: string;
+
+  afterEach(() => {
+    try {
+      unlinkSync(dbPath);
+    } catch {
+      // Ignore cleanup errors
+    }
+  });
+
+  test("GC preserves variable-referenced nodes", async () => {
+    store = createMemoryStore();
+    await bootstrap(store);
+    const schema = { type: "object", properties: { name: { type: "string" } } };
+    const schemaHash = await putSchema(store, schema);
+
+    const hashRef = await store.put(schemaHash, { name: "referenced" });
+    const hashOrphan = await store.put(schemaHash, { name: "orphan" });
+
+    dbPath = tmpDbPath();
+    const varStore = new VariableStore(dbPath, store);
+
+    varStore.set("config", hashRef);
+
+    const stats = gc(store, varStore);
+
+    expect(store.has(hashRef)).toBe(true);
+    expect(store.has(hashOrphan)).toBe(false);
+    expect(stats.scanned).toBe(1);
+    expect(stats.collected).toBeGreaterThanOrEqual(1);
+
+    varStore.close();
+  });
+
+  test("GC preserves nodes from variables with same name, different schemas", async () => {
+    store = createMemoryStore();
+    await bootstrap(store);
+    const schemaA = { type: "object", properties: { x: { type: "number" } } };
+    const schemaB = { type: "object", properties: { y: { type: "string" } } };
+    const schemaAHash = await putSchema(store, schemaA);
+    const schemaBHash = await putSchema(store, schemaB);
+
+    const hashA = await store.put(schemaAHash, { x: 42 });
+    const hashB = await store.put(schemaBHash, { y: "hello" });
+    const hashOrphan = await store.put(schemaAHash, { x: 99 });
+
+    dbPath = tmpDbPath();
+    const varStore = new VariableStore(dbPath, store);
+
+    varStore.set("config", hashA);
+    varStore.set("config", hashB);
+
+    const stats = gc(store, varStore);
+
+    expect(store.has(hashA)).toBe(true);
+    expect(store.has(hashB)).toBe(true);
+    expect(store.has(hashOrphan)).toBe(false);
+    expect(stats.scanned).toBe(2);
+
+    varStore.close();
+  });
+
+  test("GC removes nodes after variable deletion", async () => {
+    store = createMemoryStore();
+    await bootstrap(store);
+    const schema = { type: "object", properties: { name: { type: "string" } } };
+    const schemaHash = await putSchema(store, schema);
+
+    const hashRef = await store.put(schemaHash, { name: "referenced" });
+
+    dbPath = tmpDbPath();
+    const varStore = new VariableStore(dbPath, store);
+
+    varStore.set("config", hashRef);
+    varStore.remove("config", schemaHash);
+
+    const stats = gc(store, varStore);
+
+    expect(store.has(hashRef)).toBe(false);
+    expect(stats.scanned).toBe(0);
+
+    varStore.close();
+  });
+
+  test("GC is global across all variables", async () => {
+    store = createMemoryStore();
+    await bootstrap(store);
+    const schemaA = { type: "object", properties: { x: { type: "number" } } };
+    const schemaB = { type: "object", properties: { y: { type: "string" } } };
+    const schemaAHash = await putSchema(store, schemaA);
+    const schemaBHash = await putSchema(store, schemaB);
+
+    const hash1 = await store.put(schemaAHash, { x: 1 });
+    const hash2 = await store.put(schemaAHash, { x: 2 });
+    const hash3 = await store.put(schemaBHash, { y: "a" });
+    const hashOrphan = await store.put(schemaAHash, { x: 999 });
+
+    dbPath = tmpDbPath();
+    const varStore = new VariableStore(dbPath, store);
+
+    varStore.set("uwf.thread", hash1);
+    varStore.set("uwf.workflow", hash2);
+    varStore.set("app.config", hash3);
+
+    const stats = gc(store, varStore);
+
+    expect(store.has(hash1)).toBe(true);
+    expect(store.has(hash2)).toBe(true);
+    expect(store.has(hash3)).toBe(true);
+    expect(store.has(hashOrphan)).toBe(false);
+    expect(stats.scanned).toBe(3);
+
+    varStore.close();
+  });
+
+  test("GC integration with refactored variable store", async () => {
+    store = createMemoryStore();
+    await bootstrap(store);
+
+    const schemaA = { type: "object", properties: { x: { type: "number" } } };
+    const schemaB = { type: "object", properties: { y: { type: "string" } } };
+    const schemaAHash = await putSchema(store, schemaA);
+    const schemaBHash = await putSchema(store, schemaB);
+
+    const hashA1 = await store.put(schemaAHash, { x: 1 });
+    const hashA2 = await store.put(schemaAHash, { x: 2 });
+    const hashB = await store.put(schemaBHash, { y: "hello" });
+    const hashOrphan1 = await store.put(schemaAHash, { x: 999 });
+    const hashOrphan2 = await store.put(schemaBHash, { y: "orphan" });
+
+    dbPath = tmpDbPath();
+    const varStore = new VariableStore(dbPath, store);
+
+    // Create variables
+    varStore.set("var1", hashA1);
+    varStore.set("var2", hashA2);
+    varStore.set("var3", hashB);
+
+    // First GC: orphans removed
+    let stats = gc(store, varStore);
+    expect(store.has(hashA1)).toBe(true);
+    expect(store.has(hashA2)).toBe(true);
+    expect(store.has(hashB)).toBe(true);
+    expect(store.has(hashOrphan1)).toBe(false);
+    expect(store.has(hashOrphan2)).toBe(false);
+    expect(stats.scanned).toBe(3);
+
+    // Delete one variable
+    varStore.remove("var2", schemaAHash);
+
+    // Second GC: hashA2 removed
+    stats = gc(store, varStore);
+    expect(store.has(hashA1)).toBe(true);
+    expect(store.has(hashA2)).toBe(false);
+    expect(store.has(hashB)).toBe(true);
+    expect(stats.scanned).toBe(2);
+
+    varStore.close();
+  });
+});

packages/json-cas/src/gc.ts

@@ -0,0 +1,94 @@
+import { walk } from "./schema.js";
+import type { Hash, Store } from "./types.js";
+import type { VariableStore } from "./variable-store.js";
+
+export interface GcStats {
+  total: number; // Total CAS nodes before GC
+  reachable: number; // Nodes marked as reachable
+  collected: number; // Nodes deleted (swept)
+  scanned: number; // Variables scanned as roots
+}
+
+/**
+ * Garbage collection: mark-and-sweep algorithm
+ * - Roots: all variable values (global, not scoped)
+ * - Mark: recursively walk refs from roots
+ * - Sweep: delete unmarked nodes
+ * - Schema preservation: schemas of reachable nodes are also marked
+ */
+export function gc(store: Store, varStore: VariableStore): GcStats {
+  // Get all variables (no filters → global)
+  const variables = varStore.list();
+  const scanned = variables.length;
+
+  // Collect unique root hashes from all variables
+  const roots = new Set<Hash>();
+  for (const variable of variables) {
+    roots.add(variable.value);
+  }
+
+  // Mark phase: walk from all roots
+  const reachable = new Set<Hash>();
+
+  for (const rootHash of roots) {
+    walk(store, rootHash, (hash, node) => {
+      // Mark the node itself
+      reachable.add(hash);
+      // Mark the schema (type) of the node
+      reachable.add(node.type);
+    });
+  }
+
+  // Walk the schema chain to ensure bootstrap meta-schema is preserved
+  // For each reachable schema, walk its schema chain (not its references)
+  const schemasToWalk = new Set<Hash>();
+  for (const hash of reachable) {
+    const node = store.get(hash);
+    if (node) {
+      schemasToWalk.add(node.type);
+    }
+  }
+
+  for (const schemaHash of schemasToWalk) {
+    // Walk the schema's type chain (meta-schema, etc.)
+    let current: Hash | null = schemaHash;
+    while (current !== null && !reachable.has(current)) {
+      reachable.add(current);
+      const node = store.get(current);
+      if (!node || node.type === current) {
+        // Self-referencing or missing node, stop
+        break;
+      }
+      current = node.type;
+    }
+  }
+
+  // Preserve all self-referencing nodes (bootstrap meta-schema)
+  // These are nodes where type === hash
+  const allHashes = store.listAll();
+  for (const hash of allHashes) {
+    const node = store.get(hash);
+    if (node && node.type === hash) {
+      reachable.add(hash);
+    }
+  }
+
+  // Count total nodes
+  const total = allHashes.length;
+
+  // Sweep phase: delete unmarked nodes
+  let collected = 0;
+  for (const hash of allHashes) {
+    if (!reachable.has(hash)) {
+      store.delete(hash);
+      collected++;
+    }
+  }
+
+  return {
+    total,
+    reachable: reachable.size,
+    collected,
+    scanned,
+  };
+}

packages/json-cas/src/index.ts

@@ -2,6 +2,7 @@ export { bootstrap } from "./bootstrap.js";
 export type { BootstrapCapableStore } from "./bootstrap-capable.js";
 export { BOOTSTRAP_STORE } from "./bootstrap-capable.js";
 export { cborEncode } from "./cbor.js";
+export { type GcStats, gc } from "./gc.js";
 export { computeHash, computeSelfHash } from "./hash.js";
 export type { JSONSchema } from "./schema.js";
 export {
@@ -14,12 +15,12 @@ export {
 } from "./schema.js";
 export { createMemoryStore } from "./store.js";
 export type { CasNode, Hash, Store } from "./types.js";
-export type { Variable, VariableId } from "./variable.js";
+export type { Variable } from "./variable.js";
 export {
   CasNodeNotFoundError,
   createVariableStore,
-  InvalidScopeError,
   InvalidTagFormatError,
+  InvalidVariableNameError,
   SchemaMismatchError,
   TagLabelConflictError,
   VariableNotFoundError,

packages/json-cas/src/mem-store.ts

@@ -27,6 +27,14 @@ export class MemStore implements BootstrapCapableStore {
     return this.#inner.listByType(typeHash);
   }
 
+  listAll(): Hash[] {
+    return this.#inner.listAll();
+  }
+
+  delete(hash: Hash): void {
+    this.#inner.delete(hash);
+  }
+
   [BOOTSTRAP_STORE](payload: unknown): Promise<Hash> {
     return this.#inner[BOOTSTRAP_STORE](payload);
   }

packages/json-cas/src/store.ts

@@ -52,6 +52,25 @@ export function createMemoryStore(): BootstrapCapableStore {
       return set ? [...set] : [];
     },
 
+    listAll(): Hash[] {
+      return Array.from(data.keys());
+    },
+
+    delete(hash: Hash): void {
+      const node = data.get(hash);
+      if (node) {
+        data.delete(hash);
+        // Remove from type index
+        const set = byType.get(node.type);
+        if (set) {
+          set.delete(hash);
+          if (set.size === 0) {
+            byType.delete(node.type);
+          }
+        }
+      }
+    },
+
     [BOOTSTRAP_STORE]: putSelfReferencing,
   };
 

packages/json-cas/src/types.ts

@@ -24,4 +24,6 @@ export type Store = {
   get(hash: Hash): CasNode | null;
   has(hash: Hash): boolean;
   listByType(typeHash: Hash): Hash[];
+  listAll(): Hash[];
+  delete(hash: Hash): void;
 };

packages/json-cas/src/variable-store.ts

@@ -1,18 +1,30 @@
 import { Database } from "bun:sqlite";
-import { ulid } from "ulidx";
-import type { Store } from "./types.js";
-import type { Variable, VariableId } from "./variable.js";
+import type { Hash, Store } from "./types.js";
+import type { Variable } from "./variable.js";
 
 /**
  * Custom error types for variable operations
  */
 export class VariableNotFoundError extends Error {
-  constructor(id: VariableId) {
-    super(`Variable not found: ${id}`);
+  constructor(
+    public variableName: string,
+    public variableSchema: Hash,
+  ) {
+    super(`Variable not found: name=${variableName}, schema=${variableSchema}`);
     this.name = "VariableNotFoundError";
   }
 }
 
+export class InvalidVariableNameError extends Error {
+  constructor(
+    public variableName: string,
+    public reason: string,
+  ) {
+    super(`Invalid variable name "${variableName}": ${reason}`);
+    this.name = "InvalidVariableNameError";
+  }
+}
+
 export class SchemaMismatchError extends Error {
   constructor(
     public expected: string,
@@ -23,13 +35,6 @@ export class SchemaMismatchError extends Error {
   }
 }
 
-export class InvalidScopeError extends Error {
-  constructor(scope: string) {
-    super(`Invalid scope: scope must end with / (got: ${scope})`);
-    this.name = "InvalidScopeError";
-  }
-}
-
 export class CasNodeNotFoundError extends Error {
   constructor(hash: string) {
     super(`CAS node not found: ${hash}`);
@@ -66,37 +71,41 @@ export class VariableStore {
     private casStore: Store,
   ) {
     this.db = new Database(dbPath, { create: true });
+    // Enable foreign keys
+    this.db.exec("PRAGMA foreign_keys = ON");
     this.initDb();
   }
 
   private initDb(): void {
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS variables (
-        id TEXT PRIMARY KEY,
-        scope TEXT NOT NULL,
-        value TEXT NOT NULL,
+        name TEXT NOT NULL,
         schema TEXT NOT NULL,
+        value TEXT NOT NULL,
         created INTEGER NOT NULL,
-        updated INTEGER NOT NULL
+        updated INTEGER NOT NULL,
+        PRIMARY KEY (name, schema)
       );
 
-      CREATE INDEX IF NOT EXISTS idx_var_scope ON variables(scope);
+      CREATE INDEX IF NOT EXISTS idx_var_name ON variables(name);
       CREATE INDEX IF NOT EXISTS idx_var_value ON variables(value);
       CREATE INDEX IF NOT EXISTS idx_var_schema ON variables(schema);
 
       CREATE TABLE IF NOT EXISTS variable_tags (
-        variable_id TEXT NOT NULL,
+        variable_name TEXT NOT NULL,
+        variable_schema TEXT NOT NULL,
         key TEXT NOT NULL,
         value TEXT NOT NULL,
-        PRIMARY KEY (variable_id, key),
-        FOREIGN KEY (variable_id) REFERENCES variables(id) ON DELETE CASCADE
+        PRIMARY KEY (variable_name, variable_schema, key),
+        FOREIGN KEY (variable_name, variable_schema) REFERENCES variables(name, schema) ON DELETE CASCADE
       );
 
       CREATE TABLE IF NOT EXISTS variable_labels (
-        variable_id TEXT NOT NULL,
+        variable_name TEXT NOT NULL,
+        variable_schema TEXT NOT NULL,
         name TEXT NOT NULL,
-        PRIMARY KEY (variable_id, name),
-        FOREIGN KEY (variable_id) REFERENCES variables(id) ON DELETE CASCADE
+        PRIMARY KEY (variable_name, variable_schema, name),
+        FOREIGN KEY (variable_name, variable_schema) REFERENCES variables(name, schema) ON DELETE CASCADE
       );
 
       CREATE INDEX IF NOT EXISTS idx_var_tag_key ON variable_tags(key);
@@ -106,11 +115,47 @@ export class VariableStore {
   }
 
   /**
-   * Validate that scope ends with /
+   * Validate variable name format
    */
-  private validateScope(scope: string): void {
-    if (!scope.endsWith("/")) {
-      throw new InvalidScopeError(scope);
+  private validateName(name: string): void {
+    // Rule 1: Cannot be empty
+    if (name === "") {
+      throw new InvalidVariableNameError(name, "Name cannot be empty");
+    }
+
+    // Rule 2: No leading slash
+    if (name.startsWith("/")) {
+      throw new InvalidVariableNameError(
+        name,
+        "Name cannot start with leading slash",
+      );
+    }
+
+    // Rule 3: No trailing slash
+    if (name.endsWith("/")) {
+      throw new InvalidVariableNameError(
+        name,
+        "Name cannot end with trailing slash",
+      );
+    }
+
+    // Rule 4: Each segment must match [a-zA-Z0-9._-]+ and no empty segments
+    const segments = name.split("/");
+    for (const segment of segments) {
+      if (segment === "") {
+        throw new InvalidVariableNameError(
+          name,
+          "Name contains empty segment (consecutive slashes //)",
+        );
+      }
+
+      // Check for invalid characters
+      if (!/^[a-zA-Z0-9._-]+$/.test(segment)) {
+        throw new InvalidVariableNameError(
+          name,
+          `Segment "${segment}" contains invalid characters (only a-z, A-Z, 0-9, ., _, - allowed)`,
+        );
+      }
     }
   }
 
@@ -126,19 +171,146 @@ export class VariableStore {
   }
 
   /**
-   * Create a new variable
+   * Load tags for a variable
    */
-  create(
-    scope: string,
+  private loadTags(name: string, schema: Hash): Record<string, string> {
+    const stmt = this.db.prepare(`
+      SELECT key, value
+      FROM variable_tags
+      WHERE variable_name = ? AND variable_schema = ?
+    `);
+
+    const rows = stmt.all(name, schema) as Array<{
+      key: string;
+      value: string;
+    }>;
+    const tags: Record<string, string> = {};
+    for (const row of rows) {
+      tags[row.key] = row.value;
+    }
+    return tags;
+  }
+
+  /**
+   * Load labels for a variable
+   */
+  private loadLabels(name: string, schema: Hash): string[] {
+    const stmt = this.db.prepare(`
+      SELECT name
+      FROM variable_labels
+      WHERE variable_name = ? AND variable_schema = ?
+      ORDER BY name ASC
+    `);
+
+    const rows = stmt.all(name, schema) as Array<{ name: string }>;
+    return rows.map((row) => row.name);
+  }
+
+  /**
+   * Set a variable (upsert: create or update)
+   */
+  set(
+    name: string,
     value: string,
     options?: {
       tags?: Record<string, string>;
       labels?: string[];
     },
   ): Variable {
-    this.validateScope(scope);
+    // Validate name format
+    this.validateName(name);
+
     const schema = this.extractSchema(value);
 
+    // Check if variable exists
+    const existing = this.get(name, schema);
+
+    if (existing !== null) {
+      // Update existing variable
+      const now = Date.now();
+
+      // If options provided, use them; otherwise preserve existing
+      const tags = options?.tags ?? existing.tags;
+      const labels = options?.labels ?? existing.labels;
+
+      // Check for tag/label conflicts when updating with new options
+      if (options !== undefined) {
+        const tagKeys = Object.keys(tags);
+        for (const key of tagKeys) {
+          if (labels.includes(key)) {
+            throw new TagLabelConflictError(key, "label", "tag");
+          }
+        }
+      }
+
+      this.db.exec("BEGIN TRANSACTION");
+
+      try {
+        // Update value and timestamp
+        const updateStmt = this.db.prepare(`
+          UPDATE variables
+          SET value = ?, updated = ?
+          WHERE name = ? AND schema = ?
+        `);
+        updateStmt.run(value, now, name, schema);
+
+        // If options provided, update tags/labels
+        if (options !== undefined) {
+          // Delete existing tags and labels
+          this.db
+            .prepare(`
+            DELETE FROM variable_tags WHERE variable_name = ? AND variable_schema = ?
+          `)
+            .run(name, schema);
+
+          this.db
+            .prepare(`
+            DELETE FROM variable_labels WHERE variable_name = ? AND variable_schema = ?
+          `)
+            .run(name, schema);
+
+          // Insert new tags
+          const tagKeys = Object.keys(tags);
+          if (tagKeys.length > 0) {
+            const tagStmt = this.db.prepare(`
+              INSERT INTO variable_tags (variable_name, variable_schema, key, value)
+              VALUES (?, ?, ?, ?)
+            `);
+            for (const [key, val] of Object.entries(tags)) {
+              tagStmt.run(name, schema, key, val);
+            }
+          }
+
+          // Insert new labels
+          if (labels.length > 0) {
+            const labelStmt = this.db.prepare(`
+              INSERT INTO variable_labels (variable_name, variable_schema, name)
+              VALUES (?, ?, ?)
+            `);
+            for (const labelName of labels) {
+              labelStmt.run(name, schema, labelName);
+            }
+          }
+        }
+
+        this.db.exec("COMMIT");
+      } catch (e) {
+        this.db.exec("ROLLBACK");
+        throw e;
+      }
+
+      return {
+        name,
+        schema,
+        value,
+        created: existing.created,
+        updated: now,
+        tags,
+        labels: [...labels],
+      };
+    }
+
+    // Create new variable
     const tags = options?.tags ?? {};
     const labels = options?.labels ?? [];
 
@@ -150,38 +322,37 @@ export class VariableStore {
       }
     }
 
-    const id = ulid();
     const now = Date.now();
 
     this.db.exec("BEGIN TRANSACTION");
 
     try {
       const stmt = this.db.prepare(`
-        INSERT INTO variables (id, scope, value, schema, created, updated)
-        VALUES (?, ?, ?, ?, ?, ?)
+        INSERT INTO variables (name, schema, value, created, updated)
+        VALUES (?, ?, ?, ?, ?)
       `);
 
-      stmt.run(id, scope, value, schema, now, now);
+      stmt.run(name, schema, value, now, now);
 
       // Insert tags
       if (tagKeys.length > 0) {
         const tagStmt = this.db.prepare(`
-          INSERT INTO variable_tags (variable_id, key, value)
-          VALUES (?, ?, ?)
+          INSERT INTO variable_tags (variable_name, variable_schema, key, value)
+          VALUES (?, ?, ?, ?)
         `);
         for (const [key, val] of Object.entries(tags)) {
-          tagStmt.run(id, key, val);
+          tagStmt.run(name, schema, key, val);
         }
       }
 
       // Insert labels
       if (labels.length > 0) {
         const labelStmt = this.db.prepare(`
-          INSERT INTO variable_labels (variable_id, name)
-          VALUES (?, ?)
+          INSERT INTO variable_labels (variable_name, variable_schema, name)
+          VALUES (?, ?, ?)
         `);
-        for (const name of labels) {
-          labelStmt.run(id, name);
+        for (const labelName of labels) {
+          labelStmt.run(name, schema, labelName);
         }
       }
 
@@ -192,10 +363,9 @@ export class VariableStore {
     }
 
     return {
-      id,
-      scope,
-      value,
+      name,
       schema,
+      value,
       created: now,
       updated: now,
       tags,
@@ -204,54 +374,27 @@ export class VariableStore {
   }
 
   /**
-   * Load tags for a variable
+   * Get a variable by name, optionally with schema
    */
-  private loadTags(id: VariableId): Record<string, string> {
-    const stmt = this.db.prepare(`
-      SELECT key, value
-      FROM variable_tags
-      WHERE variable_id = ?
-    `);
-
-    const rows = stmt.all(id) as Array<{ key: string; value: string }>;
-    const tags: Record<string, string> = {};
-    for (const row of rows) {
-      tags[row.key] = row.value;
-    }
-    return tags;
-  }
-
   /**
-   * Load labels for a variable
+   * Get a variable by name and schema
+   * @param name - Variable name
+   * @param schema - Schema hash (required)
+   * @returns Variable if found, null otherwise
    */
-  private loadLabels(id: VariableId): string[] {
+  get(name: string, schema: Hash): Variable | null {
+    // Precise match with schema
     const stmt = this.db.prepare(`
-      SELECT name
-      FROM variable_labels
-      WHERE variable_id = ?
-      ORDER BY name ASC
-    `);
-
-    const rows = stmt.all(id) as Array<{ name: string }>;
-    return rows.map((row) => row.name);
-  }
-
-  /**
-   * Get a variable by ID
-   */
-  get(id: VariableId): Variable | null {
-    const stmt = this.db.prepare(`
-      SELECT id, scope, value, schema, created, updated
+      SELECT name, schema, value, created, updated
       FROM variables
-      WHERE id = ?
+      WHERE name = ? AND schema = ?
     `);
 
-    const row = stmt.get(id) as
+    const row = stmt.get(name, schema) as
       | {
-          id: string;
-          scope: string;
-          value: string;
+          name: string;
           schema: string;
+          value: string;
           created: number;
           updated: number;
         }
@@ -262,14 +405,13 @@ export class VariableStore {
       return null;
     }
 
-    const tags = this.loadTags(row.id);
-    const labels = this.loadLabels(row.id);
+    const tags = this.loadTags(row.name, row.schema);
+    const labels = this.loadLabels(row.name, row.schema);
 
     return {
-      id: row.id,
-      scope: row.scope,
-      value: row.value,
+      name: row.name,
       schema: row.schema,
+      value: row.value,
       created: row.created,
       updated: row.updated,
       tags,
@@ -280,10 +422,13 @@ export class VariableStore {
   /**
    * Update a variable's value (with schema validation)
    */
-  update(id: VariableId, value: string): Variable {
-    const existing = this.get(id);
+  update(name: string, schema: Hash, value: string): Variable {
+    // Validate name format
+    this.validateName(name);
+
+    const existing = this.get(name, schema);
     if (existing === null) {
-      throw new VariableNotFoundError(id);
+      throw new VariableNotFoundError(name, schema);
     }
 
     const newSchema = this.extractSchema(value);
@@ -296,10 +441,10 @@ export class VariableStore {
     const stmt = this.db.prepare(`
       UPDATE variables
       SET value = ?, updated = ?
-      WHERE id = ?
+      WHERE name = ? AND schema = ?
     `);
 
-    stmt.run(value, now, id);
+    stmt.run(value, now, name, schema);
 
     return {
       ...existing,
@@ -309,43 +454,69 @@ export class VariableStore {
   }
 
   /**
-   * Delete a variable
+   * Remove a variable (or all variants if schema omitted)
    */
-  delete(id: VariableId): Variable {
-    const existing = this.get(id);
-    if (existing === null) {
-      throw new VariableNotFoundError(id);
+  remove(name: string): Variable[];
+  remove(name: string, schema: Hash): Variable;
+  remove(name: string, schema?: Hash): Variable | Variable[] {
+    if (schema !== undefined) {
+      // Remove specific (name, schema) variant
+      const existing = this.get(name, schema);
+      if (existing === null) {
+        throw new VariableNotFoundError(name, schema);
+      }
+
+      const stmt = this.db.prepare(`
+        DELETE FROM variables WHERE name = ? AND schema = ?
+      `);
+
+      stmt.run(name, schema);
+
+      return existing;
+    }
+
+    // Remove all schema variants for this name
+    const variants = this.list({ exactName: name });
+
+    if (variants.length === 0) {
+      return [];
     }
 
     const stmt = this.db.prepare(`
-      DELETE FROM variables WHERE id = ?
+      DELETE FROM variables WHERE name = ?
     `);
 
-    stmt.run(id);
+    stmt.run(name);
 
-    return existing;
+    return variants;
   }
 
   /**
-   * List variables matching a scope prefix
+   * List variables with optional filters
    */
   list(options?: {
-    scope?: string;
+    namePrefix?: string;
+    exactName?: string;
+    schema?: Hash;
     tags?: Record<string, string>;
     labels?: string[];
   }): Variable[] {
-    const scope = options?.scope ?? "";
+    // Validate mutually exclusive options
+    if (options?.namePrefix !== undefined && options?.exactName !== undefined) {
+      throw new Error(
+        "namePrefix and exactName are mutually exclusive - cannot specify both",
+      );
+    }
+
+    const namePrefix = options?.namePrefix ?? "";
+    const exactName = options?.exactName;
+    const schema = options?.schema;
     const filterTags = options?.tags ?? {};
     const filterLabels = options?.labels ?? [];
 
-    // Validate scope format (must end with / if non-empty)
-    if (scope !== "" && !scope.endsWith("/")) {
-      throw new InvalidScopeError(scope);
-    }
-
-    // Build query with tag/label filtering
+    // Build query with filters
     let query = `
-      SELECT DISTINCT v.id, v.scope, v.value, v.schema, v.created, v.updated
+      SELECT DISTINCT v.name, v.schema, v.value, v.created, v.updated
       FROM variables v
     `;
 
@@ -357,7 +528,8 @@ export class VariableStore {
       const key = tagKeys[i] as string;
       const value = filterTags[key] as string;
       query += `
-        INNER JOIN variable_tags t${i} ON v.id = t${i}.variable_id
+        INNER JOIN variable_tags t${i} ON v.name = t${i}.variable_name
+          AND v.schema = t${i}.variable_schema
           AND t${i}.key = ? AND t${i}.value = ?
       `;
       params.push(key, value);
@@ -367,36 +539,52 @@ export class VariableStore {
     for (let i = 0; i < filterLabels.length; i++) {
       const label = filterLabels[i] as string;
       query += `
-        INNER JOIN variable_labels l${i} ON v.id = l${i}.variable_id
+        INNER JOIN variable_labels l${i} ON v.name = l${i}.variable_name
+          AND v.schema = l${i}.variable_schema
           AND l${i}.name = ?
       `;
       params.push(label);
     }
 
-    // Scope filter (always present)
-    query += " WHERE v.scope LIKE ? || '%'";
-    params.push(scope);
+    // WHERE clause for name filters and schema
+    const whereClauses: string[] = [];
+
+    if (exactName !== undefined) {
+      whereClauses.push("v.name = ?");
+      params.push(exactName);
+    } else if (namePrefix !== "") {
+      whereClauses.push("v.name LIKE ? || '%'");
+      params.push(namePrefix);
+    }
+
+    if (schema !== undefined) {
+      whereClauses.push("v.schema = ?");
+      params.push(schema);
+    }
+
+    if (whereClauses.length > 0) {
+      query += ` WHERE ${whereClauses.join(" AND ")}`;
+    }
+
     query += " ORDER BY v.created ASC";
 
     const stmt = this.db.prepare(query);
     const rows = stmt.all(...params) as Array<{
-      id: string;
-      scope: string;
-      value: string;
+      name: string;
       schema: string;
+      value: string;
       created: number;
       updated: number;
     }>;
 
     return rows.map((row) => ({
-      id: row.id,
-      scope: row.scope,
-      value: row.value,
+      name: row.name,
       schema: row.schema,
+      value: row.value,
       created: row.created,
       updated: row.updated,
-      tags: this.loadTags(row.id),
-      labels: this.loadLabels(row.id),
+      tags: this.loadTags(row.name, row.schema),
+      labels: this.loadLabels(row.name, row.schema),
     }));
   }
 
@@ -404,16 +592,20 @@ export class VariableStore {
    * Add/update/delete tags and labels
    */
   tag(
-    id: VariableId,
+    name: string,
+    schema: Hash,
     operations: {
       add?: Record<string, string>; // tags to add/update
       addLabels?: string[]; // labels to add
       delete?: string[]; // tag keys or label names to delete
     },
   ): Variable {
-    const existing = this.get(id);
+    // Validate name format
+    this.validateName(name);
+
+    const existing = this.get(name, schema);
     if (existing === null) {
-      throw new VariableNotFoundError(id);
+      throw new VariableNotFoundError(name, schema);
     }
 
     const addTags = operations.add ?? {};
@@ -433,14 +625,17 @@ export class VariableStore {
       }
     }
 
-    for (const name of addLabels) {
+    for (const labelName of addLabels) {
       // Check if this name is being added as a tag in the same operation
-      if (newTagKeys.includes(name)) {
-        throw new TagLabelConflictError(name, "tag", "label");
+      if (newTagKeys.includes(labelName)) {
+        throw new TagLabelConflictError(labelName, "tag", "label");
       }
       // Check if this name already exists as a tag key (and not being deleted)
-      if (existing.tags[name] !== undefined && !deleteNames.includes(name)) {
-        throw new TagLabelConflictError(name, "tag", "label");
+      if (
+        existing.tags[labelName] !== undefined &&
+        !deleteNames.includes(labelName)
+      ) {
+        throw new TagLabelConflictError(labelName, "tag", "label");
       }
     }
 
@@ -451,43 +646,43 @@ export class VariableStore {
     try {
       // Update timestamp
       const updateStmt = this.db.prepare(`
-        UPDATE variables SET updated = ? WHERE id = ?
+        UPDATE variables SET updated = ? WHERE name = ? AND schema = ?
       `);
-      updateStmt.run(now, id);
+      updateStmt.run(now, name, schema);
 
       // Delete tags and labels
       if (deleteNames.length > 0) {
         const deleteTagStmt = this.db.prepare(`
-          DELETE FROM variable_tags WHERE variable_id = ? AND key = ?
+          DELETE FROM variable_tags WHERE variable_name = ? AND variable_schema = ? AND key = ?
         `);
         const deleteLabelStmt = this.db.prepare(`
-          DELETE FROM variable_labels WHERE variable_id = ? AND name = ?
+          DELETE FROM variable_labels WHERE variable_name = ? AND variable_schema = ? AND name = ?
         `);
-        for (const name of deleteNames) {
-          deleteTagStmt.run(id, name);
-          deleteLabelStmt.run(id, name);
+        for (const deleteName of deleteNames) {
+          deleteTagStmt.run(name, schema, deleteName);
+          deleteLabelStmt.run(name, schema, deleteName);
         }
       }
 
       // Add or update tags
       if (newTagKeys.length > 0) {
         const tagStmt = this.db.prepare(`
-          INSERT OR REPLACE INTO variable_tags (variable_id, key, value)
-          VALUES (?, ?, ?)
+          INSERT OR REPLACE INTO variable_tags (variable_name, variable_schema, key, value)
+          VALUES (?, ?, ?, ?)
         `);
         for (const [key, value] of Object.entries(addTags)) {
-          tagStmt.run(id, key, value);
+          tagStmt.run(name, schema, key, value);
         }
       }
 
       // Add labels (with conflict handling)
       if (addLabels.length > 0) {
         const labelStmt = this.db.prepare(`
-          INSERT OR IGNORE INTO variable_labels (variable_id, name)
-          VALUES (?, ?)
+          INSERT OR IGNORE INTO variable_labels (variable_name, variable_schema, name)
+          VALUES (?, ?, ?)
         `);
-        for (const name of addLabels) {
-          labelStmt.run(id, name);
+        for (const labelName of addLabels) {
+          labelStmt.run(name, schema, labelName);
         }
       }
 
@@ -498,9 +693,9 @@ export class VariableStore {
     }
 
     // Return updated variable
-    const updated = this.get(id);
+    const updated = this.get(name, schema);
     if (updated === null) {
-      throw new VariableNotFoundError(id);
+      throw new VariableNotFoundError(name, schema);
     }
     return updated;
   }

packages/json-cas/src/variable-tags-labels.test.ts

@@ -1,740 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { unlinkSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { createMemoryStore } from "./store.js";
-import type { Store } from "./types.js";
-import {
-  TagLabelConflictError,
-  VariableNotFoundError,
-  VariableStore,
-} from "./variable-store.js";
-
-describe("VariableStore - Tags and Labels (RFC-20 Phase 2)", () => {
-  let store: Store;
-  let varStore: VariableStore;
-  let dbPath: string;
-  let schemaHash: string;
-  let hashA: string;
-  let hashB: string;
-  let hashC: string;
-
-  beforeEach(async () => {
-    dbPath = join(tmpdir(), `test-variables-phase2-${Date.now()}.db`);
-    store = createMemoryStore();
-
-    // Create test schema
-    schemaHash = await store.put("BOOTSTRAPHASH", {
-      type: "object",
-      properties: { name: { type: "string" } },
-    });
-
-    // Create test CAS nodes
-    hashA = await store.put(schemaHash, { name: "a" });
-    hashB = await store.put(schemaHash, { name: "b" });
-    hashC = await store.put(schemaHash, { name: "c" });
-
-    varStore = new VariableStore(dbPath, store);
-  });
-
-  afterEach(() => {
-    varStore.close();
-    try {
-      unlinkSync(dbPath);
-    } catch {
-      // Ignore cleanup errors
-    }
-  });
-
-  describe("Test Group 0: Setup and Backward Compatibility", () => {
-    test("0.1: Create variable without tags/labels", () => {
-      const variable = varStore.create("uwf/thread/", hashA);
-
-      expect(variable.tags).toEqual({});
-      expect(variable.labels).toEqual([]);
-      expect(variable.id).toMatch(/^[0-9A-HJKMNP-TV-Z]{26}$/);
-      expect(variable.scope).toBe("uwf/thread/");
-      expect(variable.value).toBe(hashA);
-    });
-
-    test("0.2: Get variable returns empty tags and labels", () => {
-      const created = varStore.create("uwf/thread/", hashA);
-      const retrieved = varStore.get(created.id);
-
-      expect(retrieved).not.toBeNull();
-      expect(retrieved?.tags).toEqual({});
-      expect(retrieved?.labels).toEqual([]);
-    });
-
-    test("0.3: Create variable with initial tags", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active", workflow: "solve-issue" },
-      });
-
-      expect(variable.tags).toEqual({
-        status: "active",
-        workflow: "solve-issue",
-      });
-      expect(variable.labels).toEqual([]);
-    });
-
-    test("0.4: Create variable with initial labels", () => {
-      const variable = varStore.create("uwf/workflow/", hashC, {
-        labels: ["pinned"],
-      });
-
-      expect(variable.tags).toEqual({});
-      expect(variable.labels).toEqual(["pinned"]);
-    });
-
-    test("0.5: Create variable with both tags and labels", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-        labels: ["pinned"],
-      });
-
-      expect(variable.tags).toEqual({ status: "active" });
-      expect(variable.labels).toEqual(["pinned"]);
-    });
-
-    test("0.6: Create variable with conflicting tag/label throws error", () => {
-      expect(() =>
-        varStore.create("uwf/thread/", hashA, {
-          tags: { workflow: "solve-issue" },
-          labels: ["workflow"],
-        }),
-      ).toThrow(TagLabelConflictError);
-    });
-  });
-
-  describe("Test Group 1: Tag Operations", () => {
-    test("1.1: Add tag to existing variable", async () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      await new Promise((resolve) => setTimeout(resolve, 10));
-
-      const updated = varStore.tag(variable.id, {
-        add: { priority: "high" },
-      });
-
-      expect(updated.tags).toEqual({
-        status: "active",
-        priority: "high",
-      });
-      expect(updated.updated).toBeGreaterThan(variable.updated);
-    });
-
-    test("1.2: Tag same-key override", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      const updated = varStore.tag(variable.id, {
-        add: { status: "completed" },
-      });
-
-      expect(updated.tags).toEqual({ status: "completed" });
-      expect(Object.keys(updated.tags)).toHaveLength(1);
-    });
-
-    test("1.3: Delete tag using delete array", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active", workflow: "solve-issue" },
-      });
-
-      const updated = varStore.tag(variable.id, {
-        delete: ["status"],
-      });
-
-      expect(updated.tags).toEqual({ workflow: "solve-issue" });
-      expect(updated.tags.status).toBeUndefined();
-    });
-
-    test("1.4: Delete non-existent tag is idempotent", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      const updated = varStore.tag(variable.id, {
-        delete: ["nonexistent"],
-      });
-
-      expect(updated.tags).toEqual({ status: "active" });
-    });
-
-    test("1.5: Multiple tag operations in single call", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active", workflow: "solve-issue" },
-      });
-
-      const updated = varStore.tag(variable.id, {
-        add: { env: "production", region: "us-west" },
-        delete: ["workflow"],
-      });
-
-      expect(updated.tags).toEqual({
-        status: "active",
-        env: "production",
-        region: "us-west",
-      });
-    });
-
-    test("1.6: Delete then add same key in single operation", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      const updated = varStore.tag(variable.id, {
-        delete: ["status"],
-        add: { status: "new" },
-      });
-
-      expect(updated.tags).toEqual({ status: "new" });
-    });
-  });
-
-  describe("Test Group 2: Label Operations", () => {
-    test("2.1: Add label to existing variable", () => {
-      const variable = varStore.create("uwf/thread/", hashA);
-
-      const updated = varStore.tag(variable.id, {
-        addLabels: ["archived"],
-      });
-
-      expect(updated.labels).toContain("archived");
-      expect(updated.labels).toHaveLength(1);
-    });
-
-    test("2.2: Delete label using delete array", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        labels: ["archived", "pinned"],
-      });
-
-      const updated = varStore.tag(variable.id, {
-        delete: ["archived"],
-      });
-
-      expect(updated.labels).toEqual(["pinned"]);
-    });
-
-    test("2.3: Add duplicate label is idempotent", () => {
-      const variable = varStore.create("uwf/workflow/", hashC, {
-        labels: ["pinned"],
-      });
-
-      const updated = varStore.tag(variable.id, {
-        addLabels: ["pinned"],
-      });
-
-      expect(updated.labels).toEqual(["pinned"]);
-    });
-
-    test("2.4: Multiple label operations in single call", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        labels: ["archived"],
-      });
-
-      const updated = varStore.tag(variable.id, {
-        addLabels: ["experimental", "deprecated"],
-        delete: ["archived"],
-      });
-
-      expect(updated.labels).toHaveLength(2);
-      expect(updated.labels).toContain("experimental");
-      expect(updated.labels).toContain("deprecated");
-      expect(updated.labels).not.toContain("archived");
-    });
-  });
-
-  describe("Test Group 3: Tag/Label Mutual Exclusion", () => {
-    test("3.1: Label conflicts with existing tag key", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { workflow: "solve-issue" },
-      });
-
-      expect(() =>
-        varStore.tag(variable.id, {
-          addLabels: ["workflow"],
-        }),
-      ).toThrow(TagLabelConflictError);
-
-      // Verify variable state unchanged
-      const retrieved = varStore.get(variable.id);
-      expect(retrieved?.tags).toEqual({ workflow: "solve-issue" });
-      expect(retrieved?.labels).toEqual([]);
-    });
-
-    test("3.2: Tag conflicts with existing label", () => {
-      const variable = varStore.create("uwf/workflow/", hashC, {
-        labels: ["pinned"],
-      });
-
-      expect(() =>
-        varStore.tag(variable.id, {
-          add: { pinned: "true" },
-        }),
-      ).toThrow(TagLabelConflictError);
-
-      // Verify variable state unchanged
-      const retrieved = varStore.get(variable.id);
-      expect(retrieved?.tags).toEqual({});
-      expect(retrieved?.labels).toEqual(["pinned"]);
-    });
-
-    test("3.3: Delete then add resolves conflict", () => {
-      const variable = varStore.create("uwf/workflow/", hashC, {
-        labels: ["pinned"],
-      });
-
-      const updated = varStore.tag(variable.id, {
-        delete: ["pinned"],
-        add: { pinned: "true" },
-      });
-
-      expect(updated.tags).toEqual({ pinned: "true" });
-      expect(updated.labels).toEqual([]);
-    });
-
-    test("3.4: Simultaneous conflicting operations in same call", () => {
-      const variable = varStore.create("uwf/thread/", hashA);
-
-      expect(() =>
-        varStore.tag(variable.id, {
-          add: { newkey: "value" },
-          addLabels: ["newkey"],
-        }),
-      ).toThrow(TagLabelConflictError);
-    });
-  });
-
-  describe("Test Group 4: Query - Scope Filtering", () => {
-    test("4.1: List with exact scope match", () => {
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-      const var2 = varStore.create("uwf/thread/", hashB, {
-        tags: { status: "completed" },
-      });
-      varStore.create("uwf/workflow/", hashC);
-
-      const results = varStore.list({ scope: "uwf/thread/" });
-
-      expect(results).toHaveLength(2);
-      expect(results.map((v) => v.id)).toContain(var1.id);
-      expect(results.map((v) => v.id)).toContain(var2.id);
-    });
-
-    test("4.2: List with scope prefix match", () => {
-      const var1 = varStore.create("uwf/thread/", hashA);
-      const var2 = varStore.create("uwf/thread/", hashB);
-      const var3 = varStore.create("uwf/workflow/", hashC);
-
-      const results = varStore.list({ scope: "uwf/" });
-
-      expect(results).toHaveLength(3);
-      expect(results.map((v) => v.id)).toContain(var1.id);
-      expect(results.map((v) => v.id)).toContain(var2.id);
-      expect(results.map((v) => v.id)).toContain(var3.id);
-    });
-
-    test("4.3: List all variables (no scope filter)", () => {
-      const var1 = varStore.create("uwf/thread/", hashA);
-      const var2 = varStore.create("app/config/", hashB);
-
-      const results = varStore.list();
-
-      expect(results).toHaveLength(2);
-      expect(results.map((v) => v.id)).toContain(var1.id);
-      expect(results.map((v) => v.id)).toContain(var2.id);
-    });
-
-    test("4.4: List with non-matching scope returns empty", () => {
-      varStore.create("uwf/thread/", hashA);
-
-      const results = varStore.list({ scope: "app/config/" });
-
-      expect(results).toEqual([]);
-    });
-  });
-
-  describe("Test Group 5: Query - Tag Filtering", () => {
-    test("5.1: Filter by tag key-value pair", () => {
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "completed" },
-      });
-      const var2 = varStore.create("uwf/thread/", hashB, {
-        tags: { status: "completed" },
-      });
-      varStore.create("uwf/thread/", hashC, {
-        tags: { status: "active" },
-      });
-
-      const results = varStore.list({
-        tags: { status: "completed" },
-      });
-
-      expect(results).toHaveLength(2);
-      expect(results.map((v) => v.id)).toContain(var1.id);
-      expect(results.map((v) => v.id)).toContain(var2.id);
-    });
-
-    test("5.2: Filter by non-existent tag returns empty", () => {
-      varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      const results = varStore.list({
-        tags: { nonexistent: "value" },
-      });
-
-      expect(results).toEqual([]);
-    });
-
-    test("5.3: Multiple tag filters use AND logic", () => {
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "completed", priority: "high" },
-      });
-      varStore.create("uwf/thread/", hashB, {
-        tags: { status: "completed", priority: "low" },
-      });
-      varStore.create("uwf/thread/", hashC, {
-        tags: { status: "active", priority: "high" },
-      });
-
-      const results = varStore.list({
-        tags: { status: "completed", priority: "high" },
-      });
-
-      expect(results).toHaveLength(1);
-      expect(results[0]?.id).toBe(var1.id);
-    });
-  });
-
-  describe("Test Group 6: Query - Label Filtering", () => {
-    test("6.1: Filter by label", () => {
-      const var1 = varStore.create("uwf/workflow/", hashA, {
-        labels: ["pinned"],
-      });
-      varStore.create("uwf/workflow/", hashB);
-
-      const results = varStore.list({
-        labels: ["pinned"],
-      });
-
-      expect(results).toHaveLength(1);
-      expect(results[0]?.id).toBe(var1.id);
-    });
-
-    test("6.2: Filter by non-existent label returns empty", () => {
-      varStore.create("uwf/workflow/", hashA, {
-        labels: ["pinned"],
-      });
-
-      const results = varStore.list({
-        labels: ["nonexistent"],
-      });
-
-      expect(results).toEqual([]);
-    });
-
-    test("6.3: Multiple label filters use AND logic", () => {
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        labels: ["experimental", "deprecated"],
-      });
-      varStore.create("uwf/thread/", hashB, {
-        labels: ["experimental"],
-      });
-
-      const results = varStore.list({
-        labels: ["experimental", "deprecated"],
-      });
-
-      expect(results).toHaveLength(1);
-      expect(results[0]?.id).toBe(var1.id);
-    });
-  });
-
-  describe("Test Group 7: Query - Combined Filtering", () => {
-    test("7.1: Scope + tag filter", () => {
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "completed" },
-      });
-      const var2 = varStore.create("uwf/thread/", hashB, {
-        tags: { status: "completed" },
-      });
-      varStore.create("uwf/workflow/", hashC, {
-        tags: { status: "completed" },
-      });
-
-      const results = varStore.list({
-        scope: "uwf/thread/",
-        tags: { status: "completed" },
-      });
-
-      expect(results).toHaveLength(2);
-      expect(results.map((v) => v.id)).toContain(var1.id);
-      expect(results.map((v) => v.id)).toContain(var2.id);
-    });
-
-    test("7.2: Scope + label filter", () => {
-      const var1 = varStore.create("uwf/workflow/", hashA, {
-        labels: ["pinned"],
-      });
-      varStore.create("uwf/thread/", hashB, {
-        labels: ["pinned"],
-      });
-
-      const results = varStore.list({
-        scope: "uwf/workflow/",
-        labels: ["pinned"],
-      });
-
-      expect(results).toHaveLength(1);
-      expect(results[0]?.id).toBe(var1.id);
-    });
-
-    test("7.3: Scope + multiple filters", () => {
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "completed", priority: "high" },
-      });
-      varStore.create("uwf/thread/", hashB, {
-        tags: { status: "completed" },
-      });
-      varStore.create("uwf/workflow/", hashC, {
-        tags: { status: "completed", priority: "high" },
-      });
-
-      const results = varStore.list({
-        scope: "uwf/",
-        tags: { status: "completed", priority: "high" },
-      });
-
-      expect(results).toHaveLength(2);
-      expect(results.map((v) => v.id)).toContain(var1.id);
-    });
-
-    test("7.4: Combined filters with no matches", () => {
-      varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      const results = varStore.list({
-        scope: "app/",
-        tags: { status: "completed" },
-      });
-
-      expect(results).toEqual([]);
-    });
-  });
-
-  describe("Test Group 8: Edge Cases and Error Handling", () => {
-    test("8.1: Tag operation on non-existent variable", () => {
-      const fakeId = "01ARZ3NDEKTSV4RRFFQ69G5FAV";
-
-      expect(() =>
-        varStore.tag(fakeId, {
-          add: { key: "value" },
-        }),
-      ).toThrow(VariableNotFoundError);
-    });
-
-    test("8.2: Special characters in tag keys/values", () => {
-      const variable = varStore.create("uwf/thread/", hashA);
-
-      const updated = varStore.tag(variable.id, {
-        add: { "env:region": "prod-us_west.2" },
-      });
-
-      expect(updated.tags).toEqual({ "env:region": "prod-us_west.2" });
-    });
-
-    test("8.3: Unicode in tag/label names", () => {
-      const variable = varStore.create("uwf/thread/", hashA);
-
-      const updated = varStore.tag(variable.id, {
-        add: { 语言: "中文" },
-        addLabels: ["测试"],
-      });
-
-      expect(updated.tags).toEqual({ 语言: "中文" });
-      expect(updated.labels).toContain("测试");
-
-      // Verify persistence
-      const retrieved = varStore.get(variable.id);
-      expect(retrieved?.tags).toEqual({ 语言: "中文" });
-      expect(retrieved?.labels).toContain("测试");
-    });
-
-    test("8.4: Empty tag key or value", () => {
-      const variable = varStore.create("uwf/thread/", hashA);
-
-      // Empty key
-      const updated1 = varStore.tag(variable.id, {
-        add: { "": "value" },
-      });
-      expect(updated1.tags).toEqual({ "": "value" });
-
-      // Empty value
-      const updated2 = varStore.tag(variable.id, {
-        add: { key: "" },
-      });
-      expect(updated2.tags.key).toBe("");
-    });
-
-    test("8.5: Very long tag key/value", () => {
-      const variable = varStore.create("uwf/thread/", hashA);
-      const longKey = "k".repeat(1000);
-      const longValue = "v".repeat(1000);
-
-      const updated = varStore.tag(variable.id, {
-        add: { [longKey]: longValue },
-      });
-
-      expect(updated.tags[longKey]).toBe(longValue);
-    });
-  });
-
-  describe("Test Group 9: Database Integrity", () => {
-    test("9.1: Cascade delete for tags", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active", workflow: "solve-issue" },
-      });
-
-      varStore.delete(variable.id);
-
-      // Verify variable is deleted
-      const retrieved = varStore.get(variable.id);
-      expect(retrieved).toBeNull();
-    });
-
-    test("9.2: Cascade delete for labels", () => {
-      const variable = varStore.create("uwf/workflow/", hashA, {
-        labels: ["pinned", "archived"],
-      });
-
-      varStore.delete(variable.id);
-
-      const retrieved = varStore.get(variable.id);
-      expect(retrieved).toBeNull();
-    });
-
-    test("9.3: Tag update preserves other variable data", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      varStore.tag(variable.id, {
-        add: { priority: "high" },
-      });
-
-      const retrieved = varStore.get(variable.id);
-      expect(retrieved?.id).toBe(variable.id);
-      expect(retrieved?.scope).toBe(variable.scope);
-      expect(retrieved?.value).toBe(variable.value);
-      expect(retrieved?.schema).toBe(variable.schema);
-      expect(retrieved?.created).toBe(variable.created);
-    });
-  });
-
-  describe("Test Group 10: Batch Operations and Atomicity", () => {
-    test("10.1: Atomic tag operations", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active", workflow: "solve-issue" },
-      });
-
-      const updated = varStore.tag(variable.id, {
-        add: { priority: "low" },
-        addLabels: ["archived"],
-        delete: ["status"],
-      });
-
-      expect(updated.tags).toEqual({
-        workflow: "solve-issue",
-        priority: "low",
-      });
-      expect(updated.labels).toContain("archived");
-    });
-
-    test("10.2: Rollback on conflict error", () => {
-      const variable = varStore.create("uwf/thread/", hashA, {
-        tags: { workflow: "solve-issue" },
-      });
-
-      expect(() =>
-        varStore.tag(variable.id, {
-          add: { priority: "high" },
-          addLabels: ["workflow"], // Conflict!
-        }),
-      ).toThrow(TagLabelConflictError);
-
-      // Verify NO changes applied
-      const retrieved = varStore.get(variable.id);
-      expect(retrieved?.tags).toEqual({ workflow: "solve-issue" });
-      expect(retrieved?.labels).toEqual([]);
-    });
-  });
-
-  describe("Test Group 11: Integration Tests", () => {
-    test("11.1: Full workflow with tags and labels", async () => {
-      // Create with initial tags
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "active" },
-      });
-
-      await new Promise((resolve) => setTimeout(resolve, 10));
-
-      // Add more tags
-      varStore.tag(var1.id, {
-        add: { priority: "high", workflow: "solve-issue" },
-      });
-
-      // Add labels
-      varStore.tag(var1.id, {
-        addLabels: ["pinned"],
-      });
-
-      // Update variable value
-      const updated = varStore.update(var1.id, hashB);
-
-      // Verify tags/labels preserved
-      expect(updated.tags).toEqual({
-        status: "active",
-        priority: "high",
-        workflow: "solve-issue",
-      });
-      expect(updated.labels).toContain("pinned");
-
-      // Delete variable
-      varStore.delete(var1.id);
-
-      // Verify deletion
-      const retrieved = varStore.get(var1.id);
-      expect(retrieved).toBeNull();
-    });
-
-    test("11.2: Query with complex filtering", () => {
-      const var1 = varStore.create("uwf/thread/", hashA, {
-        tags: { status: "completed", priority: "high" },
-        labels: ["archived"],
-      });
-      varStore.create("uwf/thread/", hashB, {
-        tags: { status: "completed", priority: "low" },
-      });
-      varStore.create("uwf/workflow/", hashC, {
-        tags: { status: "completed", priority: "high" },
-        labels: ["archived"],
-      });
-
-      const results = varStore.list({
-        scope: "uwf/thread/",
-        tags: { status: "completed", priority: "high" },
-        labels: ["archived"],
-      });
-
-      expect(results).toHaveLength(1);
-      expect(results[0]?.id).toBe(var1.id);
-    });
-  });
-});

packages/json-cas/src/variable.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, test } from "bun:test";
+import type { Variable } from "./variable.js";
+
+describe("Variable Type", () => {
+  test("Variable type uses (name, schema) composite key", () => {
+    const variable: Variable = {
+      name: "config",
+      schema: "ABC123DEF4567",
+      value: "XYZ789GHI0123",
+      created: 1234567890000,
+      updated: 1234567890000,
+      tags: { env: "prod" },
+      labels: ["critical"],
+    };
+
+    expect(variable.name).toBe("config");
+    expect(variable.schema).toBe("ABC123DEF4567");
+    // id and scope should not exist
+    expect((variable as unknown as { id?: unknown }).id).toBeUndefined();
+    expect((variable as unknown as { scope?: unknown }).scope).toBeUndefined();
+  });
+});

packages/json-cas/src/variable.ts

@@ -1,18 +1,13 @@
 import type { Hash } from "./types.js";
 
-/**
- * ULID identifier (26-character Crockford Base32)
- */
-export type VariableId = string;
-
 /**
  * Variable: mutable binding to an immutable CAS node
+ * Identified by composite key (name, schema)
  */
 export type Variable = {
-  id: VariableId;
-  scope: string; // hierarchical path, must end with /
+  name: string; // variable name (unique per schema)
+  schema: Hash; // schema hash (part of composite key)
   value: Hash; // CAS node hash
-  schema: Hash; // extracted from value's CAS node.type
   created: number; // epoch ms
   updated: number; // epoch ms
   tags: Record<string, string>; // key-value pairs