@ethlete/agent-rules 0.1.0-next.30 → 0.1.0-next.32

package/content/skills/agent-sessions/agent-sessions.mjs

@@ -61,6 +61,7 @@ const remove = takeFlag(args, '--remove', false);
 const afterSeconds = takeFlag(args, '--after', true);
 const now = takeFlag(args, '--now', false);
 const dryRun = takeFlag(args, '--dry-run', false);
+const role = takeFlag(args, '--role', true);
 const [command, sender, ...words] = args;
 
 const help = `Shared agent mailbox: ${mailbox}
@@ -74,7 +75,9 @@ Claim:   node ${script} claim <name> <path...> [--ttl <hours>] [--force]
 Release: node ${script} release <name> [path...]      (no path: release every claim of <name>)
 Claims:  node ${script} claims
 Up:      node ${script} up <name>[=<command>]...      (start a tmux session per agent, plus one that runs dispatch)
-Run:     node ${script} run <name> <command...>       (start or attach the agent in its tmux session; starts dispatch)
+Run:     node ${script} run <name> <command...> [--role builder] [--dry-run]
+                                                      (start or attach the agent in its tmux session; starts dispatch;
+                                                       the builder role sets ETHLETE_AGENT_ROLE and gives claude a terse system prompt)
 Install: node ${script} shell-install [<agent>...] [--file <path>] [--remove] [--dry-run]
                                                       (write the shell functions into ~/.zshrc or ~/.bashrc)
 Shell:   node ${script} shell-init [<agent>...]       (print shell functions that wrap each agent with run; default: claude codex)
@@ -94,6 +97,10 @@ Keep credentials and personal data out of the mailbox. No agent is started autom
 
 const tmux = (...tmuxArgs) => spawnSync('tmux', tmuxArgs, { encoding: 'utf8' });
 const quote = (text) => `'${text.replaceAll("'", "'\\''")}'`;
+const BUILDER_PROMPT =
+  'The user does not read this chat. Write no text between tool calls; end each turn with at most one line. Reports go to the grill session via SendMessage.';
+const withRole = (words) =>
+  role === 'builder' && basename(words[0]) === 'claude' ? [...words, '--append-system-prompt', BUILDER_PROMPT] : words;
 const sessionExists = (name) => tmux('has-session', '-t', `=${name}`).status === 0;
 const ONE_SHOT_FLAGS = new Set(['-p', '--print', '-v', '--version', '-h', '--help']);
 const runsInSession = (agentArgs) =>
@@ -116,14 +123,15 @@ const restartLog = (message) => {
 
 /**
  * Waits until the agent ended its turn and nobody types in its prompt, twice in a row; `false` after the time limit.
+ * With `allowBusy`, a running turn does not block, since Claude Code queues input typed during a turn.
  * Each change of the reason it waits is logged to `restart.log` next to the mailbox.
  */
-const waitForQuiet = (session, limitMs = RESTART_WAIT_MS) => {
+const waitForQuiet = (session, limitMs = RESTART_WAIT_MS, allowBusy = false) => {
   const end = Date.now() + limitMs;
   let quiet = 0;
   let reason = '';
   while (Date.now() < end) {
-    const busy = busyLine(session);
+    const busy = allowBusy ? null : busyLine(session);
     const draft = busy === null ? draftLine(session) : null;
     const next = busy !== null ? `busy: ${busy.trim()}` : draft !== null ? `draft: ${draft}` : '';
     if (next !== reason) restartLog(`${session} ${next ? `waits, ${next}` : 'is quiet'}`);
@@ -135,6 +143,8 @@ const waitForQuiet = (session, limitMs = RESTART_WAIT_MS) => {
   return false;
 };
 
+/** The IDE context chip (`[⧉ In file.ts]`, `[⧉ 3 lines selected]`) shares the prompt line and survives `/clear`. */
+const IDE_CHIP = /\[⧉ [^\]]*\]/g;
 const draftLine = (session) => {
   const pane = tmux('capture-pane', '-p', '-e', '-t', `=${session}:`).stdout ?? '';
   const prompt = pane
@@ -155,7 +165,10 @@ const draftLine = (session) => {
       return '';
     })
     .join('');
-  const text = visible.replace(/^\s*[❯›]/, '').trim();
+  const text = visible
+    .replace(/^\s*[❯›]/, '')
+    .replace(IDE_CHIP, '')
+    .trim();
   return text.length > 0 ? text : null;
 };
 const hasDraft = (session) => draftLine(session) !== null;
@@ -265,15 +278,24 @@ if (command === 'send' && sender) {
     const [name, ...rest] = spec.split('=');
     startSession(sessionFor(name), rest.join('=') || undefined);
   });
+} else if (command === 'run' && sender && words.length && role !== undefined && role !== 'builder') {
+  process.stderr.write(`Unknown role ${role}. Only builder exists.\n`);
+  process.exitCode = 1;
+} else if (command === 'run' && sender && words.length && dryRun) {
+  process.stdout.write(`${role ? `ETHLETE_AGENT_ROLE=${role} ` : ''}${withRole(words).map(quote).join(' ')}\n`);
 } else if (command === 'run' && sender && words.length && !runsInSession(words.slice(1))) {
-  const [program, ...programArgs] = words;
-  process.exitCode = spawnSync(program, programArgs, { stdio: 'inherit' }).status ?? 1;
+  const [program, ...programArgs] = withRole(words);
+  process.exitCode =
+    spawnSync(program, programArgs, {
+      stdio: 'inherit',
+      env: role ? { ...process.env, ETHLETE_AGENT_ROLE: role } : process.env,
+    }).status ?? 1;
 } else if (command === 'run' && sender && words.length) {
   const withEnv = process.env.AGENT_MAILBOX ? `AGENT_MAILBOX=${quote(process.env.AGENT_MAILBOX)} ` : '';
   if (!sessionExists(DISPATCH_SESSION))
     startSession(DISPATCH_SESSION, `${withEnv}node ${quote(script)} dispatch`, true);
   const session = freeSessionFor(sender);
-  const shellCommand = words.map(quote).join(' ');
+  const shellCommand = `${role ? `ETHLETE_AGENT_ROLE=${role} ` : ''}${withRole(words).map(quote).join(' ')}`;
   if (process.env.TMUX) {
     if (!sessionExists(session)) tmux('new-session', '-d', '-s', session, '-c', process.cwd(), shellCommand);
     process.exitCode = spawnSync('tmux', ['switch-client', '-t', `=${session}`], { stdio: 'inherit' }).status ?? 1;
@@ -353,7 +375,7 @@ if (command === 'send' && sender) {
       sleep(ENTER_DELAY_MS);
       type('Enter');
       sleep(RESTART_CLEAR_MS);
-      if (waitForQuiet(session, RESTART_CLEAR_WAIT_MS)) {
+      if (waitForQuiet(session, RESTART_CLEAR_WAIT_MS, true)) {
         type('-l', words.join(' '));
         sleep(ENTER_DELAY_MS);
         type('Enter');
@@ -361,13 +383,13 @@ if (command === 'send' && sender) {
         const saved = join(dirname(mailbox), `restart.prompt.${session}.txt`);
         writeFileSync(saved, `${words.join(' ')}\n`);
         restartLog(
-          `${session} not quiet ${RESTART_CLEAR_WAIT_MS / 1000}s after the clear, prompt not typed, saved to ${saved}`,
+          `${session} prompt not empty ${RESTART_CLEAR_WAIT_MS / 1000}s after the clear, prompt not typed, saved to ${saved}`,
         );
         tmux(
           'display-message',
           '-t',
           `=${session}:`,
-          `restart: pane not quiet after the clear, prompt not typed. Saved to ${saved}`,
+          `restart: prompt not empty after the clear, prompt not typed. Saved to ${saved}`,
         );
         process.exitCode = 1;
       }

package/content/skills/codex-subagent/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: codex-subagent
-description: Delegate a task to a Codex agent (gpt-5.6-luna, gpt-5.6-sol, gpt-5.6-terra, gpt-6-astra) instead of a Claude subagent - a second opinion from another model family, a review, or a cheap parallel lookup. Read before spawning a subagent when another model would answer better, and whenever the user says codex, GPT, or "second opinion".
+description: Delegate a task to a Codex agent (gpt-6-luna, gpt-6.1-terra, gpt-6.1-sol, gpt-6-astra) instead of a Claude subagent - a second opinion from another model family, a review, or a cheap parallel lookup. Read before spawning a subagent when another model would answer better, and whenever the user says codex, GPT, or "second opinion".
 kind: skill
 scope: both
 ---
@@ -24,7 +24,7 @@ only the final message, so one run costs you a few hundred tokens instead of the
 Below, `<skill-dir>` is the directory this file sits in.
 
 ```bash
-node <skill-dir>/codex-agent.mjs -m gpt-5.6-terra -e medium "<prompt>"
+node <skill-dir>/codex-agent.mjs -m gpt-6.1-terra -e medium "<prompt>"
 ```
 
 Options: `-m` model, `-e` effort (`low`, `medium`, `high`, `xhigh`), `-C` working root,
@@ -36,12 +36,12 @@ id and the log path. Read the log only when a run fails.
 
 ## Pick the model
 
-| Model           | The work it fits                                                                                                 |
-| --------------- | ---------------------------------------------------------------------------------------------------------------- |
-| `gpt-5.6-luna`  | Fast and cheap: a lookup, a grep, a question about one file.                                                     |
-| `gpt-5.6-terra` | Balanced agentic coding. The default for real work, and the wrapper's default.                                   |
-| `gpt-5.6-sol`   | A reliable workhorse for a straight task. It costs about what `fable` costs, so ask the user before you pick it. |
-| `gpt-6-astra`   | Complex, demanding work. The most expensive of the four, so ask the user before you pick it.                     |
+| Model           | The work it fits                                                                                             |
+| --------------- | ------------------------------------------------------------------------------------------------------------ |
+| `gpt-6-luna`    | Fast and cheap: a lookup, a grep, a question about one file.                                                 |
+| `gpt-6.1-terra` | Balanced agentic coding. The default for real work, and the wrapper's default.                               |
+| `gpt-6.1-sol`   | A reliable workhorse for a straight task. Its usage limit runs out fast, so ask the user before you pick it. |
+| `gpt-6-astra`   | Complex, demanding work. The most expensive of the four, so ask the user before you pick it.                 |
 
 Effort follows both the flag and the prompt. Pass `-e low` for a lookup and `-e high` for a
 hard bug. Say "keep it brief" in the prompt when you want a short answer.

package/content/skills/codex-subagent/codex-agent.mjs

@@ -14,7 +14,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { createInterface } from 'node:readline';
 
-const DEFAULT_MODEL = 'gpt-5.6-terra';
+const DEFAULT_MODEL = 'gpt-6.1-terra';
 const DEFAULT_TIMEOUT_SECONDS = 900;
 
 const USAGE = `Usage: node codex-agent.mjs [options] "<prompt>"