gsd-pi 2.41.0-dev.0acbce9 → 2.41.0-dev.5a170d0

package/src/resources/extensions/gsd/gsd-db.ts

@@ -168,7 +168,7 @@ function openRawDb(path: string): unknown {
 
 // ─── Schema ────────────────────────────────────────────────────────────────
 
-const SCHEMA_VERSION = 3;
+const SCHEMA_VERSION = 4;
 
 function initSchema(db: DbAdapter, fileBacked: boolean): void {
   // WAL mode for file-backed databases (must be outside transaction)
@@ -195,6 +195,7 @@ function initSchema(db: DbAdapter, fileBacked: boolean): void {
         choice TEXT NOT NULL DEFAULT '',
         rationale TEXT NOT NULL DEFAULT '',
         revisable TEXT NOT NULL DEFAULT '',
+        made_by TEXT NOT NULL DEFAULT 'agent',
         superseded_by TEXT DEFAULT NULL
       )
     `);
@@ -360,6 +361,22 @@ function migrateSchema(db: DbAdapter): void {
       ).run({ ":version": 3, ":applied_at": new Date().toISOString() });
     }
 
+    // v3 → v4: add made_by column to decisions table
+    if (currentVersion < 4) {
+      // Add made_by column — default 'agent' for existing rows (pre-attribution decisions)
+      db.exec(`ALTER TABLE decisions ADD COLUMN made_by TEXT NOT NULL DEFAULT 'agent'`);
+
+      // Recreate views to pick up new columns (SQLite expands SELECT * at view creation time)
+      db.exec("DROP VIEW IF EXISTS active_decisions");
+      db.exec(
+        "CREATE VIEW active_decisions AS SELECT * FROM decisions WHERE superseded_by IS NULL",
+      );
+
+      db.prepare(
+        "INSERT INTO schema_version (version, applied_at) VALUES (:version, :applied_at)",
+      ).run({ ":version": 4, ":applied_at": new Date().toISOString() });
+    }
+
     db.exec("COMMIT");
   } catch (err) {
     db.exec("ROLLBACK");
@@ -471,8 +488,8 @@ export function insertDecision(d: Omit<Decision, "seq">): void {
     throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
   currentDb
     .prepare(
-      `INSERT INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, superseded_by)
-     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :superseded_by)`,
+      `INSERT INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, made_by, superseded_by)
+     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :made_by, :superseded_by)`,
     )
     .run({
       ":id": d.id,
@@ -482,6 +499,7 @@ export function insertDecision(d: Omit<Decision, "seq">): void {
       ":choice": d.choice,
       ":rationale": d.rationale,
       ":revisable": d.revisable,
+      ":made_by": d.made_by ?? "agent",
       ":superseded_by": d.superseded_by,
     });
 }
@@ -502,6 +520,7 @@ export function getDecisionById(id: string): Decision | null {
     choice: row["choice"] as string,
     rationale: row["rationale"] as string,
     revisable: row["revisable"] as string,
+    made_by: (row["made_by"] as string as import("./types.js").DecisionMadeBy) ?? "agent",
     superseded_by: (row["superseded_by"] as string) ?? null,
   };
 }
@@ -521,6 +540,7 @@ export function getActiveDecisions(): Decision[] {
     choice: row["choice"] as string,
     rationale: row["rationale"] as string,
     revisable: row["revisable"] as string,
+    made_by: (row["made_by"] as string as import("./types.js").DecisionMadeBy) ?? "agent",
     superseded_by: null,
   }));
 }
@@ -644,8 +664,8 @@ export function upsertDecision(d: Omit<Decision, "seq">): void {
     throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
   currentDb
     .prepare(
-      `INSERT OR REPLACE INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, superseded_by)
-     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :superseded_by)`,
+      `INSERT OR REPLACE INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, made_by, superseded_by)
+     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :made_by, :superseded_by)`,
     )
     .run({
       ":id": d.id,
@@ -655,6 +675,7 @@ export function upsertDecision(d: Omit<Decision, "seq">): void {
       ":choice": d.choice,
       ":rationale": d.rationale,
       ":revisable": d.revisable,
+      ":made_by": d.made_by ?? "agent",
       ":superseded_by": d.superseded_by ?? null,
     });
 }
@@ -783,9 +804,15 @@ export function reconcileWorktreeDb(
   try {
     adapter.exec(`ATTACH DATABASE '${worktreeDbPath}' AS wt`);
     try {
+      // Check if attached wt database has the made_by column (legacy v3 worktrees won't)
+      const wtInfo = adapter.prepare("PRAGMA wt.table_info('decisions')").all();
+      const hasMadeBy = wtInfo.some((col) => col["name"] === "made_by");
+
       const decConf = adapter
         .prepare(
-          `SELECT m.id FROM decisions m INNER JOIN wt.decisions w ON m.id = w.id WHERE m.decision != w.decision OR m.choice != w.choice OR m.rationale != w.rationale OR m.superseded_by IS NOT w.superseded_by`,
+          `SELECT m.id FROM decisions m INNER JOIN wt.decisions w ON m.id = w.id WHERE m.decision != w.decision OR m.choice != w.choice OR m.rationale != w.rationale OR ${
+            hasMadeBy ? "m.made_by != w.made_by" : "'agent' != 'agent'"
+          } OR m.superseded_by IS NOT w.superseded_by`,
         )
         .all();
       for (const row of decConf)
@@ -808,10 +835,12 @@ export function reconcileWorktreeDb(
           .prepare(
             `
           INSERT OR REPLACE INTO decisions (
-            id, when_context, scope, decision, choice, rationale, revisable, superseded_by
+            id, when_context, scope, decision, choice, rationale, revisable, made_by, superseded_by
           )
           SELECT
-            id, when_context, scope, decision, choice, rationale, revisable, superseded_by
+            id, when_context, scope, decision, choice, rationale, revisable, ${
+              hasMadeBy ? "made_by" : "'agent'"
+            }, superseded_by
           FROM wt.decisions
         `,
           )

package/src/resources/extensions/gsd/guided-flow-queue.ts

@@ -170,7 +170,7 @@ export async function showQueueAdd(
   const existingContext = await buildExistingMilestonesContext(basePath, milestoneIds, state);
 
   // ── Determine next milestone ID ─────────────────────────────────────
-  // Note: the LLM will use the gsd_generate_milestone_id tool to get IDs
+  // Note: the LLM will use the gsd_milestone_generate_id tool to get IDs
   // at creation time, but we still mention the next ID in the preamble
   // for context about where the sequence is.
   const uniqueEnabled = !!loadEffectiveGSDPreferences()?.preferences?.unique_milestone_ids;

package/src/resources/extensions/gsd/guided-flow.ts

@@ -26,6 +26,7 @@ import { join } from "node:path";
 import { readFileSync, existsSync, mkdirSync, readdirSync, rmSync, unlinkSync } from "node:fs";
 import { readSessionLockData, isSessionLockProcessAlive } from "./session-lock.js";
 import { nativeIsRepo, nativeInit } from "./native-git-bridge.js";
+import { isInheritedRepo } from "./repo-identity.js";
 import { ensureGitignore, ensurePreferences, untrackRuntimeFiles } from "./gitignore.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { detectProjectState } from "./detection.js";
@@ -54,7 +55,7 @@ import { getErrorMessage } from "./error-utils.js";
 
 /**
  * Generate the next milestone ID, accounting for reserved IDs, and reserve it.
- * Ensures any preview ID shown in the UI matches what `gsd_generate_milestone_id`
+ * Ensures any preview ID shown in the UI matches what `gsd_milestone_generate_id`
  * will later return.
  */
 function nextMilestoneIdReserved(existingIds: string[], uniqueEnabled: boolean): string {
@@ -346,7 +347,7 @@ function buildHeadlessDiscussPrompt(nextId: string, seedContext: string, _basePa
  * Ensures git repo, .gsd/ structure, gitignore, and preferences all exist.
  */
 function bootstrapGsdProject(basePath: string): void {
-  if (!nativeIsRepo(basePath)) {
+  if (!nativeIsRepo(basePath) || isInheritedRepo(basePath)) {
     const mainBranch = loadEffectiveGSDPreferences()?.preferences?.git?.main_branch || "main";
     nativeInit(basePath, mainBranch);
   }
@@ -870,7 +871,10 @@ export async function showSmartEntry(
   }
 
   // ── Ensure git repo exists — GSD needs it for worktree isolation ──────
-  if (!nativeIsRepo(basePath)) {
+  // Also handle inherited repos: if basePath is a subdirectory of another
+  // git repo that has no .gsd, create a fresh repo to prevent cross-project
+  // state leaks (#1639).
+  if (!nativeIsRepo(basePath) || isInheritedRepo(basePath)) {
     const mainBranch = loadEffectiveGSDPreferences()?.preferences?.git?.main_branch || "main";
     nativeInit(basePath, mainBranch);
   }

package/src/resources/extensions/gsd/journal.ts

@@ -0,0 +1,134 @@
+/**
+ * GSD Event Journal — structured JSONL event log for auto-mode iterations.
+ *
+ * Writes daily-rotated JSONL files to `.gsd/journal/YYYY-MM-DD.jsonl`.
+ * Zero imports from `auto/` — depends only on node:fs, node:path, and paths.ts.
+ *
+ * Observability:
+ * - Each line in the JSONL file is a self-contained JournalEntry
+ * - Events are grouped by flowId (one per iteration) with monotonic seq numbers
+ * - causedBy references enable causal chain reconstruction
+ * - queryJournal() enables programmatic filtering by flowId, eventType, unitId, time range
+ * - Silent failure: journal writes never throw — absence of events is the failure signal
+ */
+
+import { appendFileSync, mkdirSync, readdirSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { gsdRoot } from "./paths.js";
+
+// ─── Types ────────────────────────────────────────────────────────────────────
+
+/** Event types emitted by the auto-mode loop and phases. */
+export type JournalEventType =
+  | "iteration-start"
+  | "dispatch-match"
+  | "dispatch-stop"
+  | "pre-dispatch-hook"
+  | "unit-start"
+  | "unit-end"
+  | "post-unit-hook"
+  | "terminal"
+  | "guard-block"
+  | "milestone-transition"
+  | "stuck-detected"
+  | "sidecar-dequeue"
+  | "iteration-end";
+
+/** A single structured event in the journal. */
+export interface JournalEntry {
+  /** ISO-8601 timestamp */
+  ts: string;
+  /** UUID grouping all events from one iteration */
+  flowId: string;
+  /** Monotonically increasing sequence number within a flow */
+  seq: number;
+  /** The kind of event */
+  eventType: JournalEventType;
+  /** Name of the matched rule (from the unified registry), if applicable */
+  rule?: string;
+  /** Causal reference to a prior event in this or another flow */
+  causedBy?: { flowId: string; seq: number };
+  /** Arbitrary structured payload (e.g. unitId, status, action details) */
+  data?: Record<string, unknown>;
+}
+
+/** Filters for querying journal entries. */
+export interface JournalQueryFilters {
+  flowId?: string;
+  eventType?: string;
+  unitId?: string;
+  /** Filter by the rule name that produced the event */
+  rule?: string;
+  /** ISO-8601 lower bound (inclusive) */
+  after?: string;
+  /** ISO-8601 upper bound (inclusive) */
+  before?: string;
+}
+
+// ─── Emit ─────────────────────────────────────────────────────────────────────
+
+/**
+ * Append a journal event to the daily JSONL file.
+ *
+ * File path: `<gsdRoot>/journal/<YYYY-MM-DD>.jsonl`
+ * where the date is extracted from `entry.ts.slice(0, 10)`.
+ *
+ * Never throws — all errors are silently caught.
+ */
+export function emitJournalEvent(basePath: string, entry: JournalEntry): void {
+  try {
+    const journalDir = join(gsdRoot(basePath), "journal");
+    mkdirSync(journalDir, { recursive: true });
+    const dateStr = entry.ts.slice(0, 10);
+    const filePath = join(journalDir, `${dateStr}.jsonl`);
+    appendFileSync(filePath, JSON.stringify(entry) + "\n");
+  } catch {
+    // Silent failure — journal must never break auto-mode
+  }
+}
+
+// ─── Query ────────────────────────────────────────────────────────────────────
+
+/**
+ * Read and filter journal entries from all daily JSONL files.
+ *
+ * Returns an empty array on any error (missing directory, corrupt files, etc.).
+ */
+export function queryJournal(
+  basePath: string,
+  filters?: JournalQueryFilters,
+): JournalEntry[] {
+  try {
+    const journalDir = join(gsdRoot(basePath), "journal");
+    const files = readdirSync(journalDir).filter(f => f.endsWith(".jsonl")).sort();
+
+    const entries: JournalEntry[] = [];
+    for (const file of files) {
+      const raw = readFileSync(join(journalDir, file), "utf-8");
+      for (const line of raw.split("\n")) {
+        if (!line.trim()) continue;
+        try {
+          const entry = JSON.parse(line) as JournalEntry;
+          entries.push(entry);
+        } catch {
+          // Skip malformed lines
+        }
+      }
+    }
+
+    if (!filters) return entries;
+
+    return entries.filter(e => {
+      if (filters.flowId && e.flowId !== filters.flowId) return false;
+      if (filters.eventType && e.eventType !== filters.eventType) return false;
+      if (filters.rule && e.rule !== filters.rule) return false;
+      if (filters.unitId && (e.data as Record<string, unknown> | undefined)?.unitId !== filters.unitId) return false;
+      if (filters.after && e.ts < filters.after) return false;
+      if (filters.before && e.ts > filters.before) return false;
+      return true;
+    });
+  } catch {
+    // Missing directory, permission errors, etc. — return empty
+    return [];
+  }
+}

package/src/resources/extensions/gsd/md-importer.ts

@@ -25,6 +25,8 @@ import { findMilestoneIds } from './guided-flow.js';
 
 // ─── DECISIONS.md Parser ───────────────────────────────────────────────────
 
+const VALID_MADE_BY = new Set(['human', 'agent', 'collaborative']);
+
 /**
  * Parse a DECISIONS.md markdown table into Decision objects (without seq).
  * Detects `(amends DXXX)` in the Decision column to build supersession info.
@@ -64,6 +66,9 @@ export function parseDecisionsTable(content: string): Omit<Decision, 'seq'>[] {
     const choice = cells[4].trim();
     const rationale = cells[5].trim();
     const revisable = cells[6].trim();
+    // Made By column is optional for backward compatibility — defaults to 'agent'
+    const rawMadeBy = cells.length >= 8 ? cells[7].trim().toLowerCase() : 'agent';
+    const made_by = (VALID_MADE_BY.has(rawMadeBy) ? rawMadeBy : 'agent') as import('./types.js').DecisionMadeBy;
 
     // Detect (amends DXXX) in the Decision column
     const amendsMatch = decisionText.match(/\(amends\s+(D\d+)\)/i);
@@ -79,6 +84,7 @@ export function parseDecisionsTable(content: string): Omit<Decision, 'seq'>[] {
       choice,
       rationale,
       revisable,
+      made_by,
       superseded_by: null,
     });
   }

package/src/resources/extensions/gsd/milestone-ids.ts

@@ -75,7 +75,7 @@ export function nextMilestoneId(milestoneIds: string[], uniqueEnabled?: boolean)
 /**
  * Module-level set of milestone IDs that have been previewed/promised to the
  * user but not yet materialised on disk. Both guided-flow (preview) and
- * gsd_generate_milestone_id (tool) share this set so the ID shown in the UI
+ * gsd_milestone_generate_id (tool) share this set so the ID shown in the UI
  * matches the one the tool returns.
  */
 const reservedMilestoneIds = new Set<string>();

package/src/resources/extensions/gsd/native-git-bridge.ts

@@ -808,7 +808,7 @@ export function nativeCheckoutBranch(basePath: string, branch: string): void {
     native.gitCheckoutBranch(basePath, branch);
     return;
   }
-  execSync(`git checkout ${branch}`, {
+  execFileSync("git", ["checkout", branch], {
     cwd: basePath,
     stdio: ["ignore", "pipe", "pipe"],
     encoding: "utf-8",
@@ -843,7 +843,7 @@ export function nativeMergeSquash(basePath: string, branch: string): GitMergeRes
   }
 
   try {
-    execSync(`git merge --squash ${branch}`, {
+    execFileSync("git", ["merge", "--squash", branch], {
       cwd: basePath,
       stdio: ["ignore", "pipe", "pipe"],
       encoding: "utf-8",