@zaip-ai/cli 1.4.3 → 2.2.0

package/templates/.agents/dashboard/packages/local-runtime/src/server-identity.test.ts

@@ -0,0 +1,42 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { WorkspaceFileSystem } from "@zaip-ai/core";
+import { describe, expect, it, vi } from "vitest";
+import { createDashboardApp, githubRepositoryFromRemote } from "./server.js";
+
+describe("dashboard identity endpoint", () => {
+  it("normalizes GitHub HTTPS and SSH remotes for display", () => {
+    expect(githubRepositoryFromRemote("git@github.com:zaip-ai/zaip-aios.git")).toBe(
+      "zaip-ai/zaip-aios",
+    );
+    expect(githubRepositoryFromRemote("https://github.com/zaip-ai/zaip-aios.git")).toBe(
+      "zaip-ai/zaip-aios",
+    );
+    expect(githubRepositoryFromRemote("zaip-ai/zaip-aios")).toBe("zaip-ai/zaip-aios");
+    expect(githubRepositoryFromRemote("")).toBeNull();
+    expect(githubRepositoryFromRemote("https://gitlab.com/zaip-ai/zaip-aios.git")).toBeNull();
+  });
+  it("serves authenticated dashboard identity without building or refreshing a projection", async () => {
+    const root = await mkdtemp(join(tmpdir(), "zaip-dashboard-identity-"));
+    const refreshReadModel = vi.fn(async () => {});
+    try {
+      const app = createDashboardApp(root, "test-session", undefined, {
+        filesystem: new WorkspaceFileSystem(root),
+        refreshReadModel,
+      });
+      const response = await app.request("/api/v2/dashboard-identity", {
+        headers: { "x-zaip-session": "test-session" },
+      });
+
+      expect(response.status, await response.clone().text()).toBe(200);
+      await expect(response.json()).resolves.toEqual({
+        title: "Dashboard Zaip AIOS",
+        repository_name: "",
+      });
+      expect(refreshReadModel).not.toHaveBeenCalled();
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+});

package/templates/.agents/dashboard/packages/local-runtime/src/server-snapshot-synchronization.test.ts

@@ -0,0 +1,41 @@
+import { join } from "node:path";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const watchers: Array<{ path: string; listener: () => void }> = [];
+
+vi.mock("node:fs", () => ({
+  watch: vi.fn((path: string, _options: unknown, listener: () => void) => {
+    watchers.push({ path, listener });
+    return { unref: vi.fn() };
+  }),
+}));
+
+import { startSnapshotSynchronization } from "./server-snapshot-synchronization.js";
+
+afterEach(() => {
+  watchers.splice(0);
+  vi.useRealTimers();
+  vi.unstubAllEnvs();
+});
+
+describe("snapshot source synchronization", () => {
+  it("watches current data for both creation and alteration refreshes", async () => {
+    vi.useFakeTimers();
+    const refresh = vi.fn(async () => undefined);
+    const workspaceRoot = "C:/workspace";
+
+    startSnapshotSynchronization({ workspaceRoot, staleSeed: false, watchSources: true, refresh });
+
+    const currentData = watchers.find(
+      ({ path }) => path === join(workspaceRoot, ".agents", "data"),
+    );
+    expect(currentData).toBeDefined();
+    currentData?.listener();
+    await vi.advanceTimersByTimeAsync(300);
+    expect(refresh).toHaveBeenCalledTimes(1);
+
+    currentData?.listener();
+    await vi.advanceTimersByTimeAsync(300);
+    expect(refresh).toHaveBeenCalledTimes(2);
+  });
+});

package/templates/.agents/dashboard/packages/local-runtime/src/server-snapshot-synchronization.ts

@@ -19,6 +19,7 @@ export function startSnapshotSynchronization(input: {
     pendingRefresh.unref();
   };
   for (const sourceRoot of [
+    join(input.workspaceRoot, ".agents", "data"),
     join(input.workspaceRoot, ".agents", "records"),
     join(input.workspaceRoot, ".agents", "config"),
   ]) {

package/templates/.agents/dashboard/packages/local-runtime/src/server-snapshot.test.ts

@@ -45,7 +45,7 @@ describe("dashboard backend snapshot", () => {
       [
         "lock_version: 1",
         "framework:",
-        "  version: 1.3.0",
+        "  version: 2.2.0",
         "  distribution_sha256: null",
         "layout:",
         "  version: 3",
@@ -510,7 +510,7 @@ describe("dashboard backend snapshot", () => {
       });
       await expect(response.json()).resolves.toMatchObject({
         dashboard: {
-          title: "Dashboard Zaip AIOS SQLite",
+          title: "Dashboard Zaip AIOS",
           repository_name: "",
         },
         operations: { readonly: true, summary: { source_latest_at: "2026-07-14T00:00:05.000Z" } },

package/templates/.agents/dashboard/packages/local-runtime/src/server-sqlite-task-trace.ts

@@ -1,11 +1,11 @@
 import { createHash } from "node:crypto";
 import type { WorkspaceLayout } from "@zaip-ai/core";
+import type { TaskTrace, TraceDocument } from "@zaip-ai/dashboard-traceability/contracts";
 import {
   buildTraceStageRecords,
   classifyTraceDocument,
   timestampsFromContent,
 } from "@zaip-ai/dashboard-traceability/server";
-import type { TaskTrace, TraceDocument } from "../../../modules/traceability/src/contracts.js";
 import type { SqliteReadModelFileSystem } from "./sqlite-read-model.js";
 
 export function buildSqliteTaskTrace(
@@ -16,7 +16,10 @@ export function buildSqliteTaskTrace(
   const initial = filesystem.canonicalTraceFiles([taskId]);
   const taskFile = initial.find(
     (row) =>
-      row.path.includes("/.agents/records/tasks/") || row.path.includes(".agents/records/tasks/"),
+      row.path.includes("/.agents/data/tasks/") ||
+      row.path.includes(".agents/data/tasks/") ||
+      row.path.includes("/.agents/records/tasks/") ||
+      row.path.includes(".agents/records/tasks/"),
   );
   if (taskFile === undefined) throw new Error(`Canonical Task ${taskId} was not found`);
   const scalar = (key: string): string | null => {
@@ -59,7 +62,7 @@ export function buildSqliteTaskTrace(
     schema_version: 2,
     layout_version: layout.version as 2 | 3,
     readonly: true,
-    source: ".agents/records",
+    source: filesystem.canonicalSource(),
     task_id: taskId,
     task_title: scalar("title") ?? taskFile.content.match(/^#\s+(.+)$/m)?.[1]?.trim() ?? taskId,
     task_risk: risk === "lite" || risk === "standard" || risk === "critical" ? risk : null,

package/templates/.agents/dashboard/packages/local-runtime/src/server-workspace.ts

@@ -11,7 +11,7 @@ export async function dashboardIdentity(
   filesystem: WorkspaceFileSystem,
   workspaceRoot: string,
 ): Promise<{ title: string; repository_name: string }> {
-  let title = process.env.ZAIP_DASHBOARD_TITLE?.trim() || "Dashboard Zaip AIOS SQLite";
+  let title = process.env.ZAIP_DASHBOARD_TITLE?.trim() || "Dashboard Zaip AIOS";
   let repositorySetting = "auto";
   try {
     if (await filesystem.exists(DASHBOARD_CONFIG_PATH)) {

package/templates/.agents/dashboard/packages/local-runtime/src/server.test-fixtures.ts

@@ -20,7 +20,7 @@ export async function withSqliteReadModelFixture<T>(
     );
     await writeFile(
       join(root, ".agents", "config", "framework.lock.yaml"),
-      "lock_version: 1\nframework:\n  version: 1.3.0\n  distribution_sha256: null\nlayout:\n  version: 3\nresolved_profile:\n  id: null\n  sha256: null\nmanaged_files: {}\n",
+      "lock_version: 1\nframework:\n  version: 2.2.0\n  distribution_sha256: null\nlayout:\n  version: 3\nresolved_profile:\n  id: null\n  sha256: null\nmanaged_files: {}\n",
     );
     await rebuildSqliteReadModel(root);
     filesystem = new SqliteReadModelFileSystem(root);

package/templates/.agents/dashboard/packages/local-runtime/src/server.test.ts

@@ -6,7 +6,6 @@ import { describe, expect, it, vi } from "vitest";
 import {
   createDashboardApp,
   dashboardWorkspaceKey,
-  githubRepositoryFromRemote,
   manifestRun,
   mergeManifestRuns,
   openWorkIds,
@@ -107,17 +106,6 @@ describe("dashboard backend", () => {
       ),
     ).toEqual(["RUN-IN-PERIOD"]);
   });
-  it("normalizes GitHub HTTPS and SSH remotes for display", () => {
-    expect(githubRepositoryFromRemote("git@github.com:zaip-ai/zaip-aios.git")).toBe(
-      "zaip-ai/zaip-aios",
-    );
-    expect(githubRepositoryFromRemote("https://github.com/zaip-ai/zaip-aios.git")).toBe(
-      "zaip-ai/zaip-aios",
-    );
-    expect(githubRepositoryFromRemote("zaip-ai/zaip-aios")).toBe("zaip-ai/zaip-aios");
-    expect(githubRepositoryFromRemote("")).toBeNull();
-    expect(githubRepositoryFromRemote("https://gitlab.com/zaip-ai/zaip-aios.git")).toBeNull();
-  });
   it("exposes a modern read-only health endpoint", async () => {
     const app = createDashboardApp(workspaceRoot, "test-session");
     const response = await app.request("/api/v2/health");
@@ -294,7 +282,7 @@ describe("dashboard backend", () => {
     );
     await writeFile(
       join(fixtureRoot, ".agents", "config", "framework.lock.yaml"),
-      "lock_version: 1\nframework:\n  version: 1.3.0\n  distribution_sha256: null\nlayout:\n  version: 3\nresolved_profile:\n  id: null\n  sha256: null\nmanaged_files: {}\n",
+      "lock_version: 1\nframework:\n  version: 2.2.0\n  distribution_sha256: null\nlayout:\n  version: 3\nresolved_profile:\n  id: null\n  sha256: null\nmanaged_files: {}\n",
     );
     const task = (status: "executing" | "completed") => ({
       schema_version: 1,

package/templates/.agents/dashboard/packages/local-runtime/src/server.ts

@@ -389,6 +389,7 @@ function buildSqliteOperationsProjection(
   const hasUnknownUsage = Object.values(dailyPeriods).some(
     (period) => period.usage.total_tokens.unknown > 0 || period.usage.cost.unknown > 0,
   );
+  const canonicalSource = filesystem.canonicalSource();
   const taskProjection = (row: Record<string, unknown>) => ({
     schema_version: 2 as const,
     id: String(row.id),
@@ -411,7 +412,7 @@ function buildSqliteOperationsProjection(
     started_at: null,
     finished_at: null,
     result: null,
-    artifact_path: ".agents/records",
+    artifact_path: canonicalSource,
     progress: 0,
     spec_id: typeof row.spec_id === "string" ? row.spec_id : null,
     origin: typeof row.origin === "string" ? row.origin : null,
@@ -435,7 +436,7 @@ function buildSqliteOperationsProjection(
       updated_at: String(row.occurred_at),
       kind,
       parent_id: null,
-      artifact_path: ".agents/records",
+      artifact_path: canonicalSource,
       lifecycle_status: String(row.status ?? "draft"),
       work_status: normalizeMacroStatus(row.status),
       execution_ids: [],
@@ -472,7 +473,7 @@ function buildSqliteOperationsProjection(
     schema_version: 2,
     layout_version: layout.version as 2 | 3,
     readonly: true,
-    source: ".agents/records",
+    source: canonicalSource,
     filters: filter,
     summary: {
       prd_count: allTime?.aggregate.prd_count ?? prds.length,
@@ -939,6 +940,13 @@ export function createDashboardApp(
     }
   });
 
+  // Header identity is intentionally separate from Operations projections.
+  // The quick first fold omits it, and resolving this small configuration/git
+  // value must not read, refresh, or otherwise materialize a snapshot.
+  app.on(["GET", "HEAD"], `${API_PREFIX}/dashboard-identity`, async (context) =>
+    headOrJson(context, await dashboardIdentity(filesystem, workspaceRoot)),
+  );
+
   app.on(["GET", "HEAD"], `${API_PREFIX}/operations`, async (context) => {
     try {
       const requestStartedAt = performance.now();

package/templates/.agents/dashboard/packages/local-runtime/src/sqlite-incremental-refresh.test.ts

@@ -68,6 +68,61 @@ afterEach(async () => {
 });
 
 describe("incremental refresh preserves historical facts", () => {
+  it("keeps one current Run when a legacy duplicate is added and falls back after current deletion", async () => {
+    const root = await fixture();
+    await prepareMultiProviderFixture(root);
+    const legacy = join(root, ".agents/records/runs/2026/08/RUN-MULTI.jsonl");
+    const current = join(root, ".agents/data/runs/2026/08/RUN-MULTI.jsonl");
+    await mkdir(join(root, ".agents/data/runs/2026/08"), { recursive: true });
+    const content = await readFile(legacy, "utf8");
+    await writeFile(current, content);
+
+    const first = await rebuildSqliteReadModel(root);
+    const expected = inspect(
+      first.path,
+      "SELECT COUNT(*) AS count, SUM(total_tokens) AS tokens, SUM(cost_brl) AS cost FROM zaip_aios_activities WHERE payload_type IS NULL AND run_id='RUN-MULTI'",
+    );
+    expect(
+      inspect(
+        first.path,
+        "SELECT COUNT(*) AS count FROM zaip_vw_canonical_run_index WHERE run_id='RUN-MULTI'",
+      ),
+    ).toEqual([{ count: 1 }]);
+    // Establish a cached current-only generation before an upgrade leaves a
+    // duplicate legacy file behind.
+    await rm(legacy);
+    await rebuildSqliteReadModel(root);
+    await writeFile(legacy, content);
+    await expect(rebuildSqliteReadModel(root)).resolves.toMatchObject({ cache: "rebuilt" });
+    expect(
+      inspect(
+        first.path,
+        "SELECT COUNT(*) AS count FROM zaip_vw_canonical_run_index WHERE run_id='RUN-MULTI'",
+      ),
+    ).toEqual([{ count: 1 }]);
+    expect(
+      inspect(
+        first.path,
+        "SELECT COUNT(*) AS count, SUM(total_tokens) AS tokens, SUM(cost_brl) AS cost FROM zaip_aios_activities WHERE payload_type IS NULL AND run_id='RUN-MULTI'",
+      ),
+    ).toEqual(expected);
+    expect(
+      inspect(
+        first.path,
+        "SELECT source_path FROM zaip_aios_activities WHERE payload_type IS NULL AND run_id='RUN-MULTI'",
+      ),
+    ).toEqual([{ source_path: ".agents/data/runs/2026/08/RUN-MULTI.jsonl" }]);
+
+    await rm(current);
+    await expect(rebuildSqliteReadModel(root)).resolves.toMatchObject({ cache: "rebuilt" });
+    expect(
+      inspect(
+        first.path,
+        "SELECT COUNT(*) AS count, source_path FROM zaip_aios_activities WHERE payload_type IS NULL AND run_id='RUN-MULTI'",
+      ),
+    ).toEqual([{ count: 1, source_path: ".agents/records/runs/2026/08/RUN-MULTI.jsonl" }]);
+  }, 120_000);
+
   it("refreshes developer delivery and shared SPEC allocation from cached Run facts", async () => {
     const root = await fixture();
     await prepareMultiProviderFixture(root);

package/templates/.agents/dashboard/packages/local-runtime/src/sqlite-read-model-canonical.ts

@@ -117,7 +117,7 @@ export function readCanonicalLifecycleRecords(rows: Array<{ path: string; conten
     const id = stringValue(metadata.id);
     const createdAt = stringValue(metadata.created_at);
     if (id === null || createdAt === null || Number.isNaN(Date.parse(createdAt))) continue;
-    if (/^\.agents\/records\/executions\/.*\/execution\.md$/.test(row.path)) {
+    if (/^\.agents\/(?:data|records)\/executions\/.*\/execution\.md$/.test(row.path)) {
       const origin = recordValue(metadata.origin);
       const originType = stringValue(origin?.type);
       const originId =
@@ -142,7 +142,7 @@ export function readCanonicalLifecycleRecords(rows: Array<{ path: string; conten
       });
       continue;
     }
-    if (/^\.agents\/records\/changes\/.*\/change\.md$/.test(row.path)) {
+    if (/^\.agents\/(?:data|records)\/changes\/.*\/change\.md$/.test(row.path)) {
       const source = recordValue(metadata.source);
       const sourceType = stringValue(source?.type);
       const sourceId =
@@ -175,7 +175,9 @@ export function readCanonicalLifecycleRecords(rows: Array<{ path: string; conten
       });
       continue;
     }
-    if (/^\.agents\/records\/(changes|executions)\/.*\/decisions\/.*\.md$/.test(row.path)) {
+    if (
+      /^\.agents\/(?:data|records)\/(changes|executions)\/.*\/decisions\/.*\.md$/.test(row.path)
+    ) {
       const origin = metadata.origin;
       const scopeType = metadata.scope_type;
       const scopeId = stringValue(metadata.scope_id);
@@ -205,9 +207,10 @@ export function readCanonicalEntities(
 ): Map<string, CanonicalEntity> {
   const entities = new Map<string, CanonicalEntity>();
   for (const row of rows) {
-    const match = /^\.agents\/records\/(tasks|specs|prds|changes|executions|conversations)\//.exec(
-      row.path,
-    );
+    const match =
+      /^\.agents\/(?:data|records)\/(tasks|specs|prds|changes|executions|conversations)\//.exec(
+        row.path,
+      );
     if (match === null) continue;
     const frontMatter = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/.exec(row.content)?.[1];
     if (frontMatter === undefined) continue;

package/templates/.agents/dashboard/packages/local-runtime/src/sqlite-read-model-source-fingerprint.test.ts

@@ -25,6 +25,28 @@ afterEach(async () => {
 });
 
 describe("persistent source fingerprint checkpoints", () => {
+  it("includes current data records, retains legacy records, and excludes generated projections", async () => {
+    const { root } = await fixture();
+    await mkdir(join(root, ".agents/data/runs/2026/09"), { recursive: true });
+    await mkdir(join(root, ".agents/data/executions/EXEC-CURRENT/decisions"), { recursive: true });
+    await mkdir(join(root, ".agents/data/lifecycle/indexes"), { recursive: true });
+    await writeFile(join(root, ".agents/data/runs/2026/09/RUN-CURRENT.jsonl"), "{}\n");
+    await writeFile(
+      join(root, ".agents/data/executions/EXEC-CURRENT/decisions/DEC-CURRENT.md"),
+      "---\nid: DEC-CURRENT\ncreated_at: 2026-09-01T00:00:00Z\n---\n",
+    );
+    await writeFile(join(root, ".agents/data/lifecycle/indexes/run.json"), "{}\n");
+    await writeFile(join(root, ".agents/data/lifecycle/active-work.json"), "{}\n");
+
+    const snapshot = await sourceFingerprint(root);
+
+    expect(snapshot.candidates.map((candidate) => candidate.source)).toEqual([
+      ".agents/data/executions/EXEC-CURRENT/decisions/DEC-CURRENT.md",
+      ".agents/data/runs/2026/09/RUN-CURRENT.jsonl",
+      ".agents/records/tasks/task.md",
+    ]);
+  });
+
   it("reuses historical content hashes across serialized checkpoints and detects additions and removals", async () => {
     const { root, path } = await fixture();
     const initial = await sourceFingerprint(root);

package/templates/.agents/dashboard/packages/local-runtime/src/sqlite-read-model-source-fingerprint.ts

@@ -5,6 +5,7 @@ import { join, relative, resolve } from "node:path";
 const textExtensions = new Set([".json", ".jsonl", ".md", ".yaml", ".yml", ".txt"]);
 
 function isDashboardCanonicalSource(source: string): boolean {
+  const canonicalRoot = "\\.agents\\/(?:data|records)";
   if (
     [
       ".agents/config/project.yaml",
@@ -15,17 +16,18 @@ function isDashboardCanonicalSource(source: string): boolean {
   )
     return true;
   if (source.startsWith(".agents/config/pricing/")) return true;
-  if (source.startsWith(".agents/records/runs/") && source.endsWith(".jsonl")) return true;
-  if (/^\.agents\/records\/(tasks|specs|prds)\/.*\.md$/.test(source)) return true;
-  if (/^\.agents\/records\/executions\/.*\/execution\.md$/.test(source)) return true;
+  if (new RegExp(`^${canonicalRoot}/runs/`).test(source) && source.endsWith(".jsonl")) return true;
+  if (new RegExp(`^${canonicalRoot}/(tasks|specs|prds)/.*\\.md$`).test(source)) return true;
+  if (new RegExp(`^${canonicalRoot}/executions/.*/execution\\.md$`).test(source)) return true;
+  if (new RegExp(`^${canonicalRoot}/executions/.*/decisions/.*\\.md$`).test(source)) return true;
   if (
-    source.startsWith(".agents/records/lifecycle/historical-developer-attribution/") &&
+    new RegExp(`^${canonicalRoot}/lifecycle/historical-developer-attribution/`).test(source) &&
     source.endsWith(".json")
   )
     return true;
-  return /^\.agents\/records\/changes\/.*\/(change\.md|decisions\/.*\.md|artifacts\/(evidence|tests|validations)\/.*\.md)$/.test(
-    source,
-  );
+  return new RegExp(
+    `^${canonicalRoot}/changes/.*/(change\\.md|decisions/.*\\.md|artifacts/(evidence|tests|validations)/.*\\.md)$`,
+  ).test(source);
 }
 
 export type SqliteReadModelSourceCandidate = {
@@ -66,7 +68,7 @@ export async function sourceFingerprint(
           "executions",
           "changes",
           "lifecycle/historical-developer-attribution",
-        ].map((kind) => `.agents/records/${kind}`),
+        ].flatMap((kind) => [`.agents/data/${kind}`, `.agents/records/${kind}`]),
       ].map((root) => listFiles(resolve(workspaceRoot, root))),
     )
   )

package/templates/.agents/dashboard/packages/local-runtime/src/sqlite-read-model.test.ts

@@ -157,6 +157,72 @@ describe("SQLite dashboard read model", () => {
     await expect(rebuildSqliteReadModel(root)).resolves.toMatchObject({ files: 2 });
   });
 
+  it("uses current data entities once when the same ID remains in the legacy layout", async () => {
+    const root = await createSqliteTestRoot();
+    roots.push(root);
+    await mkdir(join(root, ".agents", "config"), { recursive: true });
+    await mkdir(join(root, ".agents", "records", "tasks"), { recursive: true });
+    await mkdir(join(root, ".agents", "data", "tasks"), { recursive: true });
+    await writeFile(join(root, ".agents", "config", "project.yaml"), "zaip:\n  enabled: true\n");
+    const legacy = `---\nid: TASK-DUPLICATE\ntitle: Legacy title\nstatus: completed\ncreated_at: 2026-09-01T10:00:00.000Z\n---\n`;
+    const current = `---\nid: TASK-DUPLICATE\ntitle: Current title\nstatus: executing\ncreated_at: 2026-09-02T10:00:00.000Z\n---\n`;
+    await writeFile(join(root, ".agents", "records", "tasks", "TASK-DUPLICATE.md"), legacy);
+    await writeFile(join(root, ".agents", "data", "tasks", "TASK-DUPLICATE.md"), current);
+
+    await rebuildSqliteReadModel(root);
+    const metadata = new DatabaseSync(
+      join(root, ".local", "sqlite", "zaip-aios-dashboard.sqlite"),
+      {
+        readOnly: true,
+      },
+    );
+    try {
+      expect(
+        metadata
+          .prepare("SELECT value FROM zaip_vw_read_model_metadata WHERE key='schema_version'")
+          .get(),
+      ).toEqual({ value: "74" });
+    } finally {
+      metadata.close();
+    }
+    const filesystem = new SqliteReadModelFileSystem(root);
+    try {
+      expect(filesystem.canonicalWorkPage("task", { from: null, to: null }, 0, 10)).toMatchObject({
+        total_count: 1,
+        rows: [expect.objectContaining({ id: "TASK-DUPLICATE", title: "Current title" })],
+      });
+    } finally {
+      filesystem.close();
+    }
+
+    await writeFile(
+      join(root, ".agents", "records", "tasks", "TASK-DUPLICATE.md"),
+      legacy.replace("Legacy title", "Edited legacy title"),
+    );
+    await rebuildSqliteReadModel(root);
+    const currentCached = new SqliteReadModelFileSystem(root);
+    try {
+      expect(
+        currentCached.canonicalWorkPage("task", { from: null, to: null }, 0, 10),
+      ).toMatchObject({
+        rows: [expect.objectContaining({ title: "Current title" })],
+      });
+    } finally {
+      currentCached.close();
+    }
+
+    await rm(join(root, ".agents", "data", "tasks", "TASK-DUPLICATE.md"));
+    await rebuildSqliteReadModel(root);
+    const fallback = new SqliteReadModelFileSystem(root);
+    try {
+      expect(fallback.canonicalWorkPage("task", { from: null, to: null }, 0, 10)).toMatchObject({
+        rows: [expect.objectContaining({ title: "Edited legacy title" })],
+      });
+    } finally {
+      fallback.close();
+    }
+  });
+
   it("accepts only the canonical C3D4 historical assignment among lifecycle files", async () => {
     const root = await createSqliteTestRoot();
     roots.push(root);
@@ -1252,7 +1318,7 @@ created_at: 2026-08-10T11:01:00.000Z
         snapshot
           .prepare("SELECT value FROM zaip_vw_read_model_metadata WHERE key='schema_version'")
           .get(),
-      ).toEqual({ value: "73" });
+      ).toEqual({ value: "74" });
     } finally {
       snapshot.close();
     }
@@ -2464,7 +2530,7 @@ created_at: 2026-08-10T11:01:00.000Z
     );
     await writeFile(
       join(root, ".agents", "config", "framework.lock.yaml"),
-      "lock_version: 1\nframework:\n  version: 1.3.0\n  distribution_sha256: null\nlayout:\n  version: 3\nresolved_profile:\n  id: null\n  sha256: null\nmanaged_files: {}\n",
+      "lock_version: 1\nframework:\n  version: 2.2.0\n  distribution_sha256: null\nlayout:\n  version: 3\nresolved_profile:\n  id: null\n  sha256: null\nmanaged_files: {}\n",
       "utf8",
     );
     const run = (

package/templates/.agents/dashboard/packages/local-runtime/src/sqlite-read-model.ts

@@ -77,9 +77,10 @@ import type { SqliteReadModelSourceCheckpoint } from "./sqlite-read-model-source
 import { sourceFingerprint } from "./sqlite-read-model-source-fingerprint.js";
 
 const dbRelativePath = ".local/sqlite/zaip-aios-dashboard.sqlite";
-// Schema 73 persists exact source checkpoints and parsed records for delta refresh.
+// Schema 74 invalidates parser checkpoints produced before .agents/data became
+// canonical input. A schema rebuild is required even when source hashes match.
 // Older snapshots initialize these inputs once in the same database transaction.
-const readModelSchemaVersion = "73";
+const readModelSchemaVersion = "74";
 const requiredPersistedTables = [
   "zaip_aios_activities",
   "zaip_dim_llm_model",
@@ -598,12 +599,12 @@ export async function rebuildSqliteReadModel(
           source.includes("/historical-developer-attribution/"),
       );
       const entityChanged = [...changedSources].some((source) =>
-        /^\.agents\/records\/(tasks|specs|prds)\//.test(source),
+        /^\.agents\/(?:data|records)\/(tasks|specs|prds)\//.test(source),
       );
       const changedCreationRunIds = new Set<string>();
       if (hasPersistentSchema)
         for (const source of changedSources) {
-          if (!source.startsWith(".agents/records/specs/")) continue;
+          if (!/^\.agents\/(?:data|records)\/specs\//.test(source)) continue;
           const cached = database
             .prepare(
               "SELECT payload_json FROM zaip_aios_activities WHERE payload_type='parsed_source' AND activity_key=?",
@@ -620,6 +621,14 @@ export async function rebuildSqliteReadModel(
           .filter((row) => configurationChanged || changedSources.has(row.source_path))
           .map((row) => String(row.run_id)),
       );
+      // A newly-added alternate layout has no prior activity row, but can name
+      // the same Run already materialized from the current layout. Mark that
+      // Run dirty before retaining canonical facts so the later preferred fold
+      // replaces it instead of colliding with a preserved run-index row.
+      for (const source of changedSources) {
+        const match = /^\.agents\/(?:data|records)\/runs\/.*\/([^/]+)\.jsonl$/.exec(source);
+        if (match?.[1]) dirtyRunIds.add(match[1]);
+      }
       // A parent identity change may affect descendants even when their own bytes are unchanged.
       let expanded = true;
       while (expanded) {
@@ -837,7 +846,7 @@ export async function rebuildSqliteReadModel(
       reportLaunchProgress("projection_build", 74, "Organizando fatos e projeções do banco local.");
       const canonicalRows = database
         .prepare(
-          "SELECT path, content FROM files WHERE path LIKE '.agents/records/%' AND path NOT LIKE '.agents/records/runs/%'",
+          "SELECT path, content FROM files WHERE (path LIKE '.agents/data/%' OR path LIKE '.agents/records/%') AND path NOT LIKE '.agents/data/runs/%' AND path NOT LIKE '.agents/records/runs/%' ORDER BY CASE WHEN path LIKE '.agents/data/%' THEN 1 ELSE 0 END, path",
         )
         .all() as Array<{ path: string; content: string }>;
       const canonicalEntities = new Map<string, CanonicalEntity>(
@@ -851,7 +860,7 @@ export async function rebuildSqliteReadModel(
         ),
       );
       for (const row of canonicalRows)
-        if (changedSources.has(row.path) && row.path.startsWith(".agents/records/specs/"))
+        if (changedSources.has(row.path) && /^\.agents\/(?:data|records)\/specs\//.test(row.path))
           for (const [, entity] of parsedSources.read<Array<[string, CanonicalEntity]>>(
             "entities",
             row.path,
@@ -897,6 +906,17 @@ export async function rebuildSqliteReadModel(
         canonicalLifecycle.changes.push(...parsed.changes);
         canonicalLifecycle.decisions.push(...parsed.decisions);
       }
+      // Both supported layouts can coexist during an upgrade. SQL ordering puts
+      // .agents/data last, so the installed current record wins by stable ID.
+      canonicalLifecycle.executions = [
+        ...new Map(canonicalLifecycle.executions.map((item) => [item.id, item])).values(),
+      ];
+      canonicalLifecycle.changes = [
+        ...new Map(canonicalLifecycle.changes.map((item) => [item.id, item])).values(),
+      ];
+      canonicalLifecycle.decisions = [
+        ...new Map(canonicalLifecycle.decisions.map((item) => [item.id, item])).values(),
+      ];
       const insertCanonicalExecution = database.prepare(
         "INSERT INTO canonical_executions(id, status, kind, origin_type, origin_id, created_at, occurred_day_sp, finished_at, source_path) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
       );
@@ -982,7 +1002,7 @@ export async function rebuildSqliteReadModel(
       );
       const runRows = database
         .prepare(
-          "SELECT path, content, content_sha256 FROM files WHERE path LIKE '.agents/records/runs/%.jsonl' ORDER BY path",
+          "SELECT path, content, content_sha256 FROM files WHERE (path LIKE '.agents/data/runs/%.jsonl' OR path LIKE '.agents/records/runs/%.jsonl') ORDER BY CASE WHEN path LIKE '.agents/data/%' THEN 1 ELSE 0 END, path",
         )
         .all() as Array<{ path: string; content: string; content_sha256: string }>;
 
@@ -992,7 +1012,7 @@ export async function rebuildSqliteReadModel(
       const historicalDeveloperManifests = (
         database
           .prepare(
-            "SELECT content FROM files WHERE path LIKE '.agents/records/lifecycle/historical-developer-attribution/%.json'",
+            "SELECT content FROM files WHERE path LIKE '.agents/data/lifecycle/historical-developer-attribution/%.json' OR path LIKE '.agents/records/lifecycle/historical-developer-attribution/%.json'",
           )
           .all() as Array<{ content: string }>
       ).flatMap((row) => {
@@ -1047,7 +1067,9 @@ export async function rebuildSqliteReadModel(
       );
       for (const previous of previousActivities) {
         const row = runRows.find((row) => row.path === previous.source_path);
-        if (row) runRowsById.set(previous.run_id, row);
+        const selected = runRowsById.get(previous.run_id);
+        if (row && (selected === undefined || !selected.path.startsWith(".agents/data/")))
+          runRowsById.set(previous.run_id, row);
       }
       const folds = new Map<string, { row: (typeof runRows)[number]; fold: RunV2Fold }>();
       const readFold = (row: (typeof runRows)[number]) =>
@@ -3031,6 +3053,13 @@ export class SqliteReadModelFileSystem extends WorkspaceFileSystem {
   // exact filter results inside the immutable generation so a tab switch does
   // not repeat its multi-second SQL scan.
   private readonly costMonitorSummaryCache = new Map<string, CostSummarySource>();
+
+  canonicalSource(): ".agents/data" | ".agents/records" {
+    const current = this.database
+      .prepare("SELECT 1 FROM files WHERE path LIKE '.agents/data/%' LIMIT 1")
+      .get();
+    return current === undefined ? ".agents/records" : ".agents/data";
+  }
   private dailyAggregateRows(): Array<Record<string, number | string | null>> {
     if (this.dailyAggregateRowsCache === null) {
       this.dailyAggregateRowsCache = this.database
@@ -3527,7 +3556,7 @@ export class SqliteReadModelFileSystem extends WorkspaceFileSystem {
     const clauses = selected.map(() => "content LIKE ?").join(" OR ");
     return this.database
       .prepare(`SELECT path, content FROM files
-        WHERE path LIKE '.agents/records/%' AND (${clauses}) ORDER BY path`)
+        WHERE (path LIKE '.agents/data/%' OR path LIKE '.agents/records/%') AND (${clauses}) ORDER BY path`)
       .all(...selected.map((marker) => `%${marker}%`)) as Array<{
       path: string;
       content: string;