@naxodev/apnea 0.1.0 → 0.2.0

package/extension/schema/config.ts

@@ -4,7 +4,6 @@ import {
   DEFAULT_TIMEOUTS,
   ROLE_MODE,
   type ApneaConfig,
-  type PaneStyle,
   type Profile,
   type Role,
   type RoleMode,
@@ -21,8 +20,6 @@ const RoleBindingSchema = Schema.Struct({
   profile: Schema.String.check(Schema.isMinLength(1)),
 })
 
-export const PaneStyleSchema = Schema.Literals(["regular", "floating"] as const)
-
 /**
  * Mirrors `schemas/config.schema.json` top-level keys.
  *
@@ -35,7 +32,6 @@ export const GlobalConfigSchema = Schema.Struct({
   roles: Schema.optional(Schema.Record(Schema.String, RoleBindingSchema)),
   review_round_cap: Schema.optional(Schema.Number),
   timeouts_ms: Schema.optional(Schema.Record(Schema.String, Schema.Number)),
-  pane_style: Schema.optional(PaneStyleSchema),
 })
 
 const PROJECT_KNOWN = new Set([
@@ -63,7 +59,6 @@ export const ProjectConfigSchema = Schema.Struct({
   review_round_cap: Schema.optional(Schema.Number),
   timeouts_ms: Schema.optional(Schema.Record(Schema.String, Schema.Number)),
   isolation: Schema.optional(Schema.Literal("shared_cwd")),
-  pane_style: Schema.optional(PaneStyleSchema),
 })
 
 function configFail(
@@ -96,6 +91,16 @@ export function decodeGlobalConfig(
 
   const obj = objR.success
 
+  if (
+    "pane_style" in obj &&
+    obj.pane_style !== "regular" &&
+    obj.pane_style !== "floating"
+  ) {
+    return configFail(
+      `invalid legacy pane_style=${JSON.stringify(obj.pane_style)}; expected "regular" or "floating"`,
+    )
+  }
+
   if (
     "isolation" in obj &&
     obj.isolation !== undefined &&
@@ -119,7 +124,8 @@ export function decodeGlobalConfig(
     }
   }
 
-  const decoded = Schema.decodeUnknownResult(GlobalConfigSchema)(obj)
+  const { pane_style: _legacy, ...globalConfig } = obj
+  const decoded = Schema.decodeUnknownResult(GlobalConfigSchema)(globalConfig)
   if (Result.isFailure(decoded)) {
     return configFail(decoded.failure.message)
   }
@@ -150,11 +156,6 @@ export function decodeGlobalConfig(
     }
   }
 
-  const pane_style: PaneStyle =
-    d.pane_style === "regular" || d.pane_style === "floating"
-      ? d.pane_style
-      : "regular"
-
   return Result.succeed({
     profiles,
     roles,
@@ -163,7 +164,6 @@ export function decodeGlobalConfig(
         ? d.review_round_cap
         : 3,
     timeouts_ms: timeouts,
-    pane_style,
   })
 }
 
@@ -179,6 +179,18 @@ export function decodeProjectConfig(
 
   const obj = objR.success
 
+  // Legacy project configs may contain this retired preference. Validate it
+  // before stripping it so typos still fail instead of becoming silent no-ops.
+  if (
+    "pane_style" in obj &&
+    obj.pane_style !== "regular" &&
+    obj.pane_style !== "floating"
+  ) {
+    return configFail(
+      `invalid legacy pane_style=${JSON.stringify(obj.pane_style)}; expected "regular" or "floating"`,
+    )
+  }
+
   for (const key of Object.keys(obj)) {
     if (PROJECT_FORBIDDEN.has(key)) {
       return configFail(
@@ -214,9 +226,13 @@ export function decodeProjectConfig(
     }
   }
 
-  const decoded = Schema.decodeUnknownResult(ProjectConfigSchema)(obj, {
-    onExcessProperty: "error",
-  })
+  const { pane_style: _legacy, ...projectConfig } = obj
+  const decoded = Schema.decodeUnknownResult(ProjectConfigSchema)(
+    projectConfig,
+    {
+      onExcessProperty: "error",
+    },
+  )
   if (Result.isFailure(decoded)) {
     return configFail(decoded.failure.message)
   }
@@ -251,8 +267,6 @@ export function applyProjectConfig(
         ? overlay.review_round_cap
         : cfg.review_round_cap,
     timeouts_ms: timeouts,
-    pane_style:
-      overlay.pane_style !== undefined ? overlay.pane_style : cfg.pane_style,
   }
 }
 

package/extension/schema/state.ts

@@ -48,8 +48,6 @@ export const RunStateSchema = Schema.Struct({
   // optional on Encoded so legacy fixtures without pane fields still decode
   pending_pane_id: Schema.optionalKey(Schema.NullOr(Schema.String)),
   pending_pane_label: Schema.optionalKey(Schema.NullOr(Schema.String)),
-  /** Mirrored in `schemas/state.schema.json`; drift is caught by schema.test.ts. */
-  pending_floating_exit: Schema.optionalKey(Schema.NullOr(Schema.String)),
   pending_started_at: Schema.optionalKey(Schema.NullOr(Schema.Number)),
   pending_deadline_ms: Schema.optionalKey(Schema.NullOr(Schema.Number)),
   pending_nudged_at: Schema.optionalKey(Schema.NullOr(Schema.Number)),
@@ -69,6 +67,22 @@ export function decodeRunState(
   json: unknown,
   path = "state.json",
 ): Result.Result<RunState, StateCorrupt> {
+  if (
+    json !== null &&
+    typeof json === "object" &&
+    !Array.isArray(json) &&
+    "pending_floating_exit" in json &&
+    json.pending_floating_exit !== null
+  ) {
+    return Result.fail(
+      new StateCorrupt({
+        path,
+        message:
+          'this run has an active legacy floating dispatch, but floating dispatch was removed; dismiss or terminate the old popup first, then run `apnea abandon` and `apnea start "<goal>"`',
+      }),
+    )
+  }
+
   const decoded = Schema.decodeUnknownResult(RunStateSchema)(json)
   if (Result.isFailure(decoded)) {
     return Result.fail(
@@ -95,7 +109,6 @@ export function decodeRunState(
     pending_role: d.pending_role,
     pending_pane_id: d.pending_pane_id ?? null,
     pending_pane_label: d.pending_pane_label ?? null,
-    pending_floating_exit: d.pending_floating_exit ?? null,
     pending_started_at: d.pending_started_at ?? null,
     pending_deadline_ms: d.pending_deadline_ms ?? null,
     pending_nudged_at: d.pending_nudged_at ?? null,

package/extension/services/herdr.ts

@@ -1,13 +1,8 @@
 import { spawnSync } from "node:child_process"
 import * as fs from "node:fs"
-import * as os from "node:os"
 import * as path from "node:path"
 import { Clock, Context, Effect, Layer, Option, Result } from "effect"
-import {
-  floatingTaskScriptBody,
-  parseHerdrVersion,
-  shellJoin,
-} from "../domain/herdr.ts"
+import { shellJoin } from "../domain/herdr.ts"
 import { HerdrError } from "../errors.ts"
 import type { ApneaHostAdapter } from "../host-adapter.ts"
 import { neutralHostAdapter } from "../host-adapter.ts"
@@ -33,8 +28,6 @@ export interface HerdrService {
   readonly enabled: Effect.Effect<boolean>
   /** Dispatch preflight that distinguishes a stale pane from CLI failures. */
   readonly availability: Effect.Effect<HerdrAvailability, HerdrError>
-  readonly version: Effect.Effect<[number, number, number] | null>
-  readonly hasApneaPlugin: Effect.Effect<boolean>
   readonly paneGet: (paneId: string) => Effect.Effect<PaneInfo>
   readonly paneRun: (
     paneId: string,
@@ -50,20 +43,6 @@ export interface HerdrService {
     prompt: string,
     prefer: RolePaneRef | null,
   ) => Effect.Effect<InteractiveLaunch, HerdrError>
-  readonly writeFloatingTaskScript: (
-    scriptAbs: string,
-    root: string,
-    cmd: string[],
-    prompt: string,
-    exitFileAbs: string,
-  ) => Effect.Effect<void, HerdrError>
-  readonly openFloatingPane: (
-    taskScriptAbs: string,
-    root: string,
-  ) => Effect.Effect<void, HerdrError>
-  readonly linkPlugin: (
-    dir: string,
-  ) => Effect.Effect<{ ok: boolean; raw: string }>
 }
 
 export class Herdr extends Context.Service<Herdr, HerdrService>()(
@@ -118,11 +97,8 @@ function isExecutableFile(abs: string): boolean {
 }
 
 /**
- * Resolve a oneshot binary against the orchestrator environment.
- * Floating plugin popups get a stripped PATH (no ~/.local/bin etc.), so bare
- * names like `claude` exit 127 unless we bake an absolute path into the script.
- * Walks PATH directly — no `which` subprocess (which itself vanishes when PATH
- * is overridden for tests or minimal envs).
+ * Resolve a binary against the current environment. Walks PATH directly so
+ * setup detection does not depend on a separate `which` executable.
  */
 export function resolveExecutable(
   bin: string,
@@ -141,36 +117,6 @@ export function resolveExecutable(
   return null
 }
 
-/**
- * PATH for floating plugin panes: orchestrator PATH plus common user-local
- * bin dirs so child tools the oneshot agent spawns still resolve.
- */
-export function floatingPanePath(
-  base: string = process.env.PATH ?? "",
-  home: string = os.homedir(),
-): string {
-  const extras = [
-    path.join(home, ".local", "bin"),
-    path.join(home, ".bun", "bin"),
-    "/opt/homebrew/bin",
-    "/usr/local/bin",
-  ]
-  const parts = base.split(path.delimiter).filter(Boolean)
-  const seen = new Set(parts)
-  for (const extra of extras) {
-    if (seen.has(extra)) continue
-    try {
-      if (fs.statSync(extra).isDirectory()) {
-        parts.push(extra)
-        seen.add(extra)
-      }
-    } catch {
-      // skip missing dirs
-    }
-  }
-  return parts.join(path.delimiter)
-}
-
 function herdrEnabledSync(): boolean {
   return process.env.HERDR_ENV === "1"
 }
@@ -309,24 +255,6 @@ function paneSendKeysSync(paneId: string, keys: string[]): void {
   }
 }
 
-function herdrVersionSync(): [number, number, number] | null {
-  return parseHerdrVersion(herdrCli(["--version"]).raw)
-}
-
-function hasApneaPluginSync(): boolean {
-  const r = herdrCli(["plugin", "list", "--plugin", "apnea", "--json"])
-  const json = r.json
-  if (json) {
-    const res = resultOf(json)
-    const plugins = (res?.plugins as Array<Record<string, unknown>>) ?? []
-    if (plugins.some((p) => p.plugin_id === "apnea" || p.id === "apnea")) {
-      return true
-    }
-  }
-  // Fallback when JSON shape is unexpected but the id still appears in output.
-  return /"(?:plugin_id|id)"\s*:\s*"apnea"/.test(r.raw)
-}
-
 function paneForegroundNamesSync(paneId: string): string[] {
   try {
     const r = spawnSync("herdr", ["pane", "process-info", "--pane", paneId], {
@@ -739,9 +667,8 @@ function runInteractivePromptImpl(
 }
 
 /**
- * Thin Herdr service: pane lifecycle, interactive-prompt dispatch, and
- * floating-oneshot popups. Depends on nothing (spawns + node:fs directly,
- * like `VcsLive`'s `run`).
+ * Thin Herdr service for pane lifecycle and interactive-prompt dispatch.
+ * Depends on nothing, like `VcsLive`'s `run`.
  */
 export const makeHerdrLive = (hostAdapter: ApneaHostAdapter) =>
   Layer.effect(
@@ -755,10 +682,6 @@ export const makeHerdrLive = (hostAdapter: ApneaHostAdapter) =>
           catch: toHerdrError,
         }),
 
-        version: Effect.sync(herdrVersionSync),
-
-        hasApneaPlugin: Effect.sync(hasApneaPluginSync),
-
         paneGet: (paneId) => Effect.sync(() => paneGetSync(paneId)),
 
         paneRun,
@@ -774,85 +697,6 @@ export const makeHerdrLive = (hostAdapter: ApneaHostAdapter) =>
 
         runInteractivePrompt: (...args) =>
           runInteractivePromptImpl(hostAdapter, ...args),
-
-        writeFloatingTaskScript: (scriptAbs, root, cmd, prompt, exitFileAbs) =>
-          Effect.try({
-            try: () => {
-              if (cmd.length === 0) {
-                throw new HerdrError({
-                  message:
-                    "floating oneshot cmd is empty; set cmd_oneshot on the role profile",
-                })
-              }
-              const bin = cmd[0]
-              if (bin === undefined || bin === "") {
-                throw new HerdrError({
-                  message:
-                    "floating oneshot binary is empty; set cmd_oneshot on the role profile",
-                })
-              }
-              const resolved = resolveExecutable(bin)
-              if (!resolved) {
-                throw new HerdrError({
-                  message: `floating oneshot binary "${bin}" not found on PATH; use an absolute cmd_oneshot or set pane_style=regular`,
-                })
-              }
-              const resolvedCmd = [resolved, ...cmd.slice(1)]
-              // No `exec`: EXIT trap must run after the oneshot exits (Hangup
-              // included). End-of-options `--` before the prompt so variadic
-              // flags like Claude's `--allowedTools <tools...>` cannot swallow
-              // the prompt as another tool.
-              const body = floatingTaskScriptBody({
-                root,
-                resolvedCmd,
-                prompt,
-                exitFileAbs,
-              })
-              fs.writeFileSync(scriptAbs, body, "utf8")
-              fs.chmodSync(scriptAbs, 0o755)
-            },
-            catch: toHerdrError,
-          }),
-
-        openFloatingPane: (taskScriptAbs, _root) =>
-          Effect.try({
-            try: () => {
-              const r = herdrCli([
-                "plugin",
-                "pane",
-                "open",
-                "--plugin",
-                "apnea",
-                "--entrypoint",
-                "worker",
-                "--placement",
-                "popup",
-                "--env",
-                `APNEA_TASK_SCRIPT=${taskScriptAbs}`,
-                "--env",
-                `PATH=${floatingPanePath()}`,
-              ])
-              if (!r.ok) {
-                const raw = r.raw.trim()
-                if (/popup already open/i.test(raw)) {
-                  throw new HerdrError({
-                    message:
-                      "floating popup already open — herdr allows only one; dismiss it or workflow_wait for the in-flight oneshot before dispatching again",
-                  })
-                }
-                throw new HerdrError({
-                  message: `herdr plugin pane open failed: ${raw || r.raw}`,
-                })
-              }
-            },
-            catch: toHerdrError,
-          }),
-
-        linkPlugin: (dir) =>
-          Effect.sync(() => {
-            const r = herdrCli(["plugin", "link", dir])
-            return { ok: r.ok, raw: r.raw }
-          }),
       }),
     ),
   )