@drisp/cli 0.5.23 → 0.5.24

package/dist/{chunk-BTY7MYYT.js → chunk-YU2WMPRC.js}

@@ -475,6 +475,51 @@ function writeGatewayTrace(message) {
   process.stderr.write(line);
 }
 
+// src/infra/db/openVersionedDb.ts
+import fs4 from "fs";
+import path3 from "path";
+import Database from "better-sqlite3";
+function migrateVersionedSchema(db, schema) {
+  db.exec(
+    "CREATE TABLE IF NOT EXISTS schema_version (version INTEGER NOT NULL)"
+  );
+  const existing = db.prepare("SELECT version FROM schema_version").get();
+  if (existing && existing.version > schema.version) {
+    throw schema.onNewerVersion?.(existing.version, schema.version) ?? new Error(
+      `Database has newer schema version ${existing.version} (expected <= ${schema.version}).`
+    );
+  }
+  schema.migrate(db, existing?.version);
+  if (!existing) {
+    db.prepare("INSERT INTO schema_version (version) VALUES (?)").run(
+      schema.version
+    );
+  }
+}
+function openVersionedDb(dbPath, options) {
+  if (options.ensureDir && dbPath !== ":memory:") {
+    fs4.mkdirSync(path3.dirname(dbPath), {
+      recursive: true,
+      ...options.dirMode !== void 0 ? { mode: options.dirMode } : {}
+    });
+  }
+  const db = new Database(dbPath);
+  db.exec("PRAGMA journal_mode = WAL");
+  if (options.foreignKeys) {
+    db.exec("PRAGMA foreign_keys = ON");
+  }
+  if (options.version === void 0) {
+    options.migrate(db, void 0);
+  } else {
+    migrateVersionedSchema(db, {
+      version: options.version,
+      migrate: options.migrate,
+      ...options.onNewerVersion ? { onNewerVersion: options.onNewerVersion } : {}
+    });
+  }
+  return db;
+}
+
 // src/gateway/transport/types.ts
 var TransportUnreachableError = class extends Error {
   constructor(message) {
@@ -505,9 +550,9 @@ function redactFrame(value) {
 }
 
 // src/gateway/transport/uds.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import net from "net";
-import path3 from "path";
+import path4 from "path";
 
 // src/gateway/transport/framing.ts
 var DEFAULT_MAX_LINE_BYTES = 1024 * 1024;
@@ -567,7 +612,7 @@ function createUdsClientTransport(opts) {
 async function listenUds(opts, onConnection) {
   const logError = opts.logError ?? ((m) => process.stderr.write(m + "\n"));
   await unlinkIfStale(opts.socketPath);
-  fs4.mkdirSync(path3.dirname(opts.socketPath), { recursive: true, mode: 448 });
+  fs5.mkdirSync(path4.dirname(opts.socketPath), { recursive: true, mode: 448 });
   const activeSockets = /* @__PURE__ */ new Set();
   const server = net.createServer({ pauseOnConnect: false }, (socket) => {
     activeSockets.add(socket);
@@ -581,7 +626,7 @@ async function listenUds(opts, onConnection) {
       server.off("error", onError);
       try {
         if (process.platform !== "win32") {
-          fs4.chmodSync(opts.socketPath, 384);
+          fs5.chmodSync(opts.socketPath, 384);
         }
       } catch (err) {
         logError(
@@ -599,7 +644,7 @@ async function listenUds(opts, onConnection) {
       activeSockets.clear();
       server.close(() => {
         try {
-          fs4.unlinkSync(opts.socketPath);
+          fs5.unlinkSync(opts.socketPath);
         } catch {
         }
         resolve();
@@ -638,7 +683,7 @@ async function connectUds(opts) {
   return createSocketConnection(socket, "uds");
 }
 async function unlinkIfStale(socketPath) {
-  if (!fs4.existsSync(socketPath)) return;
+  if (!fs5.existsSync(socketPath)) return;
   const alive = await new Promise((resolve) => {
     const probe = net.connect(socketPath);
     const timer = setTimeout(() => {
@@ -657,7 +702,7 @@ async function unlinkIfStale(socketPath) {
   });
   if (!alive) {
     try {
-      fs4.unlinkSync(socketPath);
+      fs5.unlinkSync(socketPath);
     } catch {
     }
   }
@@ -744,6 +789,7 @@ export {
   readDashboardClientConfig,
   writeDashboardClientConfig,
   removeDashboardClientConfig,
+  openVersionedDb,
   TransportUnreachableError,
   traceGatewayFrame,
   createUdsServerTransport,
@@ -772,4 +818,4 @@ export {
   trackSetupCompleted,
   refreshDashboardAccessToken
 };
-//# sourceMappingURL=chunk-BTY7MYYT.js.map
+//# sourceMappingURL=chunk-YU2WMPRC.js.map

package/dist/cli.js

@@ -2,7 +2,7 @@
 import "./chunk-HXBCZAP7.js";
 import {
   rotateGatewayToken
-} from "./chunk-MRAM6EYI.js";
+} from "./chunk-7GEQJQMR.js";
 import {
   CREDENTIAL_SOURCES_TRIED,
   EXEC_EXIT_CODE,
@@ -10,6 +10,7 @@ import {
   GatewayUnreachableError,
   IndexedTimeline,
   PORTABLE_PROVIDER_ENV_VARS,
+  attachRuntimeEventLoop,
   bootstrapRuntimeConfig,
   buildApiKeyHelperSettings,
   buildPostByToolUseId,
@@ -48,8 +49,6 @@ import {
   getMostRecentAthenaSession,
   getSessionMeta,
   hintGlyphs,
-  ingestRuntimeDecision,
-  ingestRuntimeEvent,
   isBashToolResponse,
   isCommandPrefix,
   isScopedPermissionsRequest,
@@ -87,6 +86,7 @@ import {
   sessionsDir,
   sliceAnsi,
   spaces,
+  startDashboardDecisionDrain,
   startSessionBridge,
   stringWidth,
   stripAnsi,
@@ -97,7 +97,7 @@ import {
   writeAttachmentMirror,
   writeGatewayClientConfig,
   wsClientOptionsForEndpoint
-} from "./chunk-EC67PEFT.js";
+} from "./chunk-QBMYQJFX.js";
 import {
   generateId as generateId2
 } from "./chunk-BTKQ67RE.js";
@@ -121,7 +121,7 @@ import {
   trackTelemetryOptedOut,
   writeDashboardClientConfig,
   writeGatewayTrace
-} from "./chunk-BTY7MYYT.js";
+} from "./chunk-YU2WMPRC.js";
 import {
   McpOptionsStep,
   StepSelector,
@@ -158,7 +158,7 @@ import {
   useWorkflowSessionController,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-JHSADKDJ.js";
+} from "./chunk-7UUPLAP4.js";
 
 // src/app/entry/cli.tsx
 import { render } from "ink";
@@ -1741,20 +1741,14 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
       dashboardDecisionInboxRef.current = createDashboardDecisionInbox();
     }
     const inbox = dashboardDecisionInboxRef.current;
-    const applyPending = () => {
-      const rows = inbox.pendingForSession({ athenaSessionId, limit: 25 });
-      for (const row of rows) {
-        runtime.sendDecision(row.requestId, row.decision);
-        inbox.markConsumed({ id: row.id });
-      }
-    };
-    applyPending();
-    const interval = setInterval(
-      applyPending,
-      options?.dashboardDecisionPollIntervalMs ?? 1e3
-    );
+    const drain = startDashboardDecisionDrain({
+      runtime,
+      inbox,
+      athenaSessionId,
+      ...options?.dashboardDecisionPollIntervalMs !== void 0 ? { pollIntervalMs: options.dashboardDecisionPollIntervalMs } : {}
+    });
     return () => {
-      clearInterval(interval);
+      drain.stop();
     };
   }, [
     runtime,
@@ -1943,43 +1937,47 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
       ...options?.relayQuestion ? { relayQuestion: options.relayQuestion } : {},
       signal: abortRef.current.signal
     };
-    const unsub = runtime.onEvent((runtimeEvent) => {
-      const parentCycleId = getActivePerfCycleId();
-      const cycleId = startPerfCycle(`feed:${runtimeEvent.kind}`, {
-        parent_cycle_id: parentCycleId ?? void 0,
-        runtime_event_id: runtimeEvent.id,
-        runtime_kind: runtimeEvent.kind,
-        hook_name: runtimeEvent.hookName,
-        tool_name: runtimeEvent.toolName
-      });
-      logPerfEvent("feed.runtime_event", {
-        cycle_id: cycleId ?? void 0,
-        runtime_event_id: runtimeEvent.id,
-        runtime_kind: runtimeEvent.kind,
-        hook_name: runtimeEvent.hookName,
-        tool_name: runtimeEvent.toolName
-      });
-      const doneCause = startPerfStage("cause.start", {
-        source: "runtime.event",
-        runtime_kind: runtimeEvent.kind
-      });
-      try {
+    const loop = attachRuntimeEventLoop({
+      runtime,
+      ingest: () => ({
+        mapper: mapperRef.current,
+        store: sessionStoreRef.current,
+        controllerCallbacks
+      }),
+      wrapEvent: (runtimeEvent, run) => {
+        const parentCycleId = getActivePerfCycleId();
+        const cycleId = startPerfCycle(`feed:${runtimeEvent.kind}`, {
+          parent_cycle_id: parentCycleId ?? void 0,
+          runtime_event_id: runtimeEvent.id,
+          runtime_kind: runtimeEvent.kind,
+          hook_name: runtimeEvent.hookName,
+          tool_name: runtimeEvent.toolName
+        });
+        logPerfEvent("feed.runtime_event", {
+          cycle_id: cycleId ?? void 0,
+          runtime_event_id: runtimeEvent.id,
+          runtime_kind: runtimeEvent.kind,
+          hook_name: runtimeEvent.hookName,
+          tool_name: runtimeEvent.toolName
+        });
+        const doneCause = startPerfStage("cause.start", {
+          source: "runtime.event",
+          runtime_kind: runtimeEvent.kind
+        });
+        try {
+          run();
+        } finally {
+          doneCause();
+        }
+      },
+      onEventReceived: (runtimeEvent) => {
         if (options?.relayPermission && runtimeEvent.kind === "permission.request") {
           writeGatewayTrace(
             `useFeed permission event relay-enabled id=${runtimeEvent.id} tool=${runtimeEvent.toolName ?? ""}`
           );
         }
-        const { feedEvents: newFeedEvents, decision } = ingestRuntimeEvent(
-          runtimeEvent,
-          {
-            mapper: mapperRef.current,
-            store: sessionStoreRef.current,
-            controllerCallbacks
-          }
-        );
-        if (decision) {
-          runtime.sendDecision(runtimeEvent.id, decision);
-        }
+      },
+      emitEventFeed: (newFeedEvents, runtimeEvent) => {
         if (!abortRef.current.signal.aborted && newFeedEvents.length > 0) {
           for (const fe of newFeedEvents) {
             if (fe.kind === "permission.decision" && fe.cause?.hook_request_id) {
@@ -1989,12 +1987,8 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
           feedStoreRef.current.pushEvents(newFeedEvents);
           publishDashboardFeedEvents(newFeedEvents, runtimeEvent);
         }
-      } finally {
-        doneCause();
-      }
-    });
-    const unsubDecision = runtime.onDecision(
-      (eventId, decision) => {
+      },
+      wrapDecision: (eventId, decision, run) => {
         const parentCycleId = getActivePerfCycleId();
         const cycleId = startPerfCycle("feed:decision", {
           parent_cycle_id: parentCycleId ?? void 0,
@@ -2013,31 +2007,31 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
           decision_source: decision.source
         });
         try {
-          if (abortRef.current.signal.aborted) return;
-          if (decision.intent?.kind === "question_answer" || decision.source === "timeout") {
-            dequeueQuestion(eventId);
-          }
-          const feedEvent = ingestRuntimeDecision(eventId, decision, {
-            mapper: mapperRef.current,
-            store: sessionStoreRef.current
-          });
-          if (feedEvent) {
-            feedStoreRef.current.pushEvents([feedEvent]);
-            publishDashboardFeedEvents([feedEvent]);
-            if (feedEvent.kind === "permission.decision" && feedEvent.cause?.hook_request_id) {
-              dequeuePermission(feedEvent.cause.hook_request_id);
-            }
-          }
+          run();
         } finally {
           doneCause();
         }
+      },
+      skipDecision: () => abortRef.current.signal.aborted,
+      beforeDecisionIngest: (eventId, decision) => {
+        if (decision.intent?.kind === "question_answer" || decision.source === "timeout") {
+          dequeueQuestion(eventId);
+        }
+      },
+      emitDecisionFeed: (feedEvent) => {
+        if (feedEvent) {
+          feedStoreRef.current.pushEvents([feedEvent]);
+          publishDashboardFeedEvents([feedEvent]);
+          if (feedEvent.kind === "permission.decision" && feedEvent.cause?.hook_request_id) {
+            dequeuePermission(feedEvent.cause.hook_request_id);
+          }
+        }
       }
-    );
+    });
     refreshRuntimeStatus(true);
     return () => {
       abortRef.current.abort();
-      unsub();
-      unsubDecision();
+      loop.stop();
     };
   }, [
     runtime,
@@ -11943,44 +11937,62 @@ function shouldShowSetup({
 }
 
 // src/app/entry/execCommand.ts
+import crypto2 from "crypto";
+
+// src/app/entry/resumeResolution.ts
 import crypto from "crypto";
-function isValidTimeout(timeoutMs) {
-  if (timeoutMs === void 0) return true;
-  return Number.isFinite(timeoutMs) && timeoutMs > 0;
-}
-function resolveContinueFlag(input) {
-  if (input.continueFlag === void 0) {
+function resolveResumeTarget(input) {
+  const createSessionId = input.createSessionId ?? crypto.randomUUID;
+  const getSessionMetaFn = input.getSessionMetaFn ?? getSessionMeta;
+  const getMostRecentSessionFn = input.getMostRecentSessionFn ?? getMostRecentAthenaSession;
+  const { request } = input;
+  if (request.kind === "fresh") {
     return {
-      athenaSessionId: input.createSessionId(),
+      athenaSessionId: createSessionId(),
       adapterResumeSessionId: void 0
     };
   }
-  if (input.continueFlag === "") {
-    const recent = input.getMostRecentSessionFn(input.projectDir);
-    if (!recent) {
-      input.logError(
-        "Error: --continue was provided but no previous Athena sessions exist for this project."
-      );
+  if (request.kind === "explicit") {
+    const meta = getSessionMetaFn(request.sessionId);
+    if (!meta) {
+      input.logError(input.messages.unknownExplicit(request.sessionId));
       return void 0;
     }
     return {
-      athenaSessionId: recent.id,
-      adapterResumeSessionId: recent.adapterSessionIds.at(-1)
+      athenaSessionId: meta.id,
+      adapterResumeSessionId: meta.adapterSessionIds.at(-1)
     };
   }
-  const meta = input.getSessionMetaFn(input.continueFlag);
-  if (!meta) {
-    input.logError(`Error: Unknown Athena session ID: ${input.continueFlag}`);
+  const recent = getMostRecentSessionFn(input.projectDir);
+  if (!recent) {
+    input.logError(input.messages.missingRecent);
+    if (input.missingRecentPolicy === "fresh") {
+      return {
+        athenaSessionId: createSessionId(),
+        adapterResumeSessionId: void 0
+      };
+    }
     return void 0;
   }
   return {
-    athenaSessionId: meta.id,
-    adapterResumeSessionId: meta.adapterSessionIds.at(-1)
+    athenaSessionId: recent.id,
+    adapterResumeSessionId: recent.adapterSessionIds.at(-1)
   };
 }
+
+// src/app/entry/execCommand.ts
+function isValidTimeout(timeoutMs) {
+  if (timeoutMs === void 0) return true;
+  return Number.isFinite(timeoutMs) && timeoutMs > 0;
+}
+function continueFlagToRequest(continueFlag) {
+  if (continueFlag === void 0) return { kind: "fresh" };
+  if (continueFlag === "") return { kind: "most-recent" };
+  return { kind: "explicit", sessionId: continueFlag };
+}
 async function runExecCommand(input, deps = {}) {
   const logError = deps.logError ?? console.error;
-  const createSessionId = deps.createSessionId ?? crypto.randomUUID;
+  const createSessionId = deps.createSessionId ?? crypto2.randomUUID;
   const runExecFn = deps.runExecFn ?? runExec;
   const getMostRecentSessionFn = deps.getMostRecentSessionFn ?? getMostRecentAthenaSession;
   const getSessionMetaFn = deps.getSessionMetaFn ?? getSessionMeta;
@@ -11994,9 +12006,17 @@ async function runExecCommand(input, deps = {}) {
   }
   let continueResolution;
   try {
-    continueResolution = resolveContinueFlag({
+    continueResolution = resolveResumeTarget({
       projectDir: input.projectDir,
-      continueFlag: input.flags.continueFlag,
+      request: continueFlagToRequest(input.flags.continueFlag),
+      // Headless exec treats a missing resume target as a hard error rather
+      // than silently starting fresh, so a resume request that finds nothing
+      // exits non-zero for callers/scripts.
+      missingRecentPolicy: "error",
+      messages: {
+        unknownExplicit: (sessionId) => `Error: Unknown Athena session ID: ${sessionId}`,
+        missingRecent: "Error: --continue was provided but no previous Athena sessions exist for this project."
+      },
       createSessionId,
       getMostRecentSessionFn,
       getSessionMetaFn,
@@ -12032,43 +12052,28 @@ async function runExecCommand(input, deps = {}) {
 }
 
 // src/app/entry/interactiveSession.ts
-import crypto2 from "crypto";
 function resolveInteractiveSession(input) {
-  const logError = input.logError ?? console.error;
-  const createSessionId = input.createSessionId ?? crypto2.randomUUID;
-  const getSessionMetaFn = input.getSessionMetaFn ?? getSessionMeta;
-  const getMostRecentSessionFn = input.getMostRecentSessionFn ?? getMostRecentAthenaSession;
-  if (input.resumeSessionId) {
-    const meta = getSessionMetaFn(input.resumeSessionId);
-    if (!meta) {
-      logError(
-        `Unknown session ID: ${input.resumeSessionId}
-Use 'athena-flow sessions' to choose an available session.`
-      );
-      return void 0;
-    }
-    return {
-      athenaSessionId: meta.id,
-      initialSessionId: meta.adapterSessionIds.at(-1)
-    };
-  }
-  if (input.resumeMostRecent) {
-    const recent = getMostRecentSessionFn(input.projectDir);
-    if (!recent) {
-      logError("No previous sessions found. Starting new session.");
-      return {
-        athenaSessionId: createSessionId(),
-        initialSessionId: void 0
-      };
-    }
-    return {
-      athenaSessionId: recent.id,
-      initialSessionId: recent.adapterSessionIds.at(-1)
-    };
-  }
+  const request = input.resumeSessionId ? { kind: "explicit", sessionId: input.resumeSessionId } : input.resumeMostRecent ? { kind: "most-recent" } : { kind: "fresh" };
+  const target = resolveResumeTarget({
+    projectDir: input.projectDir,
+    request,
+    // Interactive falls back to a fresh session when resume-most-recent finds
+    // no history — the terminal stays usable rather than exiting.
+    missingRecentPolicy: "fresh",
+    messages: {
+      unknownExplicit: (sessionId) => `Unknown session ID: ${sessionId}
+Use 'athena-flow sessions' to choose an available session.`,
+      missingRecent: "No previous sessions found. Starting new session."
+    },
+    logError: input.logError ?? console.error,
+    ...input.createSessionId ? { createSessionId: input.createSessionId } : {},
+    ...input.getSessionMetaFn ? { getSessionMetaFn: input.getSessionMetaFn } : {},
+    ...input.getMostRecentSessionFn ? { getMostRecentSessionFn: input.getMostRecentSessionFn } : {}
+  });
+  if (!target) return void 0;
   return {
-    athenaSessionId: createSessionId(),
-    initialSessionId: void 0
+    athenaSessionId: target.athenaSessionId,
+    initialSessionId: target.adapterResumeSessionId
   };
 }
 
@@ -12697,7 +12702,7 @@ var cachedVersion = null;
 function readPackageVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.5.23";
+    const injected = "0.5.24";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;
@@ -15444,7 +15449,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-CCCUR6KA.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-IMU47QWB.js");
       const { waitUntilExit } = render(
         /* @__PURE__ */ jsx25(
           WorkflowInstallWizard,

package/dist/dashboard-daemon.js

@@ -3,13 +3,13 @@ import {
   ensureDaemonStateDir,
   runDashboardRuntimeDaemon,
   startUdsServer
-} from "./chunk-EC67PEFT.js";
+} from "./chunk-QBMYQJFX.js";
 import "./chunk-BTKQ67RE.js";
 import {
   readDashboardClientConfig,
   refreshDashboardAccessToken
-} from "./chunk-BTY7MYYT.js";
-import "./chunk-JHSADKDJ.js";
+} from "./chunk-YU2WMPRC.js";
+import "./chunk-7UUPLAP4.js";
 
 // src/infra/daemon/logFile.ts
 import fs from "fs";

package/package.json

@@ -17,7 +17,7 @@
 		"hooks",
 		"dashboard"
 	],
-	"version": "0.5.23",
+	"version": "0.5.24",
 	"license": "MIT",
 	"bin": {
 		"athena": "dist/cli.js",