@rcrsr/claude-code-runner 0.6.2 → 0.7.1

package/README.md

@@ -1,13 +1,14 @@
 # Claude Code Runner
 
-Deterministic, scripted, unattended Claude Code execution.
+Deterministic, scripted, unattended Claude Code execution with [Rill](https://github.com/rcrsr/rill) scripting.
 
 ## Why Use This?
 
+- **Rich scripting** — Fully scriptable with variables, conditionals, loops, and functions
 - **Walk away** — Workflows run unattended in CI/CD pipelines
 - **Chain results** — Capture output from one step, inject it into the next
-- **Claude decides** — Signals control when to retry, escalate, or finish
-- **No hitting context limits** — Fresh context per step keeps long workflows running
+- **Claude decides** — Results protocol lets Claude control flow with `<ccr:result type="..."/>`
+- **No context limits** — Fresh context per step keeps long workflows running
 - **Watch live** — See tool calls stream as they execute
 - **Replay later** — Full session logs for debugging
 
@@ -75,62 +76,56 @@ Review $1 with severity level $2...
 
 ### script — Run multi-phase workflows
 
-Scripts chain commands where each phase builds on the previous. Output from one step can be captured and reused in subsequent steps via variable substitution.
+Scripts use [Rill](https://github.com/rcrsr/rill), a scripting language designed for AI workflows. Rill provides:
+
+- **Variables & capture** — Store Claude's output with `:>` operator
+- **Conditionals** — Branch logic with `(condition) ? action`
+- **Loops** — Iterate with `for` and `while`
+- **Functions** — Reusable logic blocks
+- **String interpolation** — Embed variables with `{$var}` syntax
+- **Heredocs** — Multi-line prompts with `<<EOF...EOF`
 
 ```bash
-claude-code-runner script refactor-workflow.txt src/api/
+claude-code-runner script workflow.rill src/api/
 ```
 
-**Script syntax:**
-
-| Syntax                              | Description                               |
-| ----------------------------------- | ----------------------------------------- |
-| `prompt("text")`                    | Run a prompt (supports `\n` for newlines) |
-| `prompt(<<EOF...EOF)`               | Multi-line prompt using heredoc           |
-| `command("name")`                   | Run a command template                    |
-| `command("name", ["arg1", "arg2"])` | Run command with arguments                |
-| `-> $varname`                       | Capture output into a variable            |
-| `$_`                                | Previous step's output (auto-captured)    |
-| `$varname`                          | Named captured variable                   |
-| `$1`, `$2`, `$ARGUMENTS`            | Script arguments                          |
-| `# comment`                         | Comments (ignored)                        |
-
-**Example: Variable capture and chaining** (`refactor-workflow.txt`):
+**Example** (`code-review.rill`):
 
-```text
+```rill
 ---
-argument-hint: <directory>
+description: Code review workflow
+args: path: string
 ---
-# Phase 1: Analyze - capture issues list
-prompt("Review $1 for error handling issues. List each issue with file:line.") -> $issues
 
-# Phase 2: Fix - use captured issues (no temp file needed)
-prompt(<<EOF
-Fix these issues:
-$issues
+# Analyze the code
+ccr::prompt("Review the code in {$path} for bugs") :> $issues
 
-For each fix, make minimal changes.
+# Get fixes based on issues found
+ccr::prompt(<<EOF
+Based on these issues:
+{$issues}
+
+Suggest specific fixes with code examples.
 EOF
-)
+) :> $fixes
 
-# Phase 3: Verify - $_ contains previous output
-prompt("Run tests. Confirm fixes are correct. Previous output: $_")
+# Summarize
+ccr::prompt("Summarize: Issues: {$issues} Fixes: {$fixes}")
 ```
 
-**Example: Command with capture** (`test-and-fix.txt`):
+**Host functions:**
 
-```text
-# Run tests, capture failures
-command("run-tests", [$1]) -> $failures
+| Function                      | Description                        |
+| ----------------------------- | ---------------------------------- |
+| `ccr::prompt(text, model?)`   | Execute a Claude prompt            |
+| `ccr::command(name, args?)`   | Run a command template             |
+| `ccr::skill(name, args?)`     | Run a slash command                |
+| `ccr::get_result(text)`       | Extract `<ccr:result>` from output |
+| `ccr::file_exists(path)`      | Check if file exists               |
+| `ccr::read_frontmatter(path)` | Parse YAML frontmatter             |
+| `ccr::error(message?)`        | Stop execution with error          |
 
-# Fix any failures
-prompt("Fix these test failures:\n$failures")
-
-# Verify
-command("run-tests", [$1])
-```
-
-Scripts stop on `BLOCKED` or `ERROR` signals, catching issues before continuing to the next phase.
+See [docs/rill-scripting.md](docs/rill-scripting.md) for the full scripting reference.
 
 ### Options
 
@@ -141,7 +136,7 @@ Scripts stop on `BLOCKED` or `ERROR` signals, catching issues before continuing
 | `--quiet`         | Minimal output (errors only)                           |
 | `--normal`        | Default output level                                   |
 | `--verbose`       | Full output with details                               |
-| `--no-log`        | Disable file logging                                   |
+| `--log`           | Enable file logging                                    |
 | `--deaddrop`      | Enable [DeadDrop](https://deaddrop.sh) streaming       |
 
 **Example with model selection:**
@@ -150,91 +145,48 @@ Scripts stop on `BLOCKED` or `ERROR` signals, catching issues before continuing
 claude-code-runner -m sonnet prompt "Explain this codebase"
 ```
 
-## Runner Signals
-
-Signals give Claude a way to control execution flow. Instruct Claude to output these signals in your prompts or templates, and the runner will respond accordingly.
-
-| Signal                      | Effect                           |
-| --------------------------- | -------------------------------- |
-| `:::RUNNER::REPEAT_STEP:::` | Run the same step again          |
-| `:::RUNNER::BLOCKED:::`     | Exit with error (awaiting human) |
-| `:::RUNNER::ERROR:::`       | Exit with error                  |
-
-No signal means success—the runner exits when Claude finishes without outputting a signal.
-
-### Document-Driven Workflows
-
-The real power of runner signals is **checklist-based execution**. Create a document with implementation steps, and Claude works through them one at a time across multiple invocations.
-
-**Implementation plan** (`PLAN.md`):
-
-```markdown
-# Feature: User Authentication
-
-- [ ] Create `src/auth/types.ts` with User and Session interfaces
-- [ ] Implement `src/auth/session.ts` with createSession and validateSession
-- [ ] Add JWT signing in `src/auth/jwt.ts`
-- [ ] Write tests in `src/auth/__tests__/session.test.ts`
-- [ ] Update `src/index.ts` to export auth module
-```
-
-**Command template** (`.claude/commands/work-plan.md`):
-
-```markdown
-Read $1 and find the first unchecked item (- [ ]).
+## Results
 
-1. Implement that single item
-2. Mark it complete by changing `- [ ]` to `- [x]`
-3. Check if any unchecked items remain:
-   - If YES: output :::RUNNER::REPEAT_STEP:::
-   - If NO: output "All tasks complete"
+Results let Claude communicate control flow decisions back to your scripts using XML:
 
-If blocked, output :::RUNNER::BLOCKED::: with what you need.
+```xml
+<ccr:result type="repeat"/>
+<ccr:result type="done"/>
+<ccr:result type="blocked" reason="...">details</ccr:result>
 ```
 
-**Run it:**
+Result types are application-defined. Your script extracts and handles them:
 
-```bash
-claude-code-runner command work-plan PLAN.md
-```
+```rill
+ccr::prompt("Fix bugs. Signal <ccr:result type='repeat'/> if more remain.") :> $result
+ccr::get_result($result) :> $result
 
-Each invocation: Claude finds the next unchecked step → implements it → marks it done → signals `REPEAT_STEP`. The loop continues until all boxes are checked. The document itself becomes persistent state across runs.
-
-### Self-Correcting Loops
-
-For retry-based patterns where Claude validates its own work:
-
-```bash
-claude-code-runner prompt "Fix all lint errors. Run the linter after each fix. Output :::RUNNER::REPEAT_STEP::: if errors remain, nothing if clean."
+($result.type == "repeat") ? log("More work needed")
+($result.type == "blocked") ? ccr::error($result.reason)
 ```
 
-Or as a template (`.claude/commands/fix-tests.md`):
-
-```markdown
-Run the test suite for $1.
-
-- If tests pass: done
-- If tests fail and fixable: fix them, output :::RUNNER::REPEAT_STEP:::
-- If tests fail and stuck: output :::RUNNER::BLOCKED::: with explanation
-```
-
-**Defaults:**
-
-- Max 10 iterations per command (prevents runaway loops)
-- If no signal is detected, the runner uses the CLI exit code (0 = success, non-0 = error)
+See [docs/results.md](docs/results.md) for workflow patterns.
 
 ## Exit Codes
 
 For CI/CD integration:
 
-| Code | Meaning                                      |
-| ---- | -------------------------------------------- |
-| 0    | Success (no signal or clean exit)            |
-| 1    | Error (`ERROR`, `BLOCKED`, or non-zero exit) |
+| Code | Meaning                                 |
+| ---- | --------------------------------------- |
+| 0    | Success                                 |
+| 1    | Error (script threw or Claude exited 1) |
 
 ## Logs
 
-Sessions are logged to `./logs/` with timestamped filenames. Disable with `--no-log`.
+Sessions are logged to `./logs/` with timestamped filenames when `--log` is specified.
+
+## Documentation
+
+- [Getting Started](docs/getting-started.md)
+- [CLI Reference](docs/cli-reference.md)
+- [Rill Scripting](docs/rill-scripting.md)
+- [Results](docs/results.md)
+- [Examples](docs/examples.md)
 
 ## Development
 

package/dist/cli/args.d.ts

@@ -2,13 +2,6 @@
  * CLI argument parsing
  */
 import type { ParsedArgs } from '../types/index.js';
-/**
- * Parse a command line into a prompt
- * Used for script mode line parsing
- */
-export declare function parseCommandLine(line: string): {
-    prompt: string;
-};
 export declare function parseArgs(args: string[]): ParsedArgs;
 /**
  * Print usage information

package/dist/cli/args.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,KAAK,EACV,UAAU,EAIX,MAAM,mBAAmB,CAAC;AAkD3B;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAmBjE;AAWD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAwGpD;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CA2BjC"}
+{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,KAAK,EACV,UAAU,EAIX,MAAM,mBAAmB,CAAC;AA2D3B,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA2FpD;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAsBjC"}

package/dist/cli/args.js

@@ -2,7 +2,7 @@
  * CLI argument parsing
  */
 import { createRequire } from 'module';
-import { loadScript } from '../script/index.js';
+import { isRillScript } from '../rill/index.js';
 import { loadCommandTemplate } from '../templates/command.js';
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
@@ -16,7 +16,7 @@ function extractOptions(args) {
         process.exit(0);
     }
     let verbosity = 'normal';
-    let enableLog = true;
+    let enableLog = false;
     let model = null;
     let deaddrop = false;
     const positionalArgs = [];
@@ -31,8 +31,8 @@ function extractOptions(args) {
         else if (arg === '--verbose') {
             verbosity = 'verbose';
         }
-        else if (arg === '--no-log') {
-            enableLog = false;
+        else if (arg === '--log') {
+            enableLog = true;
         }
         else if (arg === '--deaddrop') {
             deaddrop = true;
@@ -49,32 +49,6 @@ function extractOptions(args) {
     }
     return { positionalArgs, verbosity, enableLog, model, deaddrop };
 }
-/**
- * Parse a command line into a prompt
- * Used for script mode line parsing
- */
-export function parseCommandLine(line) {
-    const parts = line.trim().split(/\s+/);
-    const cmd = parts[0];
-    if (cmd === 'prompt') {
-        return { prompt: parts.slice(1).join(' ') };
-    }
-    else if (cmd === 'command') {
-        const cmdName = parts[1];
-        if (!cmdName) {
-            throw new Error('command requires a name');
-        }
-        const { prompt } = loadCommandTemplate(cmdName, parts.slice(2));
-        return { prompt };
-    }
-    else if (cmd === 'script') {
-        throw new Error('script cannot be nested');
-    }
-    else {
-        // Treat as raw prompt
-        return { prompt: line.trim() };
-    }
-}
 /**
  * Parse CLI arguments
  */
@@ -100,8 +74,6 @@ export function parseArgs(args) {
     const subcommand = firstArg;
     let prompt = '';
     let displayCommand = '';
-    let scriptMode = false;
-    let scriptLines = [];
     let scriptFile = null;
     let scriptArgs = [];
     let frontmatterModel = null;
@@ -123,24 +95,15 @@ export function parseArgs(args) {
             const file = positionalArgs[1];
             if (!file) {
                 console.error('Error: script file required');
-                console.error('Usage: claude-code-runner script <file> [args...]');
+                console.error('Usage: claude-code-runner script <file.rill> [args...]');
+                process.exit(1);
+            }
+            if (!isRillScript(file)) {
+                console.error('Error: script must be a .rill file');
                 process.exit(1);
             }
             scriptFile = file;
             scriptArgs = positionalArgs.slice(2);
-            const parsed = loadScript(file, scriptArgs);
-            // Convert parsed lines to display strings for backward compat
-            scriptLines = parsed.lines.map((line) => {
-                if (line.type === 'prompt') {
-                    const text = line.text.length > 50 ? line.text.slice(0, 50) + '...' : line.text;
-                    return `prompt("${text}")${line.capture ? ` -> $${line.capture}` : ''}`;
-                }
-                else {
-                    return `command("${line.name}")${line.capture ? ` -> $${line.capture}` : ''}`;
-                }
-            });
-            frontmatterModel = parsed.frontmatter.model ?? null;
-            scriptMode = true;
             displayCommand = positionalArgs.slice(1).join(' ');
             break;
         }
@@ -162,11 +125,9 @@ export function parseArgs(args) {
         deaddrop,
     };
     return {
-        subcommand: scriptMode ? 'script' : subcommand,
+        subcommand,
         prompt,
         displayCommand,
-        scriptLines,
-        scriptMode,
         config,
         scriptFile,
         scriptArgs,
@@ -182,23 +143,18 @@ Claude Code Runner - executes claude CLI with proper TTY handling
 Usage:
   claude-code-runner [options] prompt <prompt>
   claude-code-runner [options] command <name> [args...]
-  claude-code-runner [options] script <file> [args...]
+  claude-code-runner [options] script <file.rill> [args...]
 
 Subcommands:
-  prompt <text>              Run with the given prompt (supports RUNNER signals)
-  command <name> [args]      Load .claude/commands/<name>.md (supports RUNNER signals)
-  script <file> [args]       Run commands from file, stop on ERROR/BLOCKED
-
-Iteration Signals (control runner execution):
-  :::RUNNER::REPEAT_STEP:::  Run the same step again
-  :::RUNNER::BLOCKED:::      Exit with error (awaiting human intervention)
-  :::RUNNER::ERROR:::        Exit with error (something went wrong)
+  prompt <text>              Run with the given prompt
+  command <name> [args]      Load .claude/commands/<name>.md template
+  script <file.rill> [args]  Run a Rill script
 
 Options:
   --quiet              Minimal output (errors only)
   --normal             Default output level
   --verbose            Full output with all details
-  --no-log             Disable logging to file (enabled by default)
+  --log                Enable logging to file (disabled by default)
   --model, -m <model>  Specify Claude model (e.g., sonnet, opus, haiku)
   --deaddrop           Send messages to Deaddrop (requires DEADDROP_API_KEY env var)
 `);

package/dist/cli/args.js.map

@@ -1 +1 @@
-{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAwB,CAAC;AAgBjE;;GAEG;AACH,SAAS,cAAc,CAAC,IAAc;IACpC,yBAAyB;IACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,SAAS,GAAc,QAAQ,CAAC;IACpC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,SAAS,GAAG,OAAO,CAAC;QACtB,CAAC;aAAM,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;YAC9B,SAAS,GAAG,QAAQ,CAAC;QACvB,CAAC;aAAM,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YAC/B,SAAS,GAAG,SAAS,CAAC;QACxB,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAC3B,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;aAAM,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;YAChC,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;aAAM,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC7C,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;QAC5B,CAAC;aAAM,IAAI,GAAG,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACnE,CAAC;AAED;;GAEG;AACH,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAU,CAAC;AAEnE,SAAS,iBAAiB,CAAC,KAAa;IACtC,OAAO,iBAAiB,CAAC,QAAQ,CAAC,KAAmB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAc;IACtC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,GAC7D,cAAc,CAAC,IAAI,CAAC,CAAC;IAEvB,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;IAEnC,sBAAsB;IACtB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC5C,OAAO,CAAC,KAAK,CACX,6DAA6D,CAC9D,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,8BAA8B,QAAQ,GAAG,CAAC,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC5D,OAAO,CAAC,KAAK,CACX,6DAA6D,CAC9D,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC;IAC5B,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,UAAU,GAAkB,IAAI,CAAC;IACrC,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IAAI,gBAAgB,GAAkB,IAAI,CAAC;IAE3C,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YACtC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBAC9C,OAAO,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;gBACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,QAAQ,GAAG,mBAAmB,CAClC,WAAW,EACX,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CACxB,CAAC;YACF,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YACzB,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,IAAI,IAAI,CAAC;YACtD,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM;QACR,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBAC7C,OAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;gBACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,UAAU,GAAG,IAAI,CAAC;YAClB,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM;QACR,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBAC7C,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,cAAc,GAAG,IAAI,MAAM,GAAG,CAAC;YAC/B,MAAM;QACR,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAA0B;QACpC,SAAS;QACT,SAAS;QACT,KAAK,EAAE,KAAK,IAAI,gBAAgB;QAChC,QAAQ;KACT,CAAC;IAEF,OAAO;QACL,UAAU;QACV,MAAM;QACN,cAAc;QACd,MAAM;QACN,UAAU;QACV,UAAU;KACX,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU;IACxB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoBb,CAAC,CAAC;AACH,CAAC"}

package/dist/index.js

@@ -5,13 +5,12 @@
  */
 import { randomBytes } from 'crypto';
 import { parseArgs } from './cli/args.js';
-import { runWithSignals, } from './core/runner.js';
 import { createDeadDropClientFromEnv } from './deaddrop/index.js';
 import { configureDeadDrop, flushDeadDrop, printRunner, printRunnerInfo, } from './output/colors.js';
-import { createFormatterState, finalizeStepStats, getRunStatsSummary, resetFormatterState, } from './output/formatter.js';
+import { createFormatterState, finalizeStepStats, getRunStatsSummary, } from './output/formatter.js';
 import { createLogger } from './output/logger.js';
-import { captureOutput, createVariableStore, getSubstitutionList, loadScript, substituteVariables, } from './script/index.js';
-import { loadCommandTemplate } from './templates/command.js';
+import { spawnClaude } from './process/pty.js';
+import { runRillScript } from './rill/index.js';
 import { DEFAULT_CONFIG } from './types/runner.js';
 /**
  * Generate a short unique run ID (8 chars, uppercase)
@@ -19,16 +18,6 @@ import { DEFAULT_CONFIG } from './types/runner.js';
 function generateRunId() {
     return randomBytes(4).toString('hex').toUpperCase();
 }
-/**
- * Format variables used for "with X" clause
- */
-function formatVarsUsed(vars) {
-    if (vars.length === 0)
-        return '';
-    // Convert $_ to "last result", keep others as-is
-    const labels = vars.map((v) => (v === '$_' ? 'last result' : v));
-    return `with ${labels.join(', ')}: `;
-}
 async function main() {
     const totalStart = Date.now();
     const args = process.argv.slice(2);
@@ -50,22 +39,9 @@ async function main() {
         configureDeadDrop(client.send.bind(client));
     }
     // Create logger
-    const commandName = parsed.scriptMode
-        ? 'script'
-        : parsed.subcommand === 'command'
-            ? (args[1] ?? 'prompt')
-            : 'prompt';
-    const logger = createLogger(config.enableLog, config.logDir, commandName);
+    const logger = createLogger(config.enableLog, config.logDir, parsed.subcommand);
     // Create formatter state
     const formatterState = createFormatterState();
-    // Create runner context
-    const context = {
-        config,
-        logger,
-        formatterState,
-        cwd: process.cwd(),
-        runId,
-    };
     // Emit starting run message first (operational, sent to deaddrop)
     printRunner(`Starting run ${runId}`);
     // Print config with [RUNNER] messages (informational, not sent to deaddrop)
@@ -80,95 +56,62 @@ async function main() {
         printRunnerInfo(`Log: ${logger.filePath}`);
     }
     logger.logEvent({ event: 'run_start', runId });
-    // Build script lines - single prompt/command becomes a 1-step script
-    let lines;
-    let scriptArgs = [];
-    if (parsed.scriptMode && parsed.scriptFile) {
-        const script = loadScript(parsed.scriptFile, parsed.scriptArgs);
-        lines = script.lines;
-        scriptArgs = parsed.scriptArgs;
+    // Handle script subcommand (Rill scripts only)
+    if (parsed.subcommand === 'script' && parsed.scriptFile) {
+        const result = await runRillScript({
+            scriptFile: parsed.scriptFile,
+            args: parsed.scriptArgs,
+            config,
+            logger,
+            formatterState,
+            cwd: process.cwd(),
+            runId,
+        });
+        // Print run completion
+        const totalDuration = Date.now() - totalStart;
+        const runSummary = getRunStatsSummary(formatterState, totalDuration);
+        printRunner(`Run ${runId} complete: ${runSummary}`);
+        logger.close();
+        await flushDeadDrop();
+        process.exit(result.success ? 0 : 1);
     }
-    else {
-        // Single prompt or command becomes a 1-step script
-        lines = [{ type: 'prompt', text: parsed.prompt }];
+    // Handle prompt and command subcommands (single execution)
+    const promptText = parsed.prompt;
+    if (parsed.subcommand === 'command' && !promptText) {
+        // This shouldn't happen - parseArgs should have handled it
+        console.error('Error: no prompt text');
+        process.exit(1);
     }
-    // Run the script
-    const success = await runScript(lines, scriptArgs, context, totalStart);
-    context.logger.close();
-    await flushDeadDrop();
-    process.exit(success ? 0 : 1);
-}
-/**
- * Build display string for a script line
- */
-function getDisplayLine(line) {
-    if (line.type === 'prompt') {
-        // Replace newlines with spaces for single-line display
-        const cleaned = line.text.replace(/[\r\n]+/g, ' ').trim();
-        const preview = cleaned.length > 50 ? cleaned.slice(0, 50) + '...' : cleaned;
-        return `"${preview}"`;
+    // Set step info for formatter
+    formatterState.currentStep = 1;
+    formatterState.stepStartTime = Date.now();
+    if (config.verbosity !== 'quiet') {
+        printRunner(`Running: ${parsed.displayCommand}`);
     }
-    return `command("${line.name}")`;
-}
-/**
- * Run a script (unified execution for single prompts and multi-step scripts)
- */
-async function runScript(lines, scriptArgs, context, startTime) {
-    const store = createVariableStore();
-    for (const [i, line] of lines.entries()) {
-        const stepNum = i + 1;
-        const displayLine = getDisplayLine(line);
-        context.logger.logEvent({
-            event: 'step_start',
-            step: stepNum,
-            prompt: displayLine,
-        });
-        // Get the prompt text
-        let promptText;
-        if (line.type === 'prompt') {
-            promptText = line.text;
-        }
-        else {
-            // Substitute variables in command args before loading template
-            const substitutedArgs = line.args.map((arg) => substituteVariables(arg, store, scriptArgs));
-            const template = loadCommandTemplate(line.name, substitutedArgs);
-            promptText = template.prompt;
-        }
-        // Substitute variables
-        const varsUsed = getSubstitutionList(promptText, store);
-        const finalPrompt = substituteVariables(promptText, store, scriptArgs);
-        // Build display: show substituted prompt and what variables were used
-        const substitutedDisplay = getDisplayLine({
-            type: 'prompt',
-            text: finalPrompt,
-        });
-        const withClause = formatVarsUsed(varsUsed);
-        // Set step number and start time for formatter output
-        context.formatterState.currentStep = stepNum;
-        context.formatterState.stepStartTime = Date.now();
-        // Run via runWithSignals (handles iterations, signals, output)
-        const stepContext = { stepNum };
-        const result = await runWithSignals(finalPrompt, `${withClause}${substitutedDisplay}`, startTime, context, stepContext);
-        // Capture output for variable store
-        captureOutput(store, result.claudeText, line.capture);
-        // Finalize step stats and print completion
-        const stepDurationMs = context.formatterState.stepStartTime
-            ? Date.now() - context.formatterState.stepStartTime
-            : (context.formatterState.lastStepDurationMs ?? 0);
-        const stepSummary = finalizeStepStats(context.formatterState, stepDurationMs);
-        printRunner(`Step ${stepNum} complete: ${stepSummary}`);
-        // Handle failure (runWithSignals already printed the error)
-        if (result.status !== 'ok') {
-            return false;
-        }
-        // Reset step stats for next step (preserves runStats)
-        resetFormatterState(context.formatterState);
-    }
-    // Print run completion with overall stats
-    const totalDuration = Date.now() - startTime;
-    const runSummary = getRunStatsSummary(context.formatterState, totalDuration);
-    printRunner(`Run ${context.runId} complete: ${runSummary}`);
-    return true;
+    // Execute via PTY
+    const result = await spawnClaude({
+        prompt: promptText,
+        cwd: process.cwd(),
+        verbosity: config.verbosity,
+        logger,
+        formatterState,
+        parallelThresholdMs: config.parallelThresholdMs,
+        model: config.model,
+    });
+    // Finalize step stats
+    const stepDurationMs = formatterState.stepStartTime
+        ? Date.now() - formatterState.stepStartTime
+        : 0;
+    const stepSummary = finalizeStepStats(formatterState, stepDurationMs);
+    printRunner(`Step 1 complete: ${stepSummary}`);
+    // Print run completion
+    const totalDuration = Date.now() - totalStart;
+    const runSummary = getRunStatsSummary(formatterState, totalDuration);
+    printRunner(`Run ${runId} complete: ${runSummary}`);
+    logger.logEvent({ event: 'run_complete', runId, exit: result.exitCode });
+    logger.close();
+    await flushDeadDrop();
+    process.exit(result.exitCode === 0 ? 0 : 1);
 }
 // Run main
 main().catch((err) => {