gsd-pi 2.74.0-dev.2b524c3 → 2.74.0-dev.6e23363

package/src/resources/extensions/gsd/workflow-reconcile.ts

@@ -10,12 +10,13 @@ import {
   updateMilestoneStatus,
   getSliceTasks,
   insertMilestone,
-  _getAdapter,
   getMilestoneSlices,
   insertVerificationEvidence,
   upsertDecision,
   openDatabase,
   setTaskBlockerDiscovered,
+  insertOrIgnoreSlice,
+  insertOrIgnoreTask,
 } from "./gsd-db.js";
 import { isClosedStatus } from "./status-guards.js";
 import { invalidateStateCache } from "./state.js";
@@ -164,13 +165,12 @@ function replayEvents(events: WorkflowEvent[]): void {
         const milestoneId = p["milestoneId"] as string;
         const sliceId = p["sliceId"] as string;
         if (milestoneId && sliceId) {
-          const adapter = _getAdapter();
-          if (adapter) {
-            adapter.prepare(
-              `INSERT OR IGNORE INTO slices (milestone_id, id, title, status, created_at)
-               VALUES (:mid, :sid, :title, 'pending', :ts)`,
-            ).run({ ":mid": milestoneId, ":sid": sliceId, ":title": (p["title"] as string) ?? sliceId, ":ts": event.ts });
-          }
+          insertOrIgnoreSlice({
+            milestoneId,
+            sliceId,
+            title: (p["title"] as string) ?? sliceId,
+            createdAt: event.ts,
+          });
         }
         break;
       }
@@ -182,13 +182,13 @@ function replayEvents(events: WorkflowEvent[]): void {
         const sliceId = p["sliceId"] as string;
         const taskId = p["taskId"] as string;
         if (milestoneId && sliceId && taskId) {
-          const adapter = _getAdapter();
-          if (adapter) {
-            adapter.prepare(
-              `INSERT OR IGNORE INTO tasks (milestone_id, slice_id, id, title, status, created_at)
-               VALUES (:mid, :sid, :tid, :title, 'pending', :ts)`,
-            ).run({ ":mid": milestoneId, ":sid": sliceId, ":tid": taskId, ":title": (p["title"] as string) ?? taskId, ":ts": event.ts });
-          }
+          insertOrIgnoreTask({
+            milestoneId,
+            sliceId,
+            taskId,
+            title: (p["title"] as string) ?? taskId,
+            createdAt: event.ts,
+          });
         }
         break;
       }

package/src/resources/extensions/ttsr/ttsr-manager.ts

@@ -9,9 +9,14 @@
  * available, testing all patterns in a single DFA pass. Falls back to
  * per-rule JS RegExp iteration when the native module is not loaded.
  */
-import picomatch from "picomatch";
+import { createRequire } from "node:module";
 import { debugTime, debugCount, debugPeak } from "../gsd/debug-logger.js";
 
+const _require = createRequire(import.meta.url);
+type PicomatchMatcher = (input: string) => boolean;
+type PicomatchFn = (pattern: string) => PicomatchMatcher;
+const picomatch = _require("picomatch") as PicomatchFn;
+
 // ── Native TTSR engine (optional) ─────────────────────────────────────
 let nativeTtsr: {
 	ttsrCompileRules: (rules: { name: string; conditions: string[] }[]) => number;
@@ -65,7 +70,7 @@ export interface TtsrSettings {
 
 interface ToolScope {
 	toolName?: string;
-	pathMatcher?: picomatch.Matcher;
+	pathMatcher?: PicomatchMatcher;
 	pathPattern?: string;
 }
 
@@ -80,7 +85,7 @@ interface TtsrEntry {
 	rule: Rule;
 	conditions: RegExp[];
 	scope: TtsrScope;
-	globalPathMatchers?: picomatch.Matcher[];
+	globalPathMatchers?: PicomatchMatcher[];
 }
 
 /** Tracks when a rule was last injected (for repeat gating). */
@@ -147,7 +152,7 @@ export class TtsrManager {
 		return compiled;
 	}
 
-	#compileGlobalPathMatchers(globs: Rule["globs"]): picomatch.Matcher[] | undefined {
+	#compileGlobalPathMatchers(globs: Rule["globs"]): PicomatchMatcher[] | undefined {
 		if (!globs || globs.length === 0) return undefined;
 		const matchers = globs
 			.map((g) => g.trim())
@@ -239,7 +244,7 @@ export class TtsrManager {
 		return pathValue.replaceAll("\\", "/");
 	}
 
-	#matchesGlob(matcher: picomatch.Matcher, filePaths: string[] | undefined): boolean {
+	#matchesGlob(matcher: PicomatchMatcher, filePaths: string[] | undefined): boolean {
 		if (!filePaths || filePaths.length === 0) return false;
 		for (const filePath of filePaths) {
 			const normalized = this.#normalizePath(filePath);