@bastani/atomic 0.5.1 → 0.5.2-0

package/src/sdk/runtime/executor.ts

@@ -4,10 +4,14 @@
  * Architecture:
  * 1. `executeWorkflow()` is called by the CLI command
  * 2. It creates a tmux session with an orchestrator pane that runs
- *    `bun run executor.ts --run <args>`
+ *    `bun run executor-entry.ts` (a thin wrapper that calls `runOrchestrator()`)
  * 3. The CLI then attaches to the tmux session (user sees it live)
  * 4. The orchestrator pane calls `definition.run(workflowCtx)` — the
  *    user's callback uses `ctx.stage()` to spawn agent sessions
+ *
+ * The entry point is in executor-entry.ts (not this file) to avoid Bun's
+ * dual-module-identity issue: Bun evaluates a file twice when it is both
+ * the entry point and reached through package.json `exports` self-referencing.
  */
 
 import { join, resolve } from "path";
@@ -275,8 +279,11 @@ export async function executeWorkflow(
   const sessionsBaseDir = join(getSessionsBaseDir(), workflowRunId);
   await ensureDir(sessionsBaseDir);
 
-  // Write a launcher script for the orchestrator pane
-  const thisFile = resolve(import.meta.dir, "executor.ts");
+  // Write a launcher script for the orchestrator pane.
+  // Points to executor-entry.ts (not executor.ts) to avoid Bun's
+  // dual-module-identity issue: entry points and package self-references
+  // are evaluated as separate module instances in Bun.
+  const thisFile = resolve(import.meta.dir, "executor-entry.ts");
   const isWin = process.platform === "win32";
   const launcherExt = isWin ? "ps1" : "sh";
   const launcherPath = join(sessionsBaseDir, `orchestrator.${launcherExt}`);
@@ -291,7 +298,7 @@ export async function executeWorkflow(
         `$env:ATOMIC_WF_PROMPT = "${escPwsh(Buffer.from(prompt).toString("base64"))}"`,
         `$env:ATOMIC_WF_FILE = "${escPwsh(workflowFile)}"`,
         `$env:ATOMIC_WF_CWD = "${escPwsh(projectRoot)}"`,
-        `bun run "${escPwsh(thisFile)}" --run 2>"${escPwsh(logPath)}"`,
+        `bun run "${escPwsh(thisFile)}" 2>"${escPwsh(logPath)}"`,
       ].join("\n")
     : [
         "#!/bin/bash",
@@ -302,7 +309,7 @@ export async function executeWorkflow(
         `export ATOMIC_WF_PROMPT="${escBash(Buffer.from(prompt).toString("base64"))}"`,
         `export ATOMIC_WF_FILE="${escBash(workflowFile)}"`,
         `export ATOMIC_WF_CWD="${escBash(projectRoot)}"`,
-        `bun run "${escBash(thisFile)}" --run 2>"${escBash(logPath)}"`,
+        `bun run "${escBash(thisFile)}" 2>"${escBash(logPath)}"`,
       ].join("\n");
 
   await writeFile(launcherPath, launcherScript, { mode: 0o755 });
@@ -427,6 +434,8 @@ interface SharedRunnerState {
   activeRegistry: Map<string, ActiveSession>;
   /** Sessions that completed successfully (for transcript reads). */
   completedRegistry: Map<string, SessionResult>;
+  /** Sessions that already failed before completing successfully. */
+  failedRegistry: Set<string>;
 }
 
 /**
@@ -547,7 +556,11 @@ function createSessionRunner(
     if (!name || name.trim() === "") {
       throw new Error("Session name is required.");
     }
-    if (shared.activeRegistry.has(name) || shared.completedRegistry.has(name)) {
+    if (
+      shared.activeRegistry.has(name) ||
+      shared.completedRegistry.has(name) ||
+      shared.failedRegistry.has(name)
+    ) {
       throw new Error(`Duplicate session name: "${name}"`);
     }
 
@@ -570,6 +583,7 @@ function createSessionRunner(
 
     const sessionId = generateId();
     let paneId = "";
+    let panelSessionAdded = false;
 
     try {
 
@@ -603,6 +617,7 @@ function createSessionRunner(
 
       // ── 10. Add node to graph panel ──
       shared.panel.addSession(name, graphParents);
+      panelSessionAdded = true;
 
       // ── 11. Claude session snapshot (for identifying new sessions later) ──
       let knownClaudeSessionIds: Set<string> | undefined;
@@ -794,8 +809,16 @@ function createSessionRunner(
       graphTracker.onSettle(name);
       return { name, id: sessionId, result: callbackResult! };
     } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (panelSessionAdded) {
+        shared.panel.sessionError(name, message);
+      }
+      if (paneId) {
+        tmux.killWindow(shared.tmuxSessionName, name);
+      }
       // Ensure the done promise settles and the active entry is cleared.
       shared.activeRegistry.delete(name);
+      shared.failedRegistry.add(name);
       rejectDone(error);
       // Update frontier even on failure — if the caller catches and
       // continues, the next stage should still chain from this one.
@@ -809,7 +832,7 @@ function createSessionRunner(
 // Orchestrator logic — runs inside a tmux pane
 // ============================================================================
 
-async function runOrchestrator(): Promise<void> {
+export async function runOrchestrator(): Promise<void> {
   const requiredEnvVars = [
     "ATOMIC_WF_ID",
     "ATOMIC_WF_TMUX",
@@ -868,6 +891,7 @@ async function runOrchestrator(): Promise<void> {
     panel,
     activeRegistry: new Map(),
     completedRegistry: new Map(),
+    failedRegistry: new Set(),
   };
 
   try {
@@ -977,13 +1001,3 @@ async function runOrchestrator(): Promise<void> {
   }
 }
 
-// ============================================================================
-// Direct invocation: `bun run executor.ts --run`
-// ============================================================================
-
-if (process.argv.includes("--run")) {
-  runOrchestrator().catch((err) => {
-    console.error("Fatal:", err);
-    process.exitCode = 1;
-  });
-}

package/src/sdk/runtime/loader.ts

@@ -10,136 +10,12 @@
  * This module handles everything after a workflow is discovered.
  */
 
-import { join, dirname } from "path";
-import { existsSync } from "fs";
 import type { WorkflowDefinition, AgentType } from "../types.ts";
 import type { DiscoveredWorkflow } from "./discovery.ts";
 import { validateCopilotWorkflow } from "../providers/copilot.ts";
 import { validateOpenCodeWorkflow } from "../providers/opencode.ts";
 import { validateClaudeWorkflow } from "../providers/claude.ts";
 
-// ---------------------------------------------------------------------------
-// SDK module resolver
-// ---------------------------------------------------------------------------
-
-// Absolute path to the currently-running atomic CLI's own SDK source tree
-// (i.e. `<install_root>/src/sdk`). Computed from this file's URL so it always
-// points at the actual installed atomic, regardless of how it was launched
-// (dev checkout, global `bun install -g @bastani/atomic`, `bunx atomic`, etc).
-const ATOMIC_SDK_DIR = Bun.fileURLToPath(new URL("..", import.meta.url));
-
-// Directory of this loader file. Used as the parent for `Bun.resolveSync`
-// when delegating non-`atomic/*` bare specifiers, so workflows resolve them
-// against atomic's own `node_modules` tree.
-const LOADER_DIR = Bun.fileURLToPath(new URL(".", import.meta.url));
-
-// Common TypeScript/JavaScript extensions tried for `atomic/<subpath>`
-// imports when the specifier doesn't already include one.
-const ATOMIC_SUBPATH_EXTS = [".ts", ".tsx", ".js", ".jsx"];
-
-// Workflow roots for which a Bun.plugin onLoad hook has already been
-// registered. Deduped so repeated `load()` calls don't stack plugins.
-const registeredRoots = new Set<string>();
-
-function escapeRegex(s: string): string {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-/**
- * Resolve `atomic/<subpath>` (or bare `atomic`) to an absolute file path in
- * the running CLI's `src/sdk/` tree. Returns `null` if no matching file
- * exists so the caller can fall back to the original specifier.
- */
-function resolveAtomicSubpath(subpath: string): string | null {
-  const direct = join(ATOMIC_SDK_DIR, subpath);
-  if (existsSync(direct)) return direct;
-  for (const ext of ATOMIC_SUBPATH_EXTS) {
-    const candidate = join(ATOMIC_SDK_DIR, subpath + ext);
-    if (existsSync(candidate)) return candidate;
-  }
-  return null;
-}
-
-/**
- * Resolve a bare import specifier to an absolute file path. `atomic/<x>`
- * maps onto the SDK source tree; everything else delegates to atomic's own
- * module resolution context (so `@github/copilot-sdk`, `zod`, etc. resolve
- * from atomic's installed `node_modules`).
- */
-const ATOMIC_PKG = "@bastani/atomic";
-const ATOMIC_PKG_PREFIX = `${ATOMIC_PKG}/`;
-
-function resolveBareSpecifier(spec: string): string | null {
-  if (spec === ATOMIC_PKG) return resolveAtomicSubpath("index");
-  if (spec.startsWith(ATOMIC_PKG_PREFIX)) {
-    return resolveAtomicSubpath(spec.slice(ATOMIC_PKG_PREFIX.length));
-  }
-  try {
-    return Bun.resolveSync(spec, LOADER_DIR);
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Rewrite bare `import`/`from` specifiers in workflow source to absolute
- * file paths resolved from atomic's own context. Relative and absolute
- * paths are left untouched. Unresolvable specifiers are also left alone so
- * Bun produces its standard "module not found" error instead of a silent
- * miss.
- */
-function rewriteBareImports(source: string): string {
-  // Matches:  from "spec"  |  from 'spec'  |  import "spec"  |  import 'spec'
-  // The backreference (\2) ensures matched quotes are balanced.
-  const importRe = /(\bfrom\s*|\bimport\s*)(["'])([^"']+)\2/g;
-  return source.replace(importRe, (match, kw: string, quote: string, spec: string) => {
-    if (spec.startsWith(".") || spec.startsWith("/")) return match;
-    const resolved = resolveBareSpecifier(spec);
-    return resolved ? `${kw}${quote}${resolved}${quote}` : match;
-  });
-}
-
-/**
- * Register a Bun `onLoad` plugin that rewrites bare imports inside any TS
- * file under the given workflow root. This lets workflow authors write
- * `import { defineWorkflow } from "@bastani/atomic/workflows"` (and import
- * atomic's transitive deps like `@github/copilot-sdk`) without maintaining
- * their own `package.json` / `node_modules`.
- *
- * Why source rewriting via `onLoad` instead of `onResolve`?
- * Bun's runtime plugin API honors `onLoad` but silently ignores `onResolve`
- * hooks for dynamic `await import()` calls — `onResolve` only fires during
- * `Bun.build`. Source rewriting is the only mechanism that actually changes
- * how the runtime loader resolves imports inside workflow files today.
- *
- * Each distinct workflow root installs its own plugin (deduped via
- * `registeredRoots`). The plugin's filter is a path-prefix regex so we
- * don't incur the cost of reading every `.ts` file in the process — only
- * files under active workflow roots are intercepted.
- */
-function installAtomicLoader(workflowRoot: string): void {
-  if (registeredRoots.has(workflowRoot)) return;
-  registeredRoots.add(workflowRoot);
-
-  // Match `<workflowRoot>/<...>/*.ts(x)`. Uses a character class for the
-  // separator so the same filter works on both POSIX and Windows paths.
-  const filter = new RegExp(
-    "^" + escapeRegex(workflowRoot) + "[/\\\\].*\\.tsx?$",
-  );
-
-  Bun.plugin({
-    name: `atomic-sdk-rewriter:${workflowRoot}`,
-    setup(build) {
-      build.onLoad({ filter }, async (args) => {
-        const source = await Bun.file(args.path).text();
-        const contents = rewriteBareImports(source);
-        const loader = args.path.endsWith("x") ? "tsx" : "ts";
-        return { contents, loader };
-      });
-    },
-  });
-}
-
 export namespace WorkflowLoader {
   // ---------------------------------------------------------------------------
   // Result types
@@ -281,9 +157,6 @@ export namespace WorkflowLoader {
     validated: Validated,
   ): Promise<StageResult<Loaded, "load">> {
     try {
-      // The workflow root is two levels up from <root>/<agent>/index.ts,
-      // which covers agent dirs and any sibling `helpers/` folders.
-      installAtomicLoader(dirname(dirname(validated.path)));
       const mod = await import(validated.path);
       const definition = mod.default ?? mod;
 

package/{.atomic/workflows → src/sdk/workflows/builtin}/ralph/claude/index.ts

@@ -10,7 +10,7 @@
  * Run: atomic workflow -n ralph -a claude "<your spec>"
  */
 
-import { defineWorkflow } from "@bastani/atomic/workflows";
+import { defineWorkflow } from "../../../index.ts";
 
 import {
   buildPlannerPrompt,

package/{.atomic/workflows → src/sdk/workflows/builtin}/ralph/copilot/index.ts

@@ -10,7 +10,7 @@
  * Run: atomic workflow -n ralph -a copilot "<your spec>"
  */
 
-import { defineWorkflow } from "@bastani/atomic/workflows";
+import { defineWorkflow } from "../../../index.ts";
 import type { SessionEvent } from "@github/copilot-sdk";
 
 import {

package/{.atomic/workflows → src/sdk/workflows/builtin}/ralph/opencode/index.ts

@@ -10,7 +10,7 @@
  * Run: atomic workflow -n ralph -a opencode "<your spec>"
  */
 
-import { defineWorkflow } from "@bastani/atomic/workflows";
+import { defineWorkflow } from "../../../index.ts";
 
 import {
   buildPlannerPrompt,

package/src/sdk/{workflows.ts → workflows/index.ts}

@@ -6,7 +6,7 @@
  * for spawning agent sessions using native TypeScript control flow.
  */
 
-export { defineWorkflow, WorkflowBuilder } from "./define-workflow.ts";
+export { defineWorkflow, WorkflowBuilder } from "../define-workflow.ts";
 
 export type {
   AgentType,
@@ -33,7 +33,7 @@ export type {
   ClaudeClientWrapper,
   ClaudeSessionWrapper,
   ClaudeQueryDefaults,
-} from "./types.ts";
+} from "../types.ts";
 
 // Re-export native SDK types for convenience
 export type { SessionEvent as CopilotSessionEvent } from "@github/copilot-sdk";
@@ -41,14 +41,14 @@ export type { SessionPromptResponse as OpenCodePromptResponse } from "@opencode-
 export type { SessionMessage as ClaudeSessionMessage } from "@anthropic-ai/claude-agent-sdk";
 
 // Providers
-export { createClaudeSession, claudeQuery, clearClaudeSession, validateClaudeWorkflow } from "./providers/claude.ts";
-export type { ClaudeSessionOptions, ClaudeQueryOptions, ClaudeQueryResult, ClaudeValidationWarning } from "./providers/claude.ts";
+export { createClaudeSession, claudeQuery, clearClaudeSession, validateClaudeWorkflow } from "../providers/claude.ts";
+export type { ClaudeSessionOptions, ClaudeQueryOptions, ClaudeQueryResult, ClaudeValidationWarning } from "../providers/claude.ts";
 
-export { validateCopilotWorkflow } from "./providers/copilot.ts";
-export type { CopilotValidationWarning } from "./providers/copilot.ts";
+export { validateCopilotWorkflow } from "../providers/copilot.ts";
+export type { CopilotValidationWarning } from "../providers/copilot.ts";
 
-export { validateOpenCodeWorkflow } from "./providers/opencode.ts";
-export type { OpenCodeValidationWarning } from "./providers/opencode.ts";
+export { validateOpenCodeWorkflow } from "../providers/opencode.ts";
+export type { OpenCodeValidationWarning } from "../providers/opencode.ts";
 
 // Runtime — tmux utilities
 export {
@@ -82,7 +82,7 @@ export {
   paneIsIdle,
   waitForPaneReady,
   attemptSubmitRounds,
-} from "./runtime/tmux.ts";
+} from "../runtime/tmux.ts";
 
 // Runtime — workflow discovery
 export {
@@ -90,12 +90,12 @@ export {
   discoverWorkflows,
   findWorkflow,
   WORKFLOWS_GITIGNORE,
-} from "./runtime/discovery.ts";
-export type { DiscoveredWorkflow } from "./runtime/discovery.ts";
+} from "../runtime/discovery.ts";
+export type { DiscoveredWorkflow } from "../runtime/discovery.ts";
 
 // Runtime — workflow loader pipeline
-export { WorkflowLoader } from "./runtime/loader.ts";
+export { WorkflowLoader } from "../runtime/loader.ts";
 
 // Runtime — workflow executor
-export { executeWorkflow } from "./runtime/executor.ts";
-export type { WorkflowRunOptions } from "./runtime/executor.ts";
+export { executeWorkflow } from "../runtime/executor.ts";
+export type { WorkflowRunOptions } from "../runtime/executor.ts";

package/src/services/system/auto-sync.ts

@@ -38,7 +38,6 @@ import {
   upgradeLiteparse,
 } from "@/lib/spawn.ts";
 import { installGlobalAgents } from "@/services/system/agents.ts";
-import { installGlobalWorkflows } from "@/services/system/workflows.ts";
 import { installGlobalSkills } from "@/services/system/skills.ts";
 import { runSteps, printSummary } from "@/services/system/install-ui.ts";
 
@@ -108,7 +107,6 @@ export async function autoSyncIfStale(): Promise<void> {
     { label: "@playwright/cli",    fn: upgradePlaywrightCli },
     { label: "@llamaindex/liteparse", fn: upgradeLiteparse },
     { label: "global agent configs",  fn: installGlobalAgents },
-    { label: "global workflows",      fn: installGlobalWorkflows },
     { label: "global skills",         fn: installGlobalSkills },
   ]);
 

package/.atomic/workflows/hello/claude/index.ts

@@ -1,40 +0,0 @@
-/**
- * Hello workflow for Claude Code — two-session example.
- *
- * Claude runs as a full interactive TUI in a tmux pane.
- * We automate it via tmux send-keys using the claudeQuery() helper.
- * Transcript is extracted via the Claude Agent SDK's getSessionMessages().
- *
- * Run: atomic workflow -n hello -a claude "describe this project"
- */
-
-import { defineWorkflow } from "@bastani/atomic/workflows";
-
-export default defineWorkflow<"claude">({
-  name: "hello",
-  description: "Two-session Claude demo: describe → summarize",
-})
-  .run(async (ctx) => {
-    const describe = await ctx.stage(
-      { name: "describe", description: "Ask Claude to describe the project" },
-      {},
-      {},
-      async (s) => {
-        await s.session.query(s.userPrompt);
-        s.save(s.sessionId);
-      },
-    );
-
-    await ctx.stage(
-      { name: "summarize", description: "Summarize the previous session's output" },
-      {},
-      {},
-      async (s) => {
-        const research = await s.transcript(describe);
-
-        await s.session.query(`Read ${research.path} and summarize it in 2-3 bullet points.`);
-        s.save(s.sessionId);
-      },
-    );
-  })
-  .compile();

package/.atomic/workflows/hello/copilot/index.ts

@@ -1,53 +0,0 @@
-/**
- * Hello workflow for Copilot — two-session example.
- *
- * Session 1: Ask the agent to describe the project.
- * Session 2: Read session 1's transcript and summarize it.
- *
- * Run: atomic workflow -n hello -a copilot "describe this project"
- */
-
-import { defineWorkflow } from "@bastani/atomic/workflows";
-
-/**
- * `CopilotSession.sendAndWait` defaults to a 60s timeout and THROWS on
- * expiry, which crashes the workflow mid-stage. Override with a generous
- * 30-minute budget so legitimate long-running agent work completes.
- */
-const SEND_TIMEOUT_MS = 30 * 60 * 1000;
-
-export default defineWorkflow<"copilot">({
-  name: "hello",
-  description: "Two-session Copilot demo: describe → summarize",
-})
-  .run(async (ctx) => {
-    const describe = await ctx.stage(
-      { name: "describe", description: "Ask the agent to describe the project" },
-      {},
-      {},
-      async (s) => {
-        await s.session.sendAndWait({ prompt: s.userPrompt }, SEND_TIMEOUT_MS);
-
-        s.save(await s.session.getMessages());
-      },
-    );
-
-    await ctx.stage(
-      { name: "summarize", description: "Summarize the previous session's output" },
-      {},
-      {},
-      async (s) => {
-        const research = await s.transcript(describe);
-
-        await s.session.sendAndWait(
-          {
-            prompt: `Summarize the following in 2-3 bullet points:\n\n${research.content}`,
-          },
-          SEND_TIMEOUT_MS,
-        );
-
-        s.save(await s.session.getMessages());
-      },
-    );
-  })
-  .compile();

package/.atomic/workflows/hello/opencode/index.ts

@@ -1,52 +0,0 @@
-/**
- * Hello workflow for OpenCode — two-session example.
- *
- * Session 1: Ask the agent to describe the project.
- * Session 2: Read session 1's transcript and summarize it.
- *
- * Run: atomic workflow -n hello -a opencode "describe this project"
- */
-
-import { defineWorkflow } from "@bastani/atomic/workflows";
-
-export default defineWorkflow<"opencode">({
-  name: "hello",
-  description: "Two-session OpenCode demo: describe → summarize",
-})
-  .run(async (ctx) => {
-    const describe = await ctx.stage(
-      { name: "describe", description: "Ask the agent to describe the project" },
-      {},
-      { title: "describe" },
-      async (s) => {
-        const result = await s.client.session.prompt({
-          sessionID: s.session.id,
-          parts: [{ type: "text", text: s.userPrompt }],
-        });
-
-        s.save(result.data!);
-      },
-    );
-
-    await ctx.stage(
-      { name: "summarize", description: "Summarize the previous session's output" },
-      {},
-      { title: "summarize" },
-      async (s) => {
-        const research = await s.transcript(describe);
-
-        const result = await s.client.session.prompt({
-          sessionID: s.session.id,
-          parts: [
-            {
-              type: "text",
-              text: `Summarize the following in 2-3 bullet points:\n\n${research.content}`,
-            },
-          ],
-        });
-
-        s.save(result.data!);
-      },
-    );
-  })
-  .compile();

package/.atomic/workflows/hello-parallel/claude/index.ts

@@ -1,73 +0,0 @@
-/**
- * Hello-parallel workflow for Claude Code — parallel session example.
- *
- * Session 1 (sequential): Ask Claude to describe the project.
- * Sessions 2+3 (parallel): Two agents summarize session 1 concurrently.
- * Session 4 (sequential): Merge both summaries into a final output.
- *
- * Run: atomic workflow -n hello-parallel -a claude "describe this project"
- */
-
-import { defineWorkflow } from "@bastani/atomic/workflows";
-
-export default defineWorkflow<"claude">({
-  name: "hello-parallel",
-  description: "Parallel Claude demo: describe → [summarize-a, summarize-b] → merge",
-})
-  .run(async (ctx) => {
-    const describe = await ctx.stage(
-      { name: "describe", description: "Ask Claude to describe the project" },
-      {},
-      {},
-      async (s) => {
-        await s.session.query(s.userPrompt);
-        s.save(s.sessionId);
-      },
-    );
-
-    const [summarizeA, summarizeB] = await Promise.all([
-      ctx.stage(
-        { name: "summarize-a", description: "Summarize the description as bullet points" },
-        {},
-        {},
-        async (s) => {
-          const research = await s.transcript(describe);
-          await s.session.query(`Read ${research.path} and summarize it in 2-3 bullet points.`);
-          s.save(s.sessionId);
-        },
-      ),
-      ctx.stage(
-        { name: "summarize-b", description: "Summarize the description as a one-liner" },
-        {},
-        {},
-        async (s) => {
-          const research = await s.transcript(describe);
-          await s.session.query(`Read ${research.path} and summarize it in a single sentence.`);
-          s.save(s.sessionId);
-        },
-      ),
-    ]);
-
-    await ctx.stage(
-      { name: "merge", description: "Merge both summaries into a final output" },
-      {},
-      {},
-      async (s) => {
-        const bullets = await s.transcript(summarizeA);
-        const oneliner = await s.transcript(summarizeB);
-        await s.session.query(
-          [
-            "Combine the following two summaries into one concise paragraph:",
-            "",
-            "## Bullet points",
-            bullets.content,
-            "",
-            "## One-liner",
-            oneliner.content,
-          ].join("\n"),
-        );
-        s.save(s.sessionId);
-      },
-    );
-  })
-  .compile();