astrocode-workflow 0.1.59 → 0.3.0

package/dist/state/db.d.ts

@@ -4,7 +4,7 @@ export declare function openSqlite(dbPath: string, opts?: {
     busyTimeoutMs?: number;
 }): SqliteDb;
 export declare function configurePragmas(db: SqliteDb, pragmas: Record<string, any>): void;
-/** BEGIN IMMEDIATE transaction helper. */
+/** BEGIN IMMEDIATE transaction helper (re-entrant). */
 export declare function withTx<T>(db: SqliteDb, fn: () => T, opts?: {
     require?: boolean;
 }): T;

package/dist/state/db.js

@@ -46,7 +46,30 @@ export function configurePragmas(db, pragmas) {
     if (pragmas.temp_store)
         db.pragma(`temp_store = ${pragmas.temp_store}`);
 }
-/** BEGIN IMMEDIATE transaction helper. */
+/**
+ * Re-entrant transaction helper.
+ *
+ * SQLite rejects BEGIN inside BEGIN. We use:
+ * - depth=0: BEGIN IMMEDIATE ... COMMIT/ROLLBACK
+ * - depth>0: SAVEPOINT sp_n ... RELEASE / ROLLBACK TO + RELEASE
+ *
+ * This allows callers to safely nest withTx across layers (tools -> workflow -> state machine)
+ * without "cannot start a transaction within a transaction".
+ */
+const TX_DEPTH = new WeakMap();
+function getDepth(db) {
+    return TX_DEPTH.get(db) ?? 0;
+}
+function setDepth(db, depth) {
+    if (depth <= 0)
+        TX_DEPTH.delete(db);
+    else
+        TX_DEPTH.set(db, depth);
+}
+function savepointName(depth) {
+    return `sp_${depth}`;
+}
+/** BEGIN IMMEDIATE transaction helper (re-entrant). */
 export function withTx(db, fn, opts) {
     const adapter = createDatabaseAdapter();
     const available = adapter.isAvailable();
@@ -55,21 +78,56 @@ export function withTx(db, fn, opts) {
             throw new Error("Database adapter unavailable; transaction required.");
         return fn();
     }
-    db.exec("BEGIN IMMEDIATE");
+    const depth = getDepth(db);
+    if (depth === 0) {
+        db.exec("BEGIN IMMEDIATE");
+        setDepth(db, 1);
+        try {
+            const out = fn();
+            db.exec("COMMIT");
+            return out;
+        }
+        catch (e) {
+            try {
+                db.exec("ROLLBACK");
+            }
+            catch {
+                // ignore
+            }
+            throw e;
+        }
+        finally {
+            setDepth(db, 0);
+        }
+    }
+    // Nested: use SAVEPOINT
+    const nextDepth = depth + 1;
+    const sp = savepointName(nextDepth);
+    db.exec(`SAVEPOINT ${sp}`);
+    setDepth(db, nextDepth);
     try {
         const out = fn();
-        db.exec("COMMIT");
+        db.exec(`RELEASE SAVEPOINT ${sp}`);
         return out;
     }
     catch (e) {
         try {
-            db.exec("ROLLBACK");
+            db.exec(`ROLLBACK TO SAVEPOINT ${sp}`);
+        }
+        catch {
+            // ignore
+        }
+        try {
+            db.exec(`RELEASE SAVEPOINT ${sp}`);
         }
         catch {
             // ignore
         }
         throw e;
     }
+    finally {
+        setDepth(db, depth);
+    }
 }
 export function getSchemaVersion(db) {
     try {

package/dist/tools/injects.js

@@ -2,28 +2,41 @@ import { tool } from "@opencode-ai/plugin/tool";
 import { withTx } from "../state/db";
 import { nowISO } from "../shared/time";
 import { sha256Hex } from "../shared/hash";
-const VALID_INJECT_TYPES = ['note', 'policy', 'reminder', 'debug'];
+const VALID_INJECT_TYPES = ["note", "policy", "reminder", "debug"];
 function validateInjectType(type) {
     if (!VALID_INJECT_TYPES.includes(type)) {
-        throw new Error(`Invalid inject type "${type}". Must be one of: ${VALID_INJECT_TYPES.join(', ')}`);
+        throw new Error(`Invalid inject type "${type}". Must be one of: ${VALID_INJECT_TYPES.join(", ")}`);
     }
     return type;
 }
 function validateTimestamp(timestamp) {
     if (!timestamp)
         return null;
-    // Check if it's a valid ISO 8601 timestamp with Z suffix
+    // Strict ISO 8601 UTC with Z suffix, sortable as string.
     const isoRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{3})?Z$/;
     if (!isoRegex.test(timestamp)) {
         throw new Error(`Invalid timestamp format. Expected ISO 8601 UTC with Z suffix (e.g., "2026-01-23T13:05:19.000Z"), got: "${timestamp}"`);
     }
-    // Additional validation: ensure it's parseable and represents a valid date
-    const parsed = new Date(timestamp);
-    if (isNaN(parsed.getTime())) {
+    const parsed = Date.parse(timestamp);
+    if (!Number.isFinite(parsed)) {
         throw new Error(`Invalid timestamp: "${timestamp}" does not represent a valid date`);
     }
     return timestamp;
 }
+function parseJsonStringArray(name, raw) {
+    let v;
+    try {
+        v = JSON.parse(raw);
+    }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        throw new Error(`${name} must be valid JSON. Parse error: ${msg}`);
+    }
+    if (!Array.isArray(v) || !v.every((x) => typeof x === "string")) {
+        throw new Error(`${name} must be a JSON array of strings`);
+    }
+    return v;
+}
 function newInjectId() {
     return `inj_${Date.now()}_${Math.random().toString(16).slice(2)}`;
 }
@@ -46,15 +59,34 @@ export function createAstroInjectPutTool(opts) {
             const id = inject_id ?? newInjectId();
             const now = nowISO();
             const sha = sha256Hex(body_md);
-            // Validate inputs
             const validatedType = validateInjectType(type);
             const validatedExpiresAt = validateTimestamp(expires_at);
+            // Ensure tags_json is at least valid JSON (we do not enforce schema here beyond validity).
+            try {
+                JSON.parse(tags_json);
+            }
+            catch (e) {
+                const msg = e instanceof Error ? e.message : String(e);
+                throw new Error(`tags_json must be valid JSON. Parse error: ${msg}`);
+            }
             return withTx(db, () => {
                 const existing = db.prepare("SELECT inject_id FROM injects WHERE inject_id=?").get(id);
                 if (existing) {
-                    // Use INSERT ... ON CONFLICT for atomic updates
                     db.prepare(`
-            INSERT INTO injects (inject_id, type, title, body_md, tags_json, scope, source, priority, expires_at, sha256, created_at, updated_at)
+            INSERT INTO injects (
+              inject_id,
+              type,
+              title,
+              body_md,
+              tags_json,
+              scope,
+              source,
+              priority,
+              expires_at,
+              sha256,
+              created_at,
+              updated_at
+            )
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT(inject_id) DO UPDATE SET
               type=excluded.type,
@@ -67,7 +99,7 @@ export function createAstroInjectPutTool(opts) {
               expires_at=excluded.expires_at,
               sha256=excluded.sha256,
               updated_at=excluded.updated_at
-          `).run(id, type, title, body_md, tags_json, scope, source, priority, validatedExpiresAt, sha, now, now);
+          `).run(id, validatedType, title, body_md, tags_json, scope, source, priority, validatedExpiresAt, sha, now, now);
                     return `✅ Updated inject ${id}: ${title}`;
                 }
                 db.prepare("INSERT INTO injects (inject_id, type, title, body_md, tags_json, scope, source, priority, expires_at, sha256, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(id, validatedType, title, body_md, tags_json, scope, source, priority, validatedExpiresAt, sha, now, now);
@@ -93,10 +125,18 @@ export function createAstroInjectListTool(opts) {
                 params.push(scope);
             }
             if (type) {
+                // Keep list tool permissive (debugging), but still prevents obvious garbage if used.
+                validateInjectType(type);
                 where.push("type = ?");
                 params.push(type);
             }
-            const sql = `SELECT inject_id, type, title, scope, priority, created_at, updated_at FROM injects ${where.length ? "WHERE " + where.join(" AND ") : ""} ORDER BY priority DESC, updated_at DESC LIMIT ?`;
+            const sql = `
+        SELECT inject_id, type, title, scope, priority, created_at, updated_at
+        FROM injects
+        ${where.length ? "WHERE " + where.join(" AND ") : ""}
+        ORDER BY priority DESC, updated_at DESC
+        LIMIT ?
+      `;
             const rows = db.prepare(sql).all(...params, limit);
             return JSON.stringify(rows, null, 2);
         },
@@ -134,7 +174,13 @@ export function createAstroInjectSearchTool(opts) {
                 where.push("scope = ?");
                 params.push(scope);
             }
-            const sql = `SELECT inject_id, type, title, scope, priority, updated_at FROM injects WHERE ${where.join(" AND ")} ORDER BY priority DESC, updated_at DESC LIMIT ?`;
+            const sql = `
+        SELECT inject_id, type, title, scope, priority, updated_at
+        FROM injects
+        WHERE ${where.join(" AND ")}
+        ORDER BY priority DESC, updated_at DESC
+        LIMIT ?
+      `;
             const rows = db.prepare(sql).all(...params, limit);
             return JSON.stringify(rows, null, 2);
         },
@@ -142,7 +188,13 @@ export function createAstroInjectSearchTool(opts) {
 }
 export function selectEligibleInjects(db, opts) {
     const { nowIso, scopeAllowlist, typeAllowlist, limit = 50 } = opts;
-    // Build placeholders safely
+    if (!Array.isArray(scopeAllowlist) || scopeAllowlist.length === 0) {
+        throw new Error("selectEligibleInjects: scopeAllowlist must be a non-empty array");
+    }
+    if (!Array.isArray(typeAllowlist) || typeAllowlist.length === 0) {
+        throw new Error("selectEligibleInjects: typeAllowlist must be a non-empty array");
+    }
+    // Build placeholders safely (guaranteed non-empty).
     const scopeQs = scopeAllowlist.map(() => "?").join(", ");
     const typeQs = typeAllowlist.map(() => "?").join(", ");
     const sql = `
@@ -168,8 +220,11 @@ export function createAstroInjectEligibleTool(opts) {
         },
         execute: async ({ scopes_json, types_json, limit }) => {
             const now = nowISO();
-            const scopes = JSON.parse(scopes_json);
-            const types = JSON.parse(types_json);
+            const scopes = parseJsonStringArray("scopes_json", scopes_json);
+            const types = parseJsonStringArray("types_json", types_json);
+            // Validate types against the known set to keep selection sane.
+            for (const t of types)
+                validateInjectType(t);
             const rows = selectEligibleInjects(db, {
                 nowIso: now,
                 scopeAllowlist: scopes,
@@ -190,30 +245,38 @@ export function createAstroInjectDebugDueTool(opts) {
         },
         execute: async ({ scopes_json, types_json }) => {
             const now = nowISO();
-            const scopes = JSON.parse(scopes_json);
-            const types = JSON.parse(types_json);
-            // Get ALL injects to analyze filtering
+            const nowMs = Date.parse(now);
+            const scopes = parseJsonStringArray("scopes_json", scopes_json);
+            const types = parseJsonStringArray("types_json", types_json);
+            for (const t of types)
+                validateInjectType(t);
             const allInjects = db.prepare("SELECT * FROM injects").all();
             let total = allInjects.length;
             let selected = 0;
             let skippedExpired = 0;
             let skippedScope = 0;
             let skippedType = 0;
+            let skippedUnparseableExpiresAt = 0;
             const excludedReasons = [];
             const selectedInjects = [];
             for (const inject of allInjects) {
                 const reasons = [];
-                // Check expiration
-                if (inject.expires_at && inject.expires_at <= now) {
-                    reasons.push("expired");
-                    skippedExpired++;
+                // Expiration: parse to ms for correctness across legacy rows.
+                if (inject.expires_at) {
+                    const expMs = Date.parse(String(inject.expires_at));
+                    if (!Number.isFinite(expMs)) {
+                        reasons.push("expires_at_unparseable");
+                        skippedUnparseableExpiresAt++;
+                    }
+                    else if (expMs <= nowMs) {
+                        reasons.push("expired");
+                        skippedExpired++;
+                    }
                 }
-                // Check scope
                 if (!scopes.includes(inject.scope)) {
                     reasons.push("scope");
                     skippedScope++;
                 }
-                // Check type
                 if (!types.includes(inject.type)) {
                     reasons.push("type");
                     skippedType++;
@@ -222,7 +285,7 @@ export function createAstroInjectDebugDueTool(opts) {
                     excludedReasons.push({
                         inject_id: inject.inject_id,
                         title: inject.title,
-                        reasons: reasons,
+                        reasons,
                         scope: inject.scope,
                         type: inject.type,
                         expires_at: inject.expires_at,
@@ -249,9 +312,10 @@ export function createAstroInjectDebugDueTool(opts) {
                     excluded_total: total - selected,
                     skipped_breakdown: {
                         expired: skippedExpired,
+                        expires_at_unparseable: skippedUnparseableExpiresAt,
                         scope: skippedScope,
                         type: skippedType,
-                    }
+                    },
                 },
                 selected_injects: selectedInjects,
                 excluded_injects: excludedReasons,

package/dist/tools/workflow.d.ts

@@ -2,9 +2,9 @@ import { type ToolDefinition } from "@opencode-ai/plugin/tool";
 import type { AstrocodeConfig } from "../config/schema";
 import type { SqliteDb } from "../state/db";
 import type { StageKey } from "../state/types";
+import type { AgentConfig } from "@opencode-ai/sdk";
 export declare const STAGE_TO_AGENT_MAP: Record<string, string>;
 export declare function resolveAgentName(stageKey: StageKey, config: AstrocodeConfig, agents?: any, warnings?: string[]): string;
-import { AgentConfig } from "@opencode-ai/sdk";
 export declare function createAstroWorkflowProceedTool(opts: {
     ctx: any;
     config: AstrocodeConfig;