@drisp/cli 0.5.4 → 0.5.6

package/dist/athena-gateway.js

@@ -2241,7 +2241,7 @@ var cachedVersion = null;
 function readVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.5.4";
+    const injected = "0.5.6";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;
@@ -2876,17 +2876,18 @@ var InboundQueue = class {
     const row = this.db.prepare("SELECT COUNT(*) as n FROM inbound_queue").get();
     return row.n;
   }
-  enqueue(inbound) {
+  enqueue(inbound, key) {
     if (this.size() >= this.maxEntries) {
       return { kind: "rejected", reason: "queue_full" };
     }
     const stmt = this.db.prepare(
       `INSERT INTO inbound_queue
-				(channel_id, account_id, idempotency_key, payload_json, created_at)
-			 VALUES (?, ?, ?, ?, ?)
+				(attachment_id, channel_id, account_id, idempotency_key, payload_json, created_at)
+			 VALUES (?, ?, ?, ?, ?, ?)
 			 ON CONFLICT(channel_id, account_id, idempotency_key) DO NOTHING`
     );
     const result = stmt.run(
+      key ?? null,
       inbound.location.channelId,
       inbound.location.accountId,
       inbound.idempotencyKey,
@@ -2898,12 +2899,17 @@ var InboundQueue = class {
     }
     return { kind: "queued", id: Number(result.lastInsertRowid) };
   }
-  /** Atomically read and remove all parked entries in FIFO order. */
-  drain() {
+  /** Atomically read and remove parked entries for one attachment slot. */
+  drain(key) {
     return this.db.transaction(() => {
-      const rows = this.db.prepare("SELECT id, payload_json FROM inbound_queue ORDER BY id ASC").all();
+      const rows = this.db.prepare(
+        `SELECT id, payload_json
+					   FROM inbound_queue
+					  WHERE attachment_id IS ?
+				   ORDER BY id ASC`
+      ).all(key ?? null);
       if (rows.length > 0) {
-        this.db.prepare("DELETE FROM inbound_queue").run();
+        this.db.prepare("DELETE FROM inbound_queue WHERE attachment_id IS ?").run(key ?? null);
       }
       return rows.map((r) => ({
         id: r.id,
@@ -3022,7 +3028,7 @@ var DispatchPipeline = class {
     const key = options.attachmentId;
     const current = this.bindingStore.getCurrentByAttachment(key);
     if (!current || !this.bindingStore.hasActiveBindingForAttachment(key)) {
-      const result = this.inboundQueue.enqueue(inbound);
+      const result = this.inboundQueue.enqueue(inbound, key);
       if (result.kind === "queued") {
         this.log?.(
           "info",
@@ -3207,9 +3213,9 @@ var DispatchPipeline = class {
   }
   drainPending(key) {
     const current = this.bindingStore.getCurrentByAttachment(key);
-    if (!current || !this.bindingStore.hasActiveBinding(current.runtimeId))
+    if (!current || !this.bindingStore.hasActiveBindingForAttachment(key))
       return;
-    const parked = this.inboundQueue.drain();
+    const parked = this.inboundQueue.drain(key);
     let dispatched = 0;
     let dropped = 0;
     for (const { inbound } of parked) {
@@ -3548,7 +3554,7 @@ function questionFingerprint(req) {
 import fs3 from "fs";
 import path3 from "path";
 import Database from "better-sqlite3";
-var GATEWAY_STATE_VERSION = 1;
+var GATEWAY_STATE_VERSION = 2;
 function openGatewayState(dbPath) {
   if (dbPath !== ":memory:") {
     fs3.mkdirSync(path3.dirname(dbPath), { recursive: true, mode: 448 });
@@ -3576,6 +3582,7 @@ function initGatewayStateSchema(db) {
 		-- same provider message from being parked twice if an adapter retries.
 		CREATE TABLE IF NOT EXISTS inbound_queue (
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			attachment_id TEXT,
 			channel_id TEXT NOT NULL,
 			account_id TEXT NOT NULL,
 			idempotency_key TEXT NOT NULL,
@@ -3611,6 +3618,16 @@ function initGatewayStateSchema(db) {
     db.prepare("INSERT INTO schema_version (version) VALUES (?)").run(
       GATEWAY_STATE_VERSION
     );
+    return;
+  }
+  const inboundColumns = db.prepare("PRAGMA table_info(inbound_queue)").all();
+  if (!inboundColumns.some((column) => column.name === "attachment_id")) {
+    db.prepare("ALTER TABLE inbound_queue ADD COLUMN attachment_id TEXT").run();
+  }
+  if (existing.version < GATEWAY_STATE_VERSION) {
+    db.prepare("UPDATE schema_version SET version = ?").run(
+      GATEWAY_STATE_VERSION
+    );
   }
 }
 

package/dist/{chunk-QVXHUJPH.js → chunk-ZU7M6YZW.js}

@@ -12704,7 +12704,7 @@ function mergeRunSpecEnvIntoWorkflow(workflow, env) {
 async function executeRemoteAssignment({
   frame,
   client,
-  projectDir: fallbackProjectDir = process.cwd(),
+  projectDir,
   log = () => {
   },
   runExecFn = runExec,
@@ -12746,7 +12746,6 @@ async function executeRemoteAssignment({
       send("error", { message: "remote assignment missing prompt" });
       return;
     }
-    const projectDir = spec.projectDir ?? fallbackProjectDir;
     let runtimeConfig;
     try {
       const workflowOverride = ensureRemoteWorkflowInstalled({
@@ -13248,7 +13247,7 @@ function createDashboardPairedExecution(options) {
     entry.record.status = "cancelled";
     entry.controller.abort();
   }
-  function handleAssignment(frame) {
+  function handleAssignment(frame, input = {}) {
     if (active.has(frame.runId)) {
       const rejection = {
         reason: "duplicate",
@@ -13279,7 +13278,7 @@ function createDashboardPairedExecution(options) {
     const promise = executor({
       frame,
       client,
-      projectDir,
+      projectDir: input.projectDir ?? projectDir,
       log,
       abortSignal: controller.signal,
       decisionInbox
@@ -13323,8 +13322,8 @@ function createDashboardPairedExecution(options) {
       }
       return false;
     },
-    admitAssignment(frame) {
-      return handleAssignment(frame);
+    admitAssignment(frame, input) {
+      return handleAssignment(frame, input);
     },
     rejectAssignment,
     snapshot() {
@@ -13352,10 +13351,125 @@ function createDashboardPairedExecution(options) {
   };
 }
 
+// src/app/dashboard/remoteWorkspaceResolver.ts
+import fs22 from "fs";
+import os13 from "os";
+import path20 from "path";
+function resolveRemoteWorkspace(frame, options = {}) {
+  const spec = parseRemoteRunSpec(frame.runSpec);
+  if (!spec) {
+    return {
+      kind: "rejected",
+      rejection: {
+        reason: "workspace_unresolved",
+        message: "remote assignment missing prompt"
+      }
+    };
+  }
+  if (spec.projectDir) {
+    return validateProjectDir(spec.projectDir, options.env);
+  }
+  const sessionId = spec.athenaSessionId ?? spec.sessionId;
+  const runnerId = frame.runnerId ?? "legacy";
+  const deploymentSlug = deploymentSlugFromUrl(options.dashboardUrl);
+  const stateDir = daemonStatePaths(options.env).dir;
+  const projectDir = sessionId ? path20.join(
+    stateDir,
+    "remote-workspaces",
+    deploymentSlug,
+    sanitizePathSegment(runnerId),
+    "sessions",
+    sanitizePathSegment(sessionId)
+  ) : path20.join(
+    stateDir,
+    "remote-workspaces",
+    deploymentSlug,
+    sanitizePathSegment(runnerId),
+    "runs",
+    sanitizePathSegment(frame.runId)
+  );
+  try {
+    fs22.mkdirSync(projectDir, { recursive: true, mode: 448 });
+    if (process.platform !== "win32") {
+      try {
+        fs22.chmodSync(projectDir, 448);
+      } catch {
+      }
+    }
+  } catch (err) {
+    return {
+      kind: "rejected",
+      rejection: {
+        reason: "workspace_unresolved",
+        message: `failed to create remote workspace: ${err instanceof Error ? err.message : String(err)}`
+      }
+    };
+  }
+  return validateProjectDir(projectDir, options.env);
+}
+function validateProjectDir(projectDir, env = process.env) {
+  const resolved = path20.resolve(projectDir);
+  if (!path20.isAbsolute(projectDir)) {
+    return {
+      kind: "rejected",
+      rejection: {
+        reason: "workspace_invalid",
+        message: `remote workspace must be an absolute path: ${projectDir}`
+      }
+    };
+  }
+  const home = path20.resolve(env["HOME"] ?? os13.homedir());
+  if (resolved === home) {
+    return {
+      kind: "rejected",
+      rejection: {
+        reason: "workspace_invalid",
+        message: "remote workspace cannot be the user home directory"
+      }
+    };
+  }
+  let stat;
+  try {
+    stat = fs22.statSync(resolved);
+  } catch {
+    return {
+      kind: "rejected",
+      rejection: {
+        reason: "workspace_invalid",
+        message: `remote workspace does not exist: ${resolved}`
+      }
+    };
+  }
+  if (!stat.isDirectory()) {
+    return {
+      kind: "rejected",
+      rejection: {
+        reason: "workspace_invalid",
+        message: `remote workspace is not a directory: ${resolved}`
+      }
+    };
+  }
+  return { kind: "resolved", projectDir: resolved };
+}
+function deploymentSlugFromUrl(dashboardUrl) {
+  if (!dashboardUrl) return "unknown-dashboard";
+  try {
+    const url = new URL(dashboardUrl);
+    return sanitizePathSegment(url.host);
+  } catch {
+    return sanitizePathSegment(dashboardUrl);
+  }
+}
+function sanitizePathSegment(value) {
+  const cleaned = value.trim().replaceAll(/[^a-zA-Z0-9._-]+/g, "-").replaceAll(/^-+|-+$/g, "");
+  return cleaned.length > 0 ? cleaned : "unknown";
+}
+
 // src/app/dashboard/dashboardAssignmentIntake.ts
 function createDashboardAssignmentIntake(options) {
   const log = options.log ?? (() => {
   });
+  const resolveWorkspace = options.resolveWorkspace ?? ((frame) => resolveRemoteWorkspace(frame));
   const pending = [];
   let ready = false;
   function handle(frame) {
@@ -13371,7 +13485,18 @@ function createDashboardAssignmentIntake(options) {
       });
       return;
     }
-    const outcome = options.execution.admitAssignment(frame);
+    const workspace = resolveWorkspace(frame);
+    if (workspace.kind === "rejected") {
+      options.execution.rejectAssignment(frame.runId, workspace.rejection);
+      options.client.sendAssignmentRejected({
+        runId: frame.runId,
+        ...workspace.rejection
+      });
+      return;
+    }
+    const outcome = options.execution.admitAssignment(frame, {
+      projectDir: workspace.projectDir
+    });
     if (outcome.kind === "accepted") {
       options.client.sendAssignmentAccepted(frame.runId);
       return;
@@ -13511,7 +13636,8 @@ async function runDashboardRuntimeDaemon(options = {}) {
       }
     },
     execution: pairedExecution,
-    log
+    log,
+    resolveWorkspace: (frame) => resolveRemoteWorkspace(frame, { dashboardUrl: currentDashboardUrl })
   });
   function nextReconnectDelay() {
     if (reconnectDelays.length === 0) return 0;
@@ -13659,9 +13785,9 @@ async function runDashboardRuntimeDaemon(options = {}) {
       next.close("attachment reconciliation failed");
       throw err;
     }
-    assignmentIntake.markReady();
     currentInstanceId = token.instanceId;
     currentDashboardUrl = config.dashboardUrl;
+    assignmentIntake.markReady();
     reconnectAttempt = 0;
     scheduleRefresh(token.expiresInSec);
     pairedFeedPublisher.attachTransport(next);
@@ -13729,18 +13855,18 @@ async function runDashboardRuntimeDaemon(options = {}) {
 }
 
 // src/infra/daemon/pidLock.ts
-import fs22 from "fs";
+import fs23 from "fs";
 function acquirePidLock(pidPath) {
   const ownPid = process.pid;
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
-      const fd = fs22.openSync(pidPath, "wx", 384);
+      const fd = fs23.openSync(pidPath, "wx", 384);
       try {
-        fs22.writeSync(fd, `${ownPid}
+        fs23.writeSync(fd, `${ownPid}
 `);
-        fs22.fsyncSync(fd);
+        fs23.fsyncSync(fd);
       } finally {
-        fs22.closeSync(fd);
+        fs23.closeSync(fd);
       }
       return makeHandle(pidPath, ownPid);
     } catch (err) {
@@ -13754,7 +13880,7 @@ function acquirePidLock(pidPath) {
     }
     if (existing.state === "stale") {
       try {
-        fs22.unlinkSync(pidPath);
+        fs23.unlinkSync(pidPath);
       } catch (err) {
         if (err.code !== "ENOENT") throw err;
       }
@@ -13768,7 +13894,7 @@ function acquirePidLock(pidPath) {
 function readPidLock(pidPath) {
   let raw;
   try {
-    raw = fs22.readFileSync(pidPath, "utf-8");
+    raw = fs23.readFileSync(pidPath, "utf-8");
   } catch (err) {
     if (err.code === "ENOENT") {
       return { state: "absent" };
@@ -13792,9 +13918,9 @@ function makeHandle(pidPath, pid) {
       if (released) return;
       released = true;
       try {
-        const raw = fs22.readFileSync(pidPath, "utf-8").trim();
+        const raw = fs23.readFileSync(pidPath, "utf-8").trim();
         if (raw === String(pid)) {
-          fs22.unlinkSync(pidPath);
+          fs23.unlinkSync(pidPath);
         }
       } catch (err) {
         if (err.code !== "ENOENT") {
@@ -13820,7 +13946,7 @@ function isProcessAlive(pid) {
 }
 
 // src/infra/daemon/udsIpc.ts
-import fs23 from "fs";
+import fs24 from "fs";
 import net2 from "net";
 
 // src/infra/daemon/udsFrameCodec.ts
@@ -13865,7 +13991,7 @@ async function startUdsServer(socketPath, handler, log) {
   });
   if (process.platform !== "win32") {
     try {
-      fs23.chmodSync(socketPath, 384);
+      fs24.chmodSync(socketPath, 384);
     } catch {
     }
   }
@@ -13875,7 +14001,7 @@ async function startUdsServer(socketPath, handler, log) {
         server.close(() => resolve());
       });
       try {
-        fs23.unlinkSync(socketPath);
+        fs24.unlinkSync(socketPath);
       } catch (err) {
         if (err.code !== "ENOENT") {
         }
@@ -13993,7 +14119,7 @@ async function sendUdsRequest(socketPath, request, options = {}) {
 async function unlinkStaleSocket(socketPath) {
   let stat;
   try {
-    stat = fs23.statSync(socketPath);
+    stat = fs24.statSync(socketPath);
   } catch (err) {
     if (err.code === "ENOENT") return;
     throw err;
@@ -14020,7 +14146,7 @@ async function unlinkStaleSocket(socketPath) {
       `uds path ${socketPath} is in use by another process; aborting`
     );
   }
-  fs23.unlinkSync(socketPath);
+  fs24.unlinkSync(socketPath);
 }
 
 export {
@@ -14098,4 +14224,4 @@ export {
   startUdsServer,
   sendUdsRequest
 };
-//# sourceMappingURL=chunk-QVXHUJPH.js.map
+//# sourceMappingURL=chunk-ZU7M6YZW.js.map

package/dist/cli.js

@@ -74,7 +74,7 @@ import {
   writeAttachmentMirror,
   writeGatewayClientConfig,
   wsClientOptionsForEndpoint
-} from "./chunk-QVXHUJPH.js";
+} from "./chunk-ZU7M6YZW.js";
 import {
   generateId as generateId2
 } from "./chunk-BTKQ67RE.js";
@@ -15695,7 +15695,7 @@ var cachedVersion = null;
 function readPackageVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.5.4";
+    const injected = "0.5.6";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;

package/dist/dashboard-daemon.js

@@ -3,7 +3,7 @@ import {
   ensureDaemonStateDir,
   runDashboardRuntimeDaemon,
   startUdsServer
-} from "./chunk-QVXHUJPH.js";
+} from "./chunk-ZU7M6YZW.js";
 import "./chunk-BTKQ67RE.js";
 import {
   readDashboardClientConfig,

package/package.json

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