@naxodev/apnea 0.1.0 → 0.2.0

package/extension/workflows/dispatch.ts

@@ -1,8 +1,6 @@
 import * as path from "node:path"
 import { Cause, Clock, Effect, Exit, Result } from "effect"
-import { effectivePaneStyle, supportsFloating } from "../domain/herdr.ts"
 import {
-  abs,
   packageRoot,
   phaseDir,
   planPath,
@@ -110,8 +108,8 @@ function herdrAfterRollback(
 }
 
 /**
- * Write task file, open interactive harness TUI in a Herdr pane (or a
- * floating oneshot popup), wait until idle, submit a short pointer prompt.
+ * Write task file, open an interactive harness TUI in a reusable Herdr pane,
+ * wait until idle, then submit a short pointer prompt.
  * Refusals are tagged failures only — never ok:false ToolResults.
  */
 export const dispatchWorkflow = (
@@ -345,57 +343,13 @@ export const dispatchWorkflow = (
       })
     }
 
-    const paneStyle = effectivePaneStyle(cfg.pane_style, role)
-    let roleCmd: string[] | null = null
-    let profileFingerprint: string | null = null
-
-    // Everything that can be checked without a task path runs before any
-    // artifact mutation. Only the pane/script launch race remains afterward.
-    if (herdrAvailability !== "unavailable") {
-      if (paneStyle.style === "floating") {
-        const version = yield* herdr.version
-        if (!supportsFloating(version)) {
-          return yield* new HerdrError({
-            message:
-              "floating panes need herdr >= 0.7.4 — run `herdr update`, or set pane_style=regular",
-          })
-        }
-        if (!(yield* herdr.hasApneaPlugin)) {
-          return yield* new HerdrError({
-            message: `apnea herdr plugin not linked. Run /apnea setup, or: herdr plugin link ${livePackageRoot}/herdr-plugin`,
-          })
-        }
-        if (state.pending_floating_exit) {
-          const prevExitAbs = abs(state.pending_floating_exit, root)
-          if (!(yield* fs.exists(prevExitAbs))) {
-            return yield* new GateRefused({
-              gate: "floating_in_flight",
-              message:
-                "floating oneshot already in flight (popup still open). Call workflow_wait, or dismiss the popup and re-dispatch after it exits",
-              details: {
-                pending_artifact: state.pending_artifact,
-                pending_floating_exit: state.pending_floating_exit,
-              },
-            })
-          }
-        }
-        const cmdResult = yield* Effect.result(
-          config.resolveRoleCmd(cfg, role, "oneshot"),
-        )
-        if (Result.isFailure(cmdResult)) {
-          return yield* new HerdrError({
-            message: `floating dispatch requires cmd_oneshot on the role profile: ${cmdResult.failure.message}`,
-          })
-        }
-        roleCmd = cmdResult.success
-      } else {
-        roleCmd = yield* config.resolveRoleCmd(cfg, role, "interactive")
-        profileFingerprint = JSON.stringify([
-          cfg.roles[role]?.profile ?? null,
-          roleCmd,
-        ])
-      }
-    }
+    // Resolve the interactive command before mutating artifacts. Apnea never
+    // falls back to a profile's oneshot command, even outside Herdr.
+    const roleCmd = yield* config.resolveRoleCmd(cfg, role, "interactive")
+    const profileFingerprint = JSON.stringify([
+      cfg.roles[role]?.profile ?? null,
+      roleCmd,
+    ])
 
     if (role === "reviewer") {
       state.reviewer_tree_fingerprint = yield* vcsSvc.treeFingerprint(
@@ -451,8 +405,6 @@ export const dispatchWorkflow = (
 
     let launch: Record<string, unknown> = {
       mode: ROLE_MODE[role],
-      pane_style: cfg.pane_style,
-      pane_style_effective: paneStyle.effective,
     }
 
     const rollbackLaunch = (restoreState = true) =>
@@ -466,14 +418,6 @@ export const dispatchWorkflow = (
             }
           })
         yield* attempt("remove task", fs.remove(taskFile))
-        yield* attempt(
-          "remove floating script",
-          fs.remove(taskFile.replace(/\.md$/, ".sh")),
-        )
-        yield* attempt(
-          "remove floating exit marker",
-          fs.remove(taskFile.replace(/\.md$/, ".exit")),
-        )
         yield* attempt("remove replacement artifact", fs.remove(artifactAbs))
         if (backupAbs != null) {
           yield* attempt(
@@ -505,7 +449,6 @@ export const dispatchWorkflow = (
     markPending(preparedAt)
     state.pending_pane_id = null
     state.pending_pane_label = null
-    state.pending_floating_exit = null
     const preparedState = yield* Effect.exit(store.save(state, root))
     if (Exit.isFailure(preparedState)) {
       const persistenceError = new HerdrError({
@@ -544,127 +487,67 @@ export const dispatchWorkflow = (
       )
     }
 
-    if (paneStyle.style === "floating") {
-      const cmd = roleCmd!
-      const scriptAbs = taskFile.replace(/\.md$/, ".sh")
-      const exitAbs = taskFile.replace(/\.md$/, ".exit")
-      // Drop stale exit marker so wait cannot see a previous run's code.
-      yield* fs.remove(exitAbs)
-      const scriptWritten = yield* Effect.result(
-        herdr.writeFloatingTaskScript(scriptAbs, root, cmd, prompt, exitAbs),
-      )
-      if (Result.isFailure(scriptWritten)) {
-        const rollbackErrors = yield* rollbackLaunch()
-        return yield* herdrAfterRollback(
-          scriptWritten.failure,
-          {
-            task_attempted: taskRef.task,
-            artifact: artifactRel,
-          },
-          rollbackErrors,
-        )
-      }
-      // Popups have no pane id — liveness is the exit file; leave role_panes alone.
-      state.pending_pane_id = null
-      state.pending_pane_label = null
-      state.pending_floating_exit = rel(exitAbs, root)
-      yield* store.save(state, root)
-      const opened = yield* Effect.result(
-        herdr.openFloatingPane(scriptAbs, root),
-      )
-      if (Result.isFailure(opened)) {
+    // Interactive TUI: open harness, wait idle, submit pointer via pane run.
+    const cmd = roleCmd
+    const remembered = state.role_panes[role] ?? null
+    const prefer =
+      remembered?.profile_fingerprint === profileFingerprint ? remembered : null
+    const launched = yield* Effect.result(
+      herdr.runInteractivePrompt(role, cmd, prompt, prefer),
+    )
+    if (Result.isFailure(launched)) {
+      if (launched.failure.details?.delivery === "unknown") {
+        const paneId = String(launched.failure.details.pane_id)
+        const paneLabel = String(launched.failure.details.pane_label)
+        state.pending_pane_id = paneId
+        state.pending_pane_label = paneLabel
+        state.role_panes[role] = {
+          pane_id: paneId,
+          label: paneLabel,
+          profile_fingerprint: profileFingerprint,
+        }
+        yield* store.save(state, root)
         return yield* new HerdrError({
-          message: opened.failure.message,
-          ...(opened.failure.command !== undefined
-            ? { command: opened.failure.command }
+          message: launched.failure.message,
+          ...(launched.failure.command !== undefined
+            ? { command: launched.failure.command }
             : {}),
           details: {
-            ...(opened.failure.details ?? {}),
-            delivery: "unknown",
+            ...(launched.failure.details ?? {}),
             task_attempted: taskRef.task,
             artifact: artifactRel,
             pending_preserved: true,
           },
         })
       }
-      launch = {
-        mode: "oneshot",
-        pane_style: cfg.pane_style,
-        pane_style_effective: "floating",
-        script: rel(scriptAbs, root),
-        exit: rel(exitAbs, root),
-        cmd,
-        prompt,
-      }
-    } else {
-      // Interactive TUI: open harness, wait idle, submit pointer via pane run.
-      const cmd = roleCmd!
-      const remembered = state.role_panes[role] ?? null
-      const prefer =
-        remembered?.profile_fingerprint === profileFingerprint
-          ? remembered
-          : null
-      const launched = yield* Effect.result(
-        herdr.runInteractivePrompt(role, cmd, prompt, prefer),
+      const rollbackErrors = yield* rollbackLaunch()
+      return yield* herdrAfterRollback(
+        launched.failure,
+        {
+          task_attempted: taskRef.task,
+          artifact: artifactRel,
+        },
+        rollbackErrors,
       )
-      if (Result.isFailure(launched)) {
-        if (launched.failure.details?.delivery === "unknown") {
-          const paneId = String(launched.failure.details.pane_id)
-          const paneLabel = String(launched.failure.details.pane_label)
-          state.pending_pane_id = paneId
-          state.pending_pane_label = paneLabel
-          state.pending_floating_exit = null
-          state.role_panes[role] = {
-            pane_id: paneId,
-            label: paneLabel,
-            profile_fingerprint: profileFingerprint,
-          }
-          yield* store.save(state, root)
-          return yield* new HerdrError({
-            message: launched.failure.message,
-            ...(launched.failure.command !== undefined
-              ? { command: launched.failure.command }
-              : {}),
-            details: {
-              ...(launched.failure.details ?? {}),
-              task_attempted: taskRef.task,
-              artifact: artifactRel,
-              pending_preserved: true,
-            },
-          })
-        }
-        const rollbackErrors = yield* rollbackLaunch()
-        return yield* herdrAfterRollback(
-          launched.failure,
-          {
-            task_attempted: taskRef.task,
-            artifact: artifactRel,
-          },
-          rollbackErrors,
-        )
-      }
-      const r = launched.success
-      launch = {
-        mode: "interactive",
-        pane_id: r.pane_id,
-        label: r.label,
-        reused: r.reused,
-        cmd,
-        prompt,
-        pane_style: cfg.pane_style,
-        pane_style_effective: paneStyle.effective,
-        prompt_accepted: r.prompt_accepted,
-        prompt_attempts: r.prompt_attempts,
-        last_status: r.last_status ?? null,
-      }
-      state.pending_pane_id = r.pane_id
-      state.pending_pane_label = r.label
-      state.pending_floating_exit = null
-      state.role_panes[role] = {
-        pane_id: r.pane_id,
-        label: r.label,
-        profile_fingerprint: profileFingerprint,
-      }
+    }
+    const r = launched.success
+    launch = {
+      mode: "interactive",
+      pane_id: r.pane_id,
+      label: r.label,
+      reused: r.reused,
+      cmd,
+      prompt,
+      prompt_accepted: r.prompt_accepted,
+      prompt_attempts: r.prompt_attempts,
+      last_status: r.last_status ?? null,
+    }
+    state.pending_pane_id = r.pane_id
+    state.pending_pane_label = r.label
+    state.role_panes[role] = {
+      pane_id: r.pane_id,
+      label: r.label,
+      profile_fingerprint: profileFingerprint,
     }
 
     // After the launch, not before it: `runInteractivePrompt` blocks in

package/extension/workflows/setup.ts

@@ -1,11 +1,6 @@
 import * as path from "node:path"
 import { Effect, Result } from "effect"
-import { supportsFloating } from "../domain/herdr.ts"
-import {
-  globalConfigPath,
-  packageRoot,
-  projectConfigPath,
-} from "../domain/paths.ts"
+import { globalConfigPath, projectConfigPath } from "../domain/paths.ts"
 import {
   buildGlobalConfig,
   detectionNotes,
@@ -16,7 +11,6 @@ import { ConfigError, type AppError } from "../errors.ts"
 import { ok, type ToolResult } from "../result.ts"
 import { decodeGlobalConfig } from "../schema/config.ts"
 import { FileSystem } from "../services/file-system.ts"
-import { Herdr } from "../services/herdr.ts"
 
 export type SetupParams = {
   /** Write .apnea/config.json role bindings in cwd */
@@ -78,81 +72,6 @@ export type SetupDeps = {
   materializeRoleAgentDir: () => string | null
 }
 
-export type ProvisionResult = {
-  copied: string | null // dest dir, or null when skipped
-  linked: boolean // true only when we ran `herdr plugin link` OK
-  already_linked: boolean
-  notes: string[]
-}
-
-/**
- * Copy the package's herdr-plugin into a stable config-local path and, when
- * herdr is new enough and the plugin isn't already linked, run
- * `herdr plugin link`. Never fails — every branch is a note.
- */
-export const provisionHerdrPlugin = (opts: {
-  srcDir: string // packageRoot()/herdr-plugin
-  destDir: string // dirname(globalConfigPath())/herdr-plugin
-  version: [number, number, number] | null // herdr.version
-}): Effect.Effect<ProvisionResult, never, FileSystem | Herdr> =>
-  Effect.gen(function* () {
-    const fs = yield* FileSystem
-    const herdr = yield* Herdr
-    const notes: string[] = []
-
-    const srcExists = yield* fs.exists(opts.srcDir)
-    if (!srcExists) {
-      notes.push("herdr-plugin missing from package — reinstall @naxodev/apnea")
-      return { copied: null, linked: false, already_linked: false, notes }
-    }
-
-    yield* fs.copyDir(opts.srcDir, opts.destDir)
-    const runTask = path.join(opts.destDir, "scripts", "run-task.sh")
-    if (yield* fs.exists(runTask)) {
-      yield* fs.chmod(runTask, 0o755)
-    }
-
-    if (!supportsFloating(opts.version)) {
-      const ver =
-        opts.version == null
-          ? "unknown"
-          : `${opts.version[0]}.${opts.version[1]}.${opts.version[2]}`
-      notes.push(
-        `herdr ${ver} < 0.7.4 — floating panes unavailable; run \`herdr update\`, then re-run /apnea setup`,
-      )
-      return {
-        copied: opts.destDir,
-        linked: false,
-        already_linked: false,
-        notes,
-      }
-    }
-
-    if (yield* herdr.hasApneaPlugin) {
-      return {
-        copied: opts.destDir,
-        linked: false,
-        already_linked: true,
-        notes,
-      }
-    }
-
-    const linkResult = yield* herdr.linkPlugin(opts.destDir)
-    if (!linkResult.ok) {
-      notes.push(
-        `herdr plugin link failed: ${linkResult.raw.trim() || "(no output)"}`,
-      )
-      return {
-        copied: opts.destDir,
-        linked: false,
-        already_linked: false,
-        notes,
-      }
-    }
-
-    return { copied: opts.destDir, linked: true, already_linked: false, notes }
-  })
-
 /**
  * Deterministic Apnea setup: detect binaries, write global profiles
  * (and optional project role bindings). Never writes cmd into project config.
@@ -161,10 +80,9 @@ export const setupWorkflow = (
   params: SetupParams,
   root: string,
   deps: SetupDeps,
-): Effect.Effect<ToolResult, AppError, FileSystem | Herdr> =>
+): Effect.Effect<ToolResult, AppError, FileSystem> =>
   Effect.gen(function* () {
     const fs = yield* FileSystem
-    const herdr = yield* Herdr
 
     const readJsonSafe = (
       filePath: string,
@@ -241,20 +159,6 @@ export const setupWorkflow = (
       )
     }
 
-    let herdrPlugin: ProvisionResult | null = null
-    let herdrVer: string | null = null
-    if (has.herdr) {
-      const version = yield* herdr.version
-      herdrVer =
-        version == null ? null : `${version[0]}.${version[1]}.${version[2]}`
-      herdrPlugin = yield* provisionHerdrPlugin({
-        srcDir: path.join(packageRoot(), "herdr-plugin"),
-        destDir: path.join(path.dirname(globalConfigPath()), "herdr-plugin"),
-        version,
-      })
-      missing.push(...herdrPlugin.notes)
-    }
-
     let agentsMdPath: string | null = null
     if (params.agents_md) {
       const target = path.join(root, "AGENTS.md")
@@ -286,16 +190,5 @@ export const setupWorkflow = (
     if (params.agents_md) {
       data.agents_md = agentsMdPath
     }
-    if (has.herdr) {
-      data.herdr_version = herdrVer
-      data.herdr_plugin = herdrPlugin
-        ? {
-            copied: herdrPlugin.copied,
-            linked: herdrPlugin.linked,
-            already_linked: herdrPlugin.already_linked,
-          }
-        : null
-    }
-
     return ok(`wrote global config ${gPath}`, data)
   })

package/extension/workflows/start.ts

@@ -114,7 +114,6 @@ export const startWorkflow = (
       pending_role: null,
       pending_pane_id: null,
       pending_pane_label: null,
-      pending_floating_exit: null,
       pending_started_at: null,
       pending_deadline_ms: null,
       pending_nudged_at: null,

package/extension/workflows/wait.ts

@@ -7,11 +7,7 @@ import {
   isCompleteArtifact,
   parseFrontMatter,
 } from "../domain/frontmatter.ts"
-import {
-  looksLikeShellOnly,
-  parseFloatingExit,
-  shellJoin,
-} from "../domain/herdr.ts"
+import { looksLikeShellOnly, shellJoin } from "../domain/herdr.ts"
 import { abs, rel } from "../domain/paths.ts"
 import {
   nextAfter,
@@ -290,16 +286,6 @@ export const waitWorkflow = (
         return parseFrontMatter(text)
       })
 
-    const readFloatingExitCode = (
-      exitAbs: string,
-    ): Effect.Effect<number | null> =>
-      Effect.gen(function* () {
-        const present = yield* fs.exists(exitAbs)
-        if (!present) return null
-        const text = yield* fs.readFile(exitAbs)
-        return parseFloatingExit(text)
-      })
-
     const advanceOnComplete = (
       fm: FrontMatter,
       msg = "artifact ready",
@@ -384,7 +370,6 @@ export const waitWorkflow = (
         state.pending_role = null
         state.pending_pane_id = null
         state.pending_pane_label = null
-        state.pending_floating_exit = null
         state.pending_started_at = null
         state.pending_deadline_ms = null
         resetRecoveryLadder(state)
@@ -406,8 +391,6 @@ export const waitWorkflow = (
         )
       })
 
-    const floatingFlushMs = 2_000
-
     let lastStatus = "waiting"
     /**
      * Both counters below are per-call on purpose. They measure a duration
@@ -418,7 +401,6 @@ export const waitWorkflow = (
      */
     let shellOnlyPolls = 0
     let idleSince: number | null = null
-    let floatingExitSeenAt: number | null = null
     let nudged = state.pending_nudged_at != null
     let extendedOnce = state.pending_extended
     let finalNudgeGrace = state.pending_final_grace
@@ -497,44 +479,6 @@ export const waitWorkflow = (
           )
         }
 
-        // Floating oneshot: no pane id — exit file is liveness. Fail closed
-        // when the popup dies without a complete artifact instead of
-        // hanging until timeout.
-        if (state.pending_floating_exit) {
-          const exitAbs = abs(state.pending_floating_exit, root)
-          const code = yield* readFloatingExitCode(exitAbs)
-          if (code != null) {
-            lastStatus = `floating_exit_${code}`
-            floatingExitSeenAt ??= now
-            // Short flush window: oneshot may finish writing as the process exits.
-            if (now - floatingExitSeenAt >= floatingFlushMs) {
-              const again = yield* readArtifact()
-              if (isCompleteArtifact(again, { requireVerdict })) {
-                return yield* advanceOnComplete(
-                  again!,
-                  "artifact ready (floating oneshot exited)",
-                )
-              }
-              state.pending_floating_exit = null
-              state.last_error = `floating oneshot exited ${code} without ${pendingArtifact}`
-              yield* store.save(state, root)
-              return yield* new HerdrError({
-                message: `floating ${state.pending_role} exited (code ${code}) without writing ${pendingArtifact}`,
-                details: {
-                  exit_code: code,
-                  last_agent_status: lastStatus,
-                  hint:
-                    code === 129
-                      ? "popup received Hangup (dismiss/focus steal) — re-dispatch same round; keep focus on the popup"
-                      : "inspect oneshot output; re-dispatch same round or set pane_style=regular",
-                },
-              })
-            }
-          } else {
-            lastStatus = "floating_running"
-          }
-        }
-
         if ((yield* herdr.enabled) && state.pending_pane_id) {
           const info = yield* herdr.paneGet(state.pending_pane_id)
           if (!info.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naxodev/apnea",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Host-neutral multi-role workflow engine and standalone Bun CLI",
   "license": "MIT",
   "author": "Nacho Vazquez",
@@ -39,7 +39,6 @@
     "docs/adr",
     "docs/protocol",
     "extension",
-    "herdr-plugin",
     "schemas",
     "!extension/**/*.test.ts",
     "!extension/test"

package/schemas/config.schema.json

@@ -35,16 +35,16 @@
         }
       }
     },
+    "pane_style": {
+      "type": "string",
+      "enum": ["regular", "floating"],
+      "deprecated": true,
+      "description": "Deprecated migration-only setting. The runtime accepts and ignores it during migration."
+    },
     "review_round_cap": { "type": "integer", "minimum": 1, "maximum": 20 },
     "timeouts_ms": {
       "type": "object",
       "additionalProperties": { "type": "integer", "minimum": 1000 }
-    },
-    "pane_style": {
-      "type": "string",
-      "enum": ["regular", "floating"],
-      "default": "regular",
-      "description": "Herdr pane style for role dispatches. \"floating\" applies to oneshot roles only and requires herdr >= 0.7.4; interactive roles always use regular panes. Default: regular."
     }
   }
 }

package/schemas/state.schema.json

@@ -34,9 +34,13 @@
     "last_error": { "type": ["string", "null"] },
     "pending_artifact": { "type": ["string", "null"] },
     "pending_role": { "type": ["string", "null"] },
+    "pending_floating_exit": {
+      "type": "null",
+      "deprecated": true,
+      "description": "Deprecated migration-only field. Missing or null values migrate; active non-null legacy floating runs must be abandoned."
+    },
     "pending_pane_id": { "type": ["string", "null"] },
     "pending_pane_label": { "type": ["string", "null"] },
-    "pending_floating_exit": { "type": ["string", "null"] },
     "pending_started_at": { "type": ["integer", "null"] },
     "pending_deadline_ms": { "type": ["integer", "null"] },
     "pending_nudged_at": { "type": ["integer", "null"] },

package/herdr-plugin/herdr-plugin.toml

@@ -1,15 +0,0 @@
-id = "apnea"
-name = "Apnea"
-version = "0.1.0"
-description = "Apnea floating-pane worker for oneshot role dispatches."
-min_herdr_version = "0.7.4"
-platforms = ["linux", "macos"]
-
-[[panes]]
-id = "worker"
-title = "Apnea worker"
-placement = "overlay"
-# Absolute bash + plugin-relative script. Bare `bash` fails on stripped plugin
-# PATH (exit 127). Do not pass a foreign --cwd to plugin pane open — relative
-# script paths resolve against that cwd, not plugin_root.
-command = ["/bin/bash", "scripts/run-task.sh"]

package/herdr-plugin/scripts/run-task.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-if [[ -z "${APNEA_TASK_SCRIPT:-}" ]]; then
-	echo "apnea: APNEA_TASK_SCRIPT not set (open this pane via apnea dispatch)" >&2
-	exit 64
-fi
-# Absolute bash: popup PATH may not resolve bare `bash` (exit 127).
-exec /bin/bash "$APNEA_TASK_SCRIPT"