@drisp/cli 0.5.2 → 0.5.4

package/dist/cli.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 import "./chunk-HXBCZAP7.js";
+import {
+  rotateGatewayToken
+} from "./chunk-MRAM6EYI.js";
 import {
   CREDENTIAL_SOURCES_TRIED,
   EXEC_EXIT_CODE,
@@ -12,8 +15,8 @@ import {
   classifyFailure,
   connect,
   createDashboardDecisionInbox,
-  createDashboardFeedPublisher,
   createFeedMapper,
+  createPairedFeedPublisher,
   createRelayPermissionCallback,
   createRelayQuestionCallback,
   createRuntime,
@@ -45,13 +48,15 @@ import {
   lookupCredential,
   makeSkippedProbe,
   messageGlyphs,
-  normalizeHarnessOverride,
   probeSkipReason,
   processRegistry,
   progressGlyphs,
+  readAttachmentMirror,
   readGatewayClientConfig,
+  readPidLock,
   register,
   registerCleanupOnExit,
+  removeAttachmentMirror,
   resolveClaudeBinary,
   resolveClaudeSettingsSurfacePaths,
   resolveHarnessAdapter,
@@ -66,21 +71,13 @@ import {
   startSessionBridge,
   supportsSessionApproval,
   todoGlyphSet,
+  writeAttachmentMirror,
   writeGatewayClientConfig,
   wsClientOptionsForEndpoint
-} from "./chunk-PC46SGTK.js";
+} from "./chunk-QVXHUJPH.js";
 import {
   generateId as generateId2
 } from "./chunk-BTKQ67RE.js";
-import {
-  rotateGatewayToken
-} from "./chunk-MRAM6EYI.js";
-import {
-  readAttachmentMirror,
-  readPidLock,
-  removeAttachmentMirror,
-  writeAttachmentMirror
-} from "./chunk-JV7CRNTC.js";
 import {
   dashboardClientConfigPath,
   disableTelemetry,
@@ -136,7 +133,7 @@ import {
   useWorkflowSessionController,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-A54HGVML.js";
+} from "./chunk-7E54JMXH.js";
 
 // src/app/entry/cli.tsx
 import { render } from "ink";
@@ -1747,7 +1744,7 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
   const feedEventsRef = useRef([]);
   const notifiedRuntimeErrorRef = useRef(null);
   const dashboardFeedPublisher = useMemo3(
-    () => options?.dashboardFeedPublisher ?? createDashboardFeedPublisher(),
+    () => options?.dashboardFeedPublisher ?? createPairedFeedPublisher(),
     [options?.dashboardFeedPublisher]
   );
   const dashboardDecisionInboxRef = useRef(
@@ -11056,352 +11053,6 @@ function executeCommand(command, args, ctx) {
   }
 }
 
-// src/app/runner/assignmentHandler.ts
-function parseRunSpec(value) {
-  if (typeof value !== "object" || value === null) return null;
-  const obj = value;
-  const prompt = obj["prompt"];
-  if (typeof prompt !== "string" || prompt.trim().length === 0) return null;
-  const env2 = obj["env"];
-  const workflow = obj["workflow"];
-  return {
-    prompt,
-    sessionId: typeof obj["sessionId"] === "string" && obj["sessionId"].length > 0 ? obj["sessionId"] : void 0,
-    projectDir: typeof obj["projectDir"] === "string" && obj["projectDir"].length > 0 ? obj["projectDir"] : void 0,
-    workflow: typeof workflow === "object" && workflow !== null && typeof workflow["ref"] === "string" ? { ref: workflow["ref"] } : void 0,
-    harness: normalizeHarnessOverride(obj["harness"]),
-    env: typeof env2 === "object" && env2 !== null ? Object.fromEntries(
-      Object.entries(env2).filter(
-        (entry) => typeof entry[1] === "string"
-      )
-    ) : void 0,
-    timeoutSec: typeof obj["timeoutSec"] === "number" && Number.isFinite(obj["timeoutSec"]) ? obj["timeoutSec"] : void 0
-  };
-}
-function workflowNameFromRef(ref) {
-  if (!ref) return void 0;
-  const [name] = ref.split("@", 1);
-  return name && name.length > 0 ? name : void 0;
-}
-function eventKindOf(event) {
-  if (event.type === "exec.completed") {
-    const data = event.data;
-    return data?.success === false ? "error" : "completion";
-  }
-  return typeof event.type === "string" && event.type.length > 0 ? event.type : "progress";
-}
-function eventPayloadOf(event) {
-  if (event.type === "exec.completed") {
-    const data = event.data;
-    if (data?.success === false) {
-      return {
-        ...typeof event.data === "object" && event.data !== null ? event.data : {},
-        message: typeof data.failure === "object" && data.failure !== null && typeof data.failure.message === "string" ? data.failure.message : "remote execution failed"
-      };
-    }
-  }
-  return event.data ?? null;
-}
-function withEnv(env2, fn) {
-  if (!env2 || Object.keys(env2).length === 0) return fn();
-  const previous = /* @__PURE__ */ new Map();
-  for (const [key, value] of Object.entries(env2)) {
-    previous.set(key, process.env[key]);
-    process.env[key] = value;
-  }
-  return fn().finally(() => {
-    for (const [key, value] of previous) {
-      if (value === void 0) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
-  });
-}
-async function executeAssignment(input) {
-  const {
-    envelope,
-    bridge,
-    dispatchId,
-    location,
-    projectDir: fallbackProjectDir = process.cwd(),
-    runExecFn = runExec,
-    bootstrapRuntimeConfigFn = bootstrapRuntimeConfig,
-    now = Date.now,
-    abortSignal
-  } = input;
-  const runId = envelope.runId;
-  let seq = 0;
-  let terminalSent = false;
-  let deferredFailedCompletion = null;
-  let lastTerminalFailureMessage = null;
-  const nextSeq = () => {
-    seq += 1;
-    return seq;
-  };
-  const sendProgress = async (kind, payload, ts = now()) => {
-    await bridge.sendRunEvent({
-      location,
-      runId,
-      seq: nextSeq(),
-      ts,
-      kind,
-      payload
-    });
-  };
-  const sendTerminal = async (eventKind, payload, ts = now()) => {
-    if (terminalSent) return;
-    terminalSent = true;
-    const envelopeText = JSON.stringify({
-      kind: "run_event",
-      runId,
-      seq: nextSeq(),
-      ts,
-      eventKind,
-      payload
-    });
-    await bridge.completeTurn({
-      dispatchId,
-      location,
-      text: envelopeText,
-      idempotencyKey: `run_event:${runId}:terminal`
-    });
-  };
-  await sendProgress("progress", { message: "assignment received" });
-  const spec = parseRunSpec(envelope.runSpec);
-  if (!spec) {
-    await sendTerminal("error", { message: "remote assignment missing prompt" });
-    return;
-  }
-  const projectDir = spec.projectDir ?? fallbackProjectDir;
-  let runtimeConfig;
-  try {
-    runtimeConfig = bootstrapRuntimeConfigFn({
-      projectDir,
-      showSetup: false,
-      isolationPreset: "minimal",
-      harnessOverride: spec.harness,
-      workflowOverride: workflowNameFromRef(spec.workflow?.ref)
-    });
-  } catch (err) {
-    await sendTerminal("error", {
-      message: err instanceof Error ? err.message : String(err)
-    });
-    return;
-  }
-  for (const warning of runtimeConfig.warnings) {
-    await sendProgress("warning", { message: warning });
-  }
-  let buffered = "";
-  const pendingProgress = [];
-  const stdout = {
-    write(chunk) {
-      buffered += chunk;
-      let newline = buffered.indexOf("\n");
-      while (newline >= 0) {
-        const line = buffered.slice(0, newline).trim();
-        buffered = buffered.slice(newline + 1);
-        if (line.length > 0) {
-          try {
-            const event = JSON.parse(line);
-            const data = event.data;
-            if (event.type === "exec.completed" && data?.success === false) {
-              deferredFailedCompletion = event;
-            } else if (event.type === "exec.completed") {
-              deferredFailedCompletion = event;
-            } else {
-              pendingProgress.push(
-                sendProgress(eventKindOf(event), eventPayloadOf(event), now())
-              );
-            }
-          } catch {
-            pendingProgress.push(sendProgress("progress", { line }));
-          }
-        }
-        newline = buffered.indexOf("\n");
-      }
-      return true;
-    }
-  };
-  const stderr = {
-    write(chunk) {
-      const text = chunk.trim();
-      if (text.length > 0) pendingProgress.push(sendProgress("stderr", { text }));
-      return true;
-    }
-  };
-  try {
-    await withEnv(spec.env, async () => {
-      const result = await runExecFn({
-        prompt: spec.prompt,
-        projectDir,
-        harness: runtimeConfig.harness,
-        athenaSessionId: spec.sessionId ?? `athena-${runId}`,
-        isolationConfig: runtimeConfig.isolationConfig,
-        pluginMcpConfig: runtimeConfig.pluginMcpConfig,
-        workflow: runtimeConfig.workflow,
-        workflowPlan: runtimeConfig.workflowPlan,
-        json: true,
-        verbose: false,
-        ephemeral: false,
-        timeoutMs: spec.timeoutSec ? spec.timeoutSec * 1e3 : void 0,
-        signal: abortSignal,
-        stdout,
-        stderr
-      });
-      await Promise.all(pendingProgress);
-      if (deferredFailedCompletion) {
-        const data = typeof deferredFailedCompletion.data === "object" && deferredFailedCompletion.data !== null ? deferredFailedCompletion.data : {};
-        const ts = typeof deferredFailedCompletion.ts === "number" ? deferredFailedCompletion.ts : now();
-        const success = data.success !== false;
-        const eventKind = success ? "completion" : "error";
-        const message = !success ? result.failure?.message ?? eventPayloadOf(deferredFailedCompletion).message ?? "remote execution failed" : void 0;
-        if (message) lastTerminalFailureMessage = message;
-        await sendTerminal(
-          eventKind,
-          success ? {
-            ...data,
-            exitCode: result.exitCode,
-            athenaSessionId: result.athenaSessionId,
-            adapterSessionId: result.adapterSessionId,
-            finalMessage: result.finalMessage,
-            tokens: result.tokens,
-            durationMs: result.durationMs,
-            success: true
-          } : {
-            ...data,
-            success: result.success,
-            exitCode: result.exitCode,
-            athenaSessionId: result.athenaSessionId,
-            adapterSessionId: result.adapterSessionId,
-            finalMessage: result.finalMessage,
-            tokens: result.tokens,
-            durationMs: result.durationMs,
-            message
-          },
-          ts
-        );
-        return;
-      }
-      if (result.failure && result.failure.message !== lastTerminalFailureMessage) {
-        await sendTerminal("error", {
-          success: result.success,
-          exitCode: result.exitCode,
-          athenaSessionId: result.athenaSessionId,
-          adapterSessionId: result.adapterSessionId,
-          finalMessage: result.finalMessage,
-          tokens: result.tokens,
-          durationMs: result.durationMs,
-          message: result.failure.message
-        });
-        return;
-      }
-      await sendTerminal("completion", {
-        success: result.success,
-        exitCode: result.exitCode,
-        athenaSessionId: result.athenaSessionId,
-        adapterSessionId: result.adapterSessionId,
-        finalMessage: result.finalMessage,
-        tokens: result.tokens,
-        durationMs: result.durationMs
-      });
-    });
-  } catch (err) {
-    await Promise.all(pendingProgress);
-    await sendTerminal("error", {
-      message: err instanceof Error ? err.message : String(err)
-    });
-  }
-}
-
-// src/app/runner/envelope.ts
-function parseRunnerEnvelope(text) {
-  let value;
-  try {
-    value = JSON.parse(text);
-  } catch {
-    return null;
-  }
-  if (typeof value !== "object" || value === null) return null;
-  const obj = value;
-  const runId = obj["runId"];
-  if (typeof runId !== "string" || runId.length === 0) return null;
-  const kind = obj["kind"];
-  if (kind === "job_assignment") {
-    return { kind, runId, runSpec: obj["runSpec"] };
-  }
-  if (kind === "cancel") {
-    return { kind, runId };
-  }
-  return null;
-}
-
-// src/app/runner/runnerSession.ts
-function createRunnerSession(opts) {
-  const {
-    bridge,
-    projectDir,
-    runExecFn = runExec,
-    bootstrapRuntimeConfigFn = bootstrapRuntimeConfig,
-    now = Date.now
-  } = opts;
-  const inflight = /* @__PURE__ */ new Map();
-  function startAssignment(envelope, dispatchId, location) {
-    const controller = new AbortController();
-    inflight.set(envelope.runId, controller);
-    return executeAssignment({
-      envelope,
-      bridge,
-      dispatchId,
-      location,
-      projectDir,
-      runExecFn,
-      bootstrapRuntimeConfigFn,
-      now,
-      abortSignal: controller.signal
-    }).finally(() => {
-      if (inflight.get(envelope.runId) === controller) {
-        inflight.delete(envelope.runId);
-      }
-    });
-  }
-  return {
-    handleDispatch(input) {
-      const envelope = parseRunnerEnvelope(input.text);
-      if (!envelope) {
-        return { recognised: false, completed: Promise.resolve() };
-      }
-      if (envelope.kind === "job_assignment") {
-        const completed = startAssignment(
-          envelope,
-          input.dispatchId,
-          input.location
-        );
-        return { recognised: true, completed };
-      }
-      const controller = inflight.get(envelope.runId);
-      if (controller) controller.abort();
-      return { recognised: true, completed: Promise.resolve() };
-    }
-  };
-}
-
-// src/app/runner/dispatchRouter.ts
-function makeDispatchRouter(opts) {
-  return (payload) => {
-    if (opts.runnerSession) {
-      const result = opts.runnerSession.handleDispatch({
-        text: payload.inbound.text,
-        dispatchId: payload.dispatchId,
-        location: payload.inbound.location
-      });
-      if (result.recognised) return;
-    }
-    opts.fallback(payload);
-  };
-}
-
 // src/ui/components/SessionPicker.tsx
 import { useState as useState11 } from "react";
 import { Box as Box11, Text as Text17, useInput as useInput12, useStdout as useStdout5 } from "ink";
@@ -13776,25 +13427,17 @@ function AppContent({
     [addMessage, currentSessionId, feedEvents.length, spawnHarness]
   );
   submitDispatchAsTurnRef.current = submitDispatchAsTurn;
-  const runnerSession = useMemo17(
-    () => sessionBridge ? createRunnerSession({ bridge: sessionBridge, projectDir }) : null,
-    [sessionBridge, projectDir]
-  );
   useEffect14(() => {
     if (!sessionBridge) return;
-    const router = makeDispatchRouter({
-      runnerSession,
-      fallback: (payload) => {
-        if (isHarnessRunningRef.current || pendingDispatchRef.current) {
-          queuedDispatchRef.current = payload;
-          return;
-        }
-        submitDispatchAsTurnRef.current?.(payload);
+    const off = sessionBridge.onTurnDispatch((payload) => {
+      if (isHarnessRunningRef.current || pendingDispatchRef.current) {
+        queuedDispatchRef.current = payload;
+        return;
       }
+      submitDispatchAsTurnRef.current?.(payload);
     });
-    const off = sessionBridge.onTurnDispatch(router);
     return off;
-  }, [sessionBridge, runnerSession]);
+  }, [sessionBridge]);
   useEffect14(() => {
     if (isHarnessRunning) return;
     if (pendingDispatchRef.current) return;
@@ -16052,7 +15695,7 @@ var cachedVersion = null;
 function readPackageVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.5.2";
+    const injected = "0.5.4";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;
@@ -16526,6 +16169,8 @@ async function runDashboardCommand(input, deps = {}) {
           refreshAccessToken: async () => performRefreshImpl("connect"),
           makeInstanceSocketClient: deps.makeInstanceSocketClient,
           executeRemoteAssignment: deps.executeRemoteAssignment,
+          fetchAttachments: deps.fetchAttachments,
+          writeMirror,
           retryInitialConnect: false,
           log: (level, message) => {
             if (level === "error" || level === "warn") {
@@ -18748,9 +18393,6 @@ var cli = meow(
       },
       apiKey: {
         type: "string"
-      },
-      attachmentId: {
-        type: "string"
       }
     }
   }
@@ -18800,7 +18442,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-X754ND4V.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-7Y5PWAKW.js");
       const { waitUntilExit } = render(
         /* @__PURE__ */ jsx25(
           WorkflowInstallWizard,
@@ -19063,7 +18705,6 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         isolationPreset,
         ascii: cli.flags.ascii,
         showSetup,
-        ...cli.flags.attachmentId !== void 0 ? { attachmentId: cli.flags.attachmentId } : {},
         initialTelemetryDiagnosticsConsent: globalConfig.telemetryDiagnostics
       }
     ),

package/dist/dashboard-daemon.js

@@ -1,20 +1,115 @@
 import {
+  acquirePidLock,
   ensureDaemonStateDir,
   runDashboardRuntimeDaemon,
   startUdsServer
-} from "./chunk-PC46SGTK.js";
+} from "./chunk-QVXHUJPH.js";
 import "./chunk-BTKQ67RE.js";
-import {
-  openDaemonLog
-} from "./chunk-2OJ3GGIP.js";
-import {
-  acquirePidLock
-} from "./chunk-JV7CRNTC.js";
 import {
   readDashboardClientConfig,
   refreshDashboardAccessToken
 } from "./chunk-BTY7MYYT.js";
-import "./chunk-A54HGVML.js";
+import "./chunk-7E54JMXH.js";
+
+// src/infra/daemon/logFile.ts
+import fs from "fs";
+import path from "path";
+var DEFAULT_MAX_BYTES = 5 * 1024 * 1024;
+var DEFAULT_MAX_FILES = 5;
+function openDaemonLog(logPath, options = {}) {
+  const maxBytes = options.maxBytes ?? DEFAULT_MAX_BYTES;
+  const maxFiles = options.maxFiles ?? DEFAULT_MAX_FILES;
+  const now = options.now ?? (() => /* @__PURE__ */ new Date());
+  fs.mkdirSync(path.dirname(logPath), { recursive: true, mode: 448 });
+  let fd = fs.openSync(logPath, "a", 384);
+  if (process.platform !== "win32") {
+    try {
+      fs.chmodSync(logPath, 384);
+    } catch {
+    }
+  }
+  function rotate() {
+    try {
+      fs.closeSync(fd);
+    } catch {
+    }
+    for (let i = maxFiles - 1; i >= 1; i -= 1) {
+      const src = `${logPath}.${i}`;
+      const dst = `${logPath}.${i + 1}`;
+      try {
+        fs.renameSync(src, dst);
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+        }
+      }
+    }
+    try {
+      fs.renameSync(logPath, `${logPath}.1`);
+    } catch (err) {
+      if (err.code !== "ENOENT") {
+      }
+    }
+    fd = fs.openSync(logPath, "a", 384);
+    if (process.platform !== "win32") {
+      try {
+        fs.chmodSync(logPath, 384);
+      } catch {
+      }
+    }
+  }
+  function write(level, message) {
+    const line = `${now().toISOString()} ${level.toUpperCase()} ${redactSecrets(message)}
+`;
+    const buf = Buffer.from(line, "utf-8");
+    let stat = null;
+    try {
+      stat = fs.fstatSync(fd);
+    } catch {
+    }
+    if (stat && stat.size + buf.length > maxBytes) {
+      rotate();
+    }
+    try {
+      fs.writeSync(fd, buf);
+    } catch {
+      try {
+        fs.closeSync(fd);
+      } catch {
+      }
+      try {
+        fd = fs.openSync(logPath, "a", 384);
+        fs.writeSync(fd, buf);
+      } catch {
+      }
+    }
+  }
+  function close() {
+    try {
+      fs.closeSync(fd);
+    } catch {
+    }
+  }
+  return { write, close, path: logPath };
+}
+var SECRET_PATTERNS = [
+  [/Bearer\s+[A-Za-z0-9._\-+/=]+/g, "Bearer ***"],
+  [
+    /(["']?(?:access|refresh)_?token["']?\s*[:=]\s*)["']?[A-Za-z0-9._\-+/=]+/gi,
+    '$1"***"'
+  ],
+  [/(Sec-WebSocket-Protocol:\s*)\S+/gi, "$1***"],
+  [
+    /eyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{4,}/g,
+    "***.***.***"
+  ]
+];
+function redactSecrets(message) {
+  let out = message;
+  for (const [pattern, replacement] of SECRET_PATTERNS) {
+    out = out.replace(pattern, replacement);
+  }
+  return out;
+}
 
 // src/app/entry/dashboardDaemon.ts
 async function runDashboardDaemonEntry() {

package/package.json

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