sisyphi 1.2.14 → 1.2.16

package/dist/cli.js

@@ -192,11 +192,11 @@ var init_config = __esm({
     "use strict";
     init_paths();
     DEFAULT_CONFIG = {
-      model: "claude-opus-4-7[1m]",
+      model: "claude-opus-4-8[1m]",
       pollIntervalMs: 5e3,
       statusBarRenderTicks: 4,
       orchestratorEffort: "xhigh",
-      agentEffort: "medium",
+      agentEffort: "high",
       notifications: {
         enabled: true,
         sound: "/System/Library/Sounds/Hero.aiff"
@@ -636,6 +636,7 @@ var init_notify = __esm({
 
 // src/daemon/ask-store.ts
 import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync11, readdirSync as readdirSync3 } from "fs";
+import { basename as basename3 } from "path";
 function maybeNotifyOnAskCreated(cwd, sessionId, meta) {
   if (process.env.NODE_ENV === "test" || process.env.SISYPHUS_DISABLE_NOTIFY === "1") return;
   const isActionable = meta.kind !== void 0 && ACTIONABLE_KINDS.has(meta.kind);
@@ -899,7 +900,7 @@ var init_exec = __esm({
 // src/daemon/frontmatter.ts
 import { readFileSync as readFileSync15, existsSync as existsSync14, readdirSync as readdirSync5 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join15, basename as basename4 } from "path";
+import { join as join15, basename as basename5 } from "path";
 function parseAgentFrontmatter(content) {
   const match = content.match(/^---\n([\s\S]*?)\n---/);
   if (!match) return {};
@@ -944,7 +945,7 @@ function discoverAgentTypes(pluginDir, cwd) {
     }
     for (const file of files) {
       if (!file.endsWith(".md") || file === "CLAUDE.md") continue;
-      const name = basename4(file, ".md");
+      const name = basename5(file, ".md");
       const qualifiedName = prefix ? `${prefix}:${name}` : name;
       if (seen.has(qualifiedName)) continue;
       seen.add(qualifiedName);
@@ -996,7 +997,7 @@ var init_effort_render = __esm({
 
 // src/daemon/extensions.ts
 import { existsSync as existsSync15, readFileSync as readFileSync16, readdirSync as readdirSync6, copyFileSync as copyFileSync2, mkdirSync as mkdirSync8, statSync as statSync3, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "fs";
-import { resolve as resolve6, join as join16, basename as basename5, relative } from "path";
+import { resolve as resolve6, join as join16, basename as basename6, relative } from "path";
 function resolveBundledTemplateDir(kind) {
   const built = resolve6(import.meta.dirname, "../templates", kind);
   if (existsSync15(built)) return built;
@@ -2799,7 +2800,7 @@ var init_grove = __esm({
 // src/cli/cloud/repo.ts
 import { spawnSync as spawnSync5 } from "child_process";
 import { existsSync as existsSync35 } from "fs";
-import { basename as basename7, join as join30 } from "path";
+import { basename as basename8, join as join30 } from "path";
 function captureGit(args2, cwd) {
   const result = spawnSync5("git", args2, {
     encoding: "utf-8",
@@ -2813,8 +2814,8 @@ function captureGit(args2, cwd) {
 }
 function inferRepoName(cwd) {
   const { stdout, ok } = captureGit(["rev-parse", "--show-toplevel"], cwd);
-  if (ok && stdout) return basename7(stdout);
-  return basename7(cwd ?? process.cwd());
+  if (ok && stdout) return basename8(stdout);
+  return basename8(cwd ?? process.cwd());
 }
 function getOriginUrl(cwd) {
   const { stdout, ok } = captureGit(["remote", "get-url", "origin"], cwd);
@@ -3292,7 +3293,7 @@ var init_respawn_guard = __esm({
 });
 
 // src/daemon/companion-commentary.ts
-import { basename as basename8 } from "path";
+import { basename as basename9 } from "path";
 import { z as z2 } from "zod";
 var CommentaryZodSchema, ENDURANCE_TIERS;
 var init_companion_commentary = __esm({
@@ -3522,7 +3523,7 @@ var init_ask_visual = __esm({
 // src/daemon/server.ts
 import { createServer } from "net";
 import { unlinkSync as unlinkSync7, existsSync as existsSync48, writeFileSync as writeFileSync24, readFileSync as readFileSync45, mkdirSync as mkdirSync20, readdirSync as readdirSync15, rmSync as rmSync11, chmodSync as chmodSync4 } from "fs";
-import { join as join37, basename as basename9, dirname as dirname15 } from "path";
+import { join as join37, basename as basename10, dirname as dirname15 } from "path";
 import { scanInbox } from "@crouton-kit/humanloop";
 function registryPath() {
   return join37(globalDir(), "session-registry.json");
@@ -3787,6 +3788,7 @@ function ensureSisyphusInitLua() {
 
 // src/cli/tmux-setup.ts
 var DEFAULT_CYCLE_KEY = "M-s";
+var DEFAULT_CYCLE_BACK_KEY = "M-S";
 var DEFAULT_PREFIX_KEY = "C-s";
 var KEY_TABLE = "sisyphus";
 var SISYPHUS_CONF_MARKER = "# sisyphus-managed \u2014 do not edit";
@@ -3958,6 +3960,8 @@ var OPEN_BIN = "$HOME/.sisyphus/bin/sisyphus-open";
 var CYCLE_SCRIPT = `#!/bin/bash
 # Target by $N session ID (column 5 in TSV) \u2014 tmux -t <name> can substring-match
 # the wrong session under sparse env.
+# Arg $1: "prev" cycles backward (M-S); anything else cycles forward (M-s).
+dir="\${1:-next}"
 MANIFEST="$HOME/.sisyphus/sessions-manifest.tsv"
 if [ ! -f "$MANIFEST" ]; then
   tmux display-message "sisyphus: no manifest \u2014 daemon running?"
@@ -3984,7 +3988,11 @@ if (( \${#session_ids[@]} <= 1 )); then
 fi
 for (( i=0; i<\${#session_ids[@]}; i++ )); do
   if [ "\${session_ids[$i]}" = "$current_id" ]; then
-    next=$(( (i + 1) % \${#session_ids[@]} ))
+    if [ "$dir" = "prev" ]; then
+      next=$(( (i - 1 + \${#session_ids[@]}) % \${#session_ids[@]} ))
+    else
+      next=$(( (i + 1) % \${#session_ids[@]} ))
+    fi
     tmux switch-client -t "\${session_ids[$next]}"
     exit 0
   fi
@@ -5117,7 +5125,7 @@ async function setupTmuxKeybind(cycleKey = DEFAULT_CYCLE_KEY, prefixKey = DEFAUL
     };
   }
   if (!opts.force) {
-    for (const [label, key] of [["cycle", cycleKey], ["prefix", prefixKey]]) {
+    for (const [label, key] of [["cycle", cycleKey], ["cycle-back", DEFAULT_CYCLE_BACK_KEY], ["prefix", prefixKey]]) {
       const existing = getExistingBinding(key);
       if (existing !== null && !isSisyphusBinding(existing)) {
         return {
@@ -5156,8 +5164,10 @@ Or run "sis admin check check-keybinds" for the full decision tree (live-only in
   const bindings = [
     // C-s → display-menu top-level (descriptor-driven)
     generateTopLevelBinding(prefixKey, KEYMAP.topLevel, scriptsDir),
-    // M-s → cycle (unchanged)
-    `bind-key -T root ${cycleKey} run-shell ${cycleScriptPath()}`
+    // M-s → cycle forward (unchanged)
+    `bind-key -T root ${cycleKey} run-shell ${cycleScriptPath()}`,
+    // M-S → cycle backward (same script, "prev" direction)
+    `bind-key -T root ${DEFAULT_CYCLE_BACK_KEY} run-shell "${cycleScriptPath()} prev"`
     // smart-kill is reachable via the sisyphus prefix menu (C-s x) — see KEYMAP.topLevel.
     // We deliberately don't override `prefix x` so users keep their default tmux kill-pane.
   ];
@@ -5231,6 +5241,7 @@ function removeTmuxKeybind() {
   }
   try {
     execSync(`tmux unbind-key -T root ${DEFAULT_CYCLE_KEY}`, { stdio: "pipe" });
+    execSync(`tmux unbind-key -T root ${DEFAULT_CYCLE_BACK_KEY}`, { stdio: "pipe" });
     execSync(`tmux unbind-key -T root ${DEFAULT_PREFIX_KEY}`, { stdio: "pipe" });
     const output = execSync(`tmux list-keys -T ${KEY_TABLE}`, { stdio: ["pipe", "pipe", "pipe"] }).toString();
     for (const line of output.split("\n")) {
@@ -5703,7 +5714,7 @@ function exitForError(kind) {
 function exitError(err) {
   const e = normalizeError(err);
   process.stdout.write(
-    JSON.stringify({ ok: false, schema_version: 1, error: e }) + "\n"
+    JSON.stringify({ ok: false, error: e }) + "\n"
   );
   process.exit(exitForError(e.kind));
 }
@@ -5714,7 +5725,7 @@ function exitUsage(code, message, fields = {}) {
 // src/cli/output.ts
 function emitJsonOk(data = {}) {
   process.stdout.write(
-    JSON.stringify({ ok: true, schema_version: 1, data }) + "\n"
+    JSON.stringify({ ok: true, data }) + "\n"
   );
 }
 
@@ -5749,8 +5760,8 @@ Input
   --accept-cwd-mismatch     optional \u2014 bypass the tmux session home check when cwd intentionally differs
 
 Output (stdout, JSON)
-  { ok, schema_version: 1, data: { sessionId, tmuxSessionName? } }
-  on error: { ok: false, schema_version: 1, error: { code, message } }
+  { ok, data: { sessionId, tmuxSessionName? } }
+  on error: { ok: false, error: { code, message } }
 
 Effects
   Creates a new session record on the daemon.
@@ -5882,7 +5893,7 @@ Input
   [session-id]  optional. Defaults to $SISYPHUS_SESSION_ID.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { session }
+  ok, data: { session }
   session is null when no matching session is found.
 
 Effects
@@ -6001,7 +6012,7 @@ Input
   --all             optional boolean. Include sessions from all project directories.
   --cwd PATH        optional. Project directory override; default is $SISYPHUS_CWD or cwd.
 
-Output (stdout, JSON, schema_version: 2)
+Output (stdout, JSON)
   items        object[]. Sorted by createdAt ascending; stable across pages.
                Fields: {id, name?, task, status, agentCount, createdAt, cwd?, handoff?}.
   next_cursor  string | null. Pass to the next call. null on the last page.
@@ -6041,7 +6052,7 @@ Exit codes: 0 ok | 2 usage | 3 not_found.`).option("--all", "List sessions acros
     const next_cursor = hasMore ? encodeCursor(page[page.length - 1].createdAt, page[page.length - 1].id) : null;
     const total = requestedScope.length;
     process.stdout.write(
-      JSON.stringify({ ok: true, schema_version: 2, data: { items: page, next_cursor, total } }) + "\n"
+      JSON.stringify({ ok: true, data: { items: page, next_cursor, total } }) + "\n"
     );
   });
 }
@@ -6109,7 +6120,7 @@ Input
   --paste-only       optional. Paste without pressing Enter; caller submits manually.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { target, submit }
+  ok, data: { target, submit }
 
 Effects
   Types text into the orchestrator tmux pane and optionally submits it.
@@ -6140,7 +6151,7 @@ Input
   --paste-only       optional. Paste without pressing Enter; caller submits manually.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { target, submit }
+  ok, data: { target, submit }
 
 Effects
   Types text into the agent tmux pane and optionally submits it.
@@ -6232,7 +6243,7 @@ Input
   --head <n>             optional \u2014 emit only the first N turns
 
 Output (stdout, JSONL)
-  one JSON object per line; no {ok, schema_version} envelope (stream contract).
+  one JSON object per line; no {ok} envelope (stream contract).
   fields: { role: "user"|"assistant", timestamp: ISO-8601, content: message content }
   ordered oldest-first within the selected cycle.
 
@@ -6301,7 +6312,7 @@ Input
   --head <n>             optional \u2014 emit only the first N turns
 
 Output (stdout, JSONL)
-  one JSON object per line; no {ok, schema_version} envelope (stream contract).
+  one JSON object per line; no {ok} envelope (stream contract).
   fields: { role: "user"|"assistant", timestamp: ISO-8601, content: message content }
   ordered oldest-first.
 
@@ -6357,7 +6368,7 @@ Input
   --agent <agentId>  optional. Routes to a specific agent inbox instead of orchestrator.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { sessionId, agentId? }
+  ok, data: { sessionId, agentId? }
 
 Effects
   Queues the message in the daemon inbox for the target; delivered on next cycle.
@@ -6397,7 +6408,7 @@ Exit codes: 0 ok | 2 usage (missing content or --session) | 3 not_found.`
 
 // src/cli/commands/ask.ts
 import { existsSync as existsSync12, readFileSync as readFileSync12, unlinkSync as unlinkSync3, watchFile, unwatchFile } from "fs";
-import { basename as basename3, join as join13, resolve as resolve5 } from "path";
+import { basename as basename4, join as join13, resolve as resolve5 } from "path";
 import { ulid } from "ulid";
 
 // src/shared/ask-schema.ts
@@ -6563,7 +6574,7 @@ Input
   <file>              required \u2014 path to a valid deck JSON file
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "responses": [{ "id", "selectedOptionId"?, "freetext"? }, ...], "completedAt" }
   Branch on each response by its interaction \`id\`.
   on error: stderr diagnostic + non-zero exit
@@ -6586,7 +6597,7 @@ Input
   --body <b>          optional \u2014 markdown body describing what the user is approving
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "askId", "approved": boolean, "completedAt", "responses" }
   on error: stderr diagnostic + non-zero exit
 
@@ -6607,7 +6618,7 @@ Input
   --body <b>          optional \u2014 markdown body
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "askId" }
   on error: stderr diagnostic + non-zero exit
 
@@ -6617,7 +6628,7 @@ Effects
 Exit codes: 0 ok | 2 usage (missing session)
 `;
 var REVIEW_BRANCH_HELP = `
-Line-by-line markdown annotation workflow. The agent submits the file; the user opens it in their editor from the dashboard inbox, annotates per-line with <Space>c, and submits with <Space>s or the dashboard "Submit" action. Multiple open/close cycles are supported \u2014 the draft persists until explicitly submitted.
+Line-by-line markdown annotation workflow. The agent submits the file; in tmux an editor pane opens next to the agent (also reachable from the dashboard inbox). The user annotates per-line with <Space>c and submits with <Space>s. Multiple open/close cycles are supported \u2014 the draft persists until explicitly submitted.
 
 Use when surfacing a document the user should annotate per-line rather than pick options on. For a global yes/no, use \`sis ask approve\`. For named alternatives, use \`sis ask deck submit\`.
 
@@ -6633,13 +6644,13 @@ Input
   <file>              required \u2014 must exist and end in .md
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "askId", "file", "output": { "kind": "review", "feedback": { ... }, "completedAt" } }
   FeedbackResult fields: file, submitted, approved, comments[{ line, endLine, lineText, quote?, colStart?, colEnd?, comment, createdAt }], submittedAt, savedAt.
   on error: stderr diagnostic + non-zero exit
 
 Effects
-  Creates an ask in the session store, blocks until the user submits the review, then marks it answered.
+  Creates an ask in the session store. In tmux, splits an editor pane next to the caller running the annotator (\`ask review open\`) so the user lands in the editor; also surfaces in the dashboard inbox. Blocks until the user submits the review, then marks it answered. Set SISYPHUS_DISABLE_ASK_PANE=1 to suppress the pane (dashboard-only).
 
 Exit codes: 0 ok | 2 usage (file not found, not .md, missing session)
 `;
@@ -6650,7 +6661,7 @@ Input
   <askId>             required \u2014 26-character ULID of a pending review ask
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "askId", "submitted": boolean, "comments": number }
   on error: stderr diagnostic + non-zero exit
 
@@ -6666,7 +6677,7 @@ Input
   <askId>             required \u2014 26-character ULID of a pending review ask
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "askId", "submitted": true, "comments": number }
   on error: stderr diagnostic + non-zero exit
 
@@ -6694,7 +6705,7 @@ Input
   <askId>             required \u2014 26-character ULID
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   Same JSON as the original submitting command would have returned ({ responses, completedAt } for decks; { kind: 'review', feedback, completedAt } for reviews).
   on error: stderr diagnostic + non-zero exit
 
@@ -6712,7 +6723,7 @@ Input
   <askId>             required \u2014 26-character ULID
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "askId", "status": "pending" | "in-progress" | "answered" | "not-found", "completedAt"?, "output"? }
   on error: stderr diagnostic + non-zero exit
 
@@ -6729,7 +6740,7 @@ Input
   --cursor <c>        optional \u2014 opaque pagination token from a previous next_cursor
   --session <id>      optional \u2014 session id (defaults to SISYPHUS_SESSION_ID)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "items": [{ "askId", "title"?, "kind"?, "askedAt", "blocking", "askedBy" }], "next_cursor": string | null, "total": number }
   Pass next_cursor to the next call to page; null means end of list.
   on error: stderr diagnostic + non-zero exit
@@ -6749,7 +6760,7 @@ Input
   --watch             optional \u2014 live-update the pane on edits
   --window <mode>     optional \u2014 pane placement: auto, split, or new (default auto)
 
-Output (stdout, bare JSON \u2014 NOT the standard {ok, schema_version, data} envelope)
+Output (stdout, bare JSON \u2014 NOT the standard {ok, data} envelope)
   { "pane_id": string | null, "reason": string | null }
   pane_id is null when not in tmux or renderer unavailable.
   on error: stderr diagnostic + non-zero exit
@@ -6899,6 +6910,14 @@ function maybeSpawnAskPane(cwd, sessionId, askId, kind) {
   const cmd = `node ${shellQuote(tuiPath)} --cwd ${shellQuote(cwd)} --session-id ${shellQuote(sessionId)} --ask ${shellQuote(askId)}`;
   execSafe(`tmux split-window -d -h -t ${shellQuote(callerPane)} -c ${shellQuote(cwd)} ${shellQuote(cmd)}`);
 }
+function maybeSpawnReviewPane(cwd, sessionId, askId) {
+  const callerPane = process.env.TMUX_PANE;
+  if (!callerPane) return;
+  if (process.env.SISYPHUS_DISABLE_ASK_PANE === "1") return;
+  const cliPath = join13(import.meta.dirname, "cli.js");
+  const cmd = `node ${shellQuote(cliPath)} ask review open ${shellQuote(askId)} --session ${shellQuote(sessionId)}`;
+  execSafe(`tmux split-window -h -t ${shellQuote(callerPane)} -c ${shellQuote(cwd)} ${shellQuote(cmd)}`);
+}
 async function submitDeck(deck, opts, options) {
   const blocking = options?.blocking !== false;
   const { cwd, sessionId } = resolveSessionEnv(opts);
@@ -6982,11 +7001,12 @@ async function submitReview(absFile, opts, options) {
     pid: process.pid,
     claudeSessionId,
     cwd,
-    title: `Review ${basename3(absFile)}`,
+    title: `Review ${basename4(absFile)}`,
     kind: "review"
   });
   writeReview(cwd, sessionId, askId, { file: absFile });
   if (!blocking) return { askId };
+  maybeSpawnReviewPane(cwd, sessionId, askId);
   const output = await waitForOutput(cwd, sessionId, askId, initialPpid);
   await markAnswered(cwd, sessionId, askId);
   return { askId, output };
@@ -7177,8 +7197,8 @@ function registerKill(program2) {
 Input
   <sessionId>        required. Session to kill.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, killedAgents }
+Output (stdout, JSON)
+  ok, data: { sessionId, killedAgents }
 
 Effects
   Terminates all running agents and stops the session process.
@@ -7203,8 +7223,8 @@ Input
   <sessionId>        required. Session to delete.
   --cwd <path>       optional. Project directory; defaults to $SISYPHUS_CWD or cwd.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId }
+Output (stdout, JSON)
+  ok, data: { sessionId }
 
 Effects
   Permanently removes state.json, logs, and all pane records for the session.
@@ -7231,7 +7251,7 @@ Input:
   --stdin        Read instructions from stdin instead of --message.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { sessionId, tmuxSessionName? }
+  ok, data: { sessionId, tmuxSessionName? }
 
 Effects:
   Respawns the orchestrator process; session history is preserved.
@@ -7271,8 +7291,8 @@ function registerContinue(program2) {
 Input
   --session <id>     optional. Defaults to $SISYPHUS_SESSION_ID.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId }
+Output (stdout, JSON)
+  ok, data: { sessionId }
 
 Effects
   Clears the session roadmap and resets status to active. History is preserved.
@@ -7305,8 +7325,8 @@ Input
   --report <report>  required. Final completion report text.
   --session <id>     optional. Defaults to $SISYPHUS_SESSION_ID.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId }
+Output (stdout, JSON)
+  ok, data: { sessionId }
 
 Effects
   Marks the session as completed in daemon state. Orchestrator-only; sub-agents
@@ -7338,10 +7358,10 @@ function registerRollback(program2) {
     `
 Input
   <sessionId>        required. Session to roll back.
-  --cycle            required. Target cycle boundary (positive integer >= 1).
+  --cycle N          required. Target cycle boundary (positive integer >= 1).
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, restoredToCycle }
+Output (stdout, JSON)
+  ok, data: { sessionId, restoredToCycle }
 
 Effects
   Restores session state to the specified cycle boundary; discards all later cycle data.
@@ -7373,8 +7393,8 @@ function registerReconnect(program2) {
 Input
   <session-id>       required. ID of the orphaned session to reattach.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, tmuxSessionName, tmuxWindowId }
+Output (stdout, JSON)
+  ok, data: { sessionId, tmuxSessionName, tmuxWindowId }
 
 Effects
   Registers the existing tmux session with the daemon. No orchestrator is spawned and no session state changes.
@@ -7403,8 +7423,8 @@ Input
   --strategy         optional. Copy strategy.md from the source session.
   --name <name>      optional. Name for the cloned session.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, tmuxSessionName, goal }
+Output (stdout, JSON)
+  ok, data: { sessionId, tmuxSessionName, goal }
 
 Effects
   Creates a new independent session with its own roadmap, tmux session, and state.
@@ -7451,8 +7471,8 @@ Input
   <task>             required. New task/goal string for the session.
   --session <id>     optional. Defaults to $SISYPHUS_SESSION_ID.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, task }
+Output (stdout, JSON)
+  ok, data: { sessionId, task }
 
 Effects
   Overwrites the session's stored task field in daemon state.
@@ -7481,10 +7501,10 @@ function registerSessionEffort(program2) {
     `
 Input
   <sessionId>    required. Session to reconfigure.
-  --tier         required. Effort level: low | medium | high | xhigh.
+  --tier LEVEL   required. Effort level: low | medium | high | xhigh.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, effort }
+Output (stdout, JSON)
+  ok, data: { sessionId, effort }
 
 Effects
   Updates the session's effort tier in daemon state.
@@ -7517,7 +7537,7 @@ Input:
   --state        on|off|toggle \u2014 desired dangerous-mode state (default: toggle).
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { sessionId, enabled, flushed }
+  ok, data: { sessionId, enabled, flushed }
 
 Effects:
   Sets dangerousMode on the session; flushes any pending asks if enabling.
@@ -7747,7 +7767,7 @@ Input
   --cwd <path>       optional \u2014 working directory of the session; defaults to process cwd.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { sessionId, context }
+  ok, data: { sessionId, context }
 
 Effects
   None. Read-only.
@@ -7784,7 +7804,6 @@ agent spawn: spawn a worker agent. Returns immediately. Reads instruction from s
 
 Input
   stdin              required. Task instruction; treated as the agent's prompt.
-                     Pipe content directly: \`cat task.md | sis agent spawn \u2026\`.
   --stdin            optional boolean. Required when running interactively to
                      force-read stdin (mirrors \`sis session lifecycle start\`).
   --agent-type TYPE  required. Agent template (e.g. sisyphus:debug, devcore:programmer).
@@ -7793,7 +7812,9 @@ Input
   --session ID       optional. Defaults to $SISYPHUS_SESSION_ID.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { agentId, sessionId, agentType, name }
+  ok, data: { agentId, sessionId, agentType, name, follow_up }
+  follow_up          string. Recommended next call: \`sis agent await <agentId>\`
+                     to block until the agent reaches a terminal status.
 
 Effects
   Persists an agent record under the session. Spawns a tmux pane running Claude.
@@ -7883,7 +7904,7 @@ Exit codes: 0 ok | 2 usage | 3 not_found (unknown session) | 5 conflict.`
     const response = await sendRequest(request);
     if (!response.ok) exitError(response.error);
     const agentId = response.data?.agentId;
-    emitJsonOk({ agentId, sessionId, agentType, name: agentName });
+    emitJsonOk({ agentId, sessionId, agentType, name: agentName, follow_up: `sis agent await ${agentId}` });
     return;
   });
 }
@@ -7901,7 +7922,7 @@ Input
   None.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { agentTypes: [{qualifiedName, source, description}, ...] }
+  ok, data: { agentTypes: [{qualifiedName, source, description}, ...] }
   Sorted by qualifiedName ascending. No pagination \u2014 the catalog is bounded.
 
 Effects
@@ -7931,7 +7952,7 @@ Input
   stdin              optional. Piped input used as report when --report is omitted.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { sessionId, agentId }
+  ok, data: { sessionId, agentId }
 
 Effects
   Persists the report, closes the agent pane, and signals the daemon. The orchestrator
@@ -7990,8 +8011,8 @@ Input
   --session <id>      optional. Defaults to $SISYPHUS_SESSION_ID.
   stdin               optional. Read when neither --message nor --stdin is given.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, agentId }
+Output (stdout, JSON)
+  ok, data: { sessionId, agentId }
 
 Effects
   Records an intermediate checkpoint in the orchestrator; the agent keeps running.
@@ -8050,7 +8071,7 @@ Input
   --session <id>     optional. Defaults to $SISYPHUS_SESSION_ID.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { agentId, sessionId, status, agentName, agentType, reportPath, report }
+  ok, data: { agentId, sessionId, status, agentName, agentType, reportPath, report }
   Warning written to stderr if the report file cannot be read.
 
 Effects
@@ -8099,8 +8120,8 @@ Input
   <agentId>          required. Agent to kill (e.g. agent-003).
   --session <id>     optional. Defaults to $SISYPHUS_SESSION_ID.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, agentId }
+Output (stdout, JSON)
+  ok, data: { sessionId, agentId }
 
 Effects
   Sends a kill signal to the agent's tmux pane and marks the agent terminated in daemon state.
@@ -8132,8 +8153,8 @@ Input
   <agentId>          required. Agent to restart (e.g. agent-003).
   --session <id>     optional. Defaults to $SISYPHUS_SESSION_ID.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, agentId }
+Output (stdout, JSON)
+  ok, data: { sessionId, agentId }
 
 Effects
   Spawns the agent in a new tmux pane; previous pane is discarded.
@@ -8171,7 +8192,7 @@ Input
   stdin              optional. Piped input used as prompt when --prompt is omitted.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { sessionId, mode }
+  ok, data: { sessionId, mode }
 
 Effects
   Kills the current orchestrator process; daemon blocks until all running agents submit, then
@@ -8224,8 +8245,8 @@ Input
   --bg <color>       required. Background hex color (e.g. #2d2f33).
   --content <tmux>   required. tmux format string content.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { id }
+Output (stdout, JSON)
+  ok, data: { id }
 
 Effects
   Registers or replaces the named segment in the status bar.
@@ -8261,8 +8282,8 @@ function registerSegmentUnregister(program2) {
 Input
   --id <id>    required. Segment identifier to remove.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { id }
+Output (stdout, JSON)
+  ok, data: { id }
 
 Effects
   Removes the named segment from the status bar.
@@ -9508,8 +9529,8 @@ Input
   <session-id>       required. Session to pause.
   --force            optional. Interrupt running orchestrator/agents immediately.
 
-Output (stdout, JSON, schema_version: 1)
-  ok, schema_version: 1, data: { sessionId, force, queued }
+Output (stdout, JSON)
+  ok, data: { sessionId, force, queued }
 
 Effects
   Signals the session to halt at its next quiesce point, leaving it paused in place.
@@ -10044,7 +10065,7 @@ Filing:
   unauthenticated, opens a prefilled GitHub "new issue" URL instead.
 
 Output (stdout, JSON envelope)
-  { ok, schema_version: 1, data: { url | issueUrl, filed } }
+  { ok, data: { url | issueUrl, filed } }
 
 Exit codes: 0 ok | 1 filing error | 2 usage`
   ).action(
@@ -11623,12 +11644,13 @@ Input
   --limit <n>         optional \u2014 max sessions returned in list mode; default 20
 
 Output (stdout, JSON)
-  list mode:   { ok, schema_version: 1, data: { sessions: [SessionSummary, ...] } }
-  detail mode: { ok, schema_version: 1, data: { session: SessionSummary } }
-  events mode: { ok, schema_version: 1, data: { events: [HistoryEvent, ...] } }
-  stats mode:  { ok, schema_version: 1, data: { total, completed, killed, avgActiveMs, avgEfficiency, ... } }
-  on error:    { ok: false, schema_version: 1, error: { code, message } }
-  All responses carry schema_version: 1.
+  list mode:   { ok, data: { sessions: [SessionSummary, ...] } }
+               sessions sorted by startedAt descending (most recent first).
+  detail mode: { ok, data: { session: SessionSummary } }
+  events mode: { ok, data: { events: [HistoryEvent, ...] } }
+               events in chronological append order (oldest first).
+  stats mode:  { ok, data: { total, completed, killed, avgActiveMs, avgEfficiency, ... } }
+  on error:    { ok: false, error: { code, message } }
 
 Effects
   None. Read-only.
@@ -11664,9 +11686,9 @@ Input
   --cwd <path>    optional \u2014 project directory used to resolve the active session; defaults to $SISYPHUS_CWD then process cwd
 
 Output (stdout, JSON)
-  { ok, schema_version: 1, data: { sessionId, outputPath } }
+  { ok, data: { sessionId, outputPath } }
   outputPath is the absolute path of the written zip file (typically ~/Downloads/<sessionId>.zip).
-  on error: { ok: false, schema_version: 1, error: { code, message } }
+  on error: { ok: false, error: { code, message } }
 
 Effects
   Writes a zip archive to ~/Downloads.
@@ -11725,7 +11747,7 @@ Input
   --cwd <path>    project directory override (default: SISYPHUS_CWD env var or cwd).
 
 Output (stdout, JSON envelope)
-  { ok, schema_version: 1, data: { sessionId, storageKey } }
+  { ok, data: { sessionId, storageKey } }
 
 Effects
   Exports session to a temporary zip file, POSTs it to the configured upload URL,
@@ -11864,9 +11886,9 @@ Input
   --cwd <path>    optional \u2014 working directory for the Claude session; defaults to $SISYPHUS_CWD then process cwd
 
 Output (stdout, JSON)
-  { ok, schema_version: 1, data: { tmuxSession, windowId } }
+  { ok, data: { tmuxSession, windowId } }
   tmuxSession is the tmux session name; windowId is the tmux window ID (e.g. @42).
-  on error: { ok: false, schema_version: 1, error: { code, message } }
+  on error: { ok: false, error: { code, message } }
 
 Effects
   Creates a new tmux window named "scratch" in the home tmux session.
@@ -11948,10 +11970,10 @@ File resolution (first match wins)
   3. Most recent session with a requirements.json
 
 Output (stdout, JSON)
-  --export:    { ok, schema_version: 1, data: { path } }  \u2014 path is the absolute path of the written requirements.md
-  --schema:    { ok, schema_version: 1, data: <schema object> }
-  --annotated: { ok, schema_version: 1, data: { markdown } }  \u2014 markdown is the annotated guide body string
-  on error:    { ok: false, schema_version: 1, error: { code, message } }
+  --export:    { ok, data: { path } }  \u2014 path is the absolute path of the written requirements.md
+  --schema:    { ok, data: <schema object> }
+  --annotated: { ok, data: { markdown } }  \u2014 markdown is the annotated guide body string
+  on error:    { ok: false, error: { code, message } }
 
 Effects
   --export: Writes requirements.md alongside the source requirements.json.
@@ -12133,7 +12155,7 @@ var REQUIREMENTS_ANNOTATED = `# requirements.json \u2014 Annotated Writing Guide
     //            belongs in design.md (technical) and plan.md (steps).
 
     "version": 1,
-    //          ^ Always 1. Reserved for future schema versioning.
+    //          ^ Always 1.
 
     "lastModified": "2026-04-04T12:00:00Z",
     //               ^ ISO 8601 timestamp. Update on each save.
@@ -12362,7 +12384,7 @@ function renderRequirementsMarkdown(json) {
 }
 
 // src/cli/commands/companion.ts
-import { basename as basename6, dirname as dirname11, join as join28 } from "path";
+import { basename as basename7, dirname as dirname11, join as join28 } from "path";
 import { mkdirSync as mkdirSync15, readFileSync as readFileSync31, writeFileSync as writeFileSync18 } from "fs";
 init_paths();
 init_companion_types();
@@ -12417,7 +12439,7 @@ function renderMemory(state, repo) {
         const ts = formatTimestamp(rec.timestamp);
         const src = `(${rec.source})`.padEnd(7);
         const text = sanitizeForDisplay(rec.text);
-        const repoStr = rec.repo !== null ? `[${sanitizeForDisplay(basename6(rec.repo))}]` : "[\u2014]";
+        const repoStr = rec.repo !== null ? `[${sanitizeForDisplay(basename7(rec.repo))}]` : "[\u2014]";
         lines.push(`  [${ts}] ${src}  ${text}  ${repoStr}`);
       }
     } else {
@@ -12565,11 +12587,11 @@ function registerCompanionProfile(companion) {
 companion profile: retrieve the combined companion profile.
 
 Input
-  --name    optional. Set companion name (persisted on the daemon).
-  --badges  optional boolean. Include full badge catalog with unlock status in output.
+  --name NAME  optional. Set companion name (persisted on the daemon).
+  --badges     optional boolean. Include full badge catalog with unlock status in output.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { name, level, title, mood, xp, stats, achievements, repos, lastCommentary, badges? }
+  ok, data: { name, level, title, mood, xp, stats, achievements, repos, lastCommentary, badges? }
 
 Effects
   If --name is provided, updates the companion name on the daemon.
@@ -12769,7 +12791,7 @@ Input
   None.
 
 Output (stdout, JSON)
-  ok, schema_version: 1, data: { providers: [{ name, status }, ...] }
+  ok, data: { providers: [{ name, status }, ...] }
   Sorted by name ascending. No pagination \u2014 bounded set.
 
 Effects
@@ -13639,7 +13661,7 @@ Tip: enable systemd in /etc/wsl.conf for the recommended daemon setup.`);
 }
 var sessionCounts = null;
 var program = new Command();
-program.name("sis").description("tmux-integrated orchestration daemon for Claude Code").helpOption("--help", "print -h for any node or leaf").version(
+program.name("sis").description("tmux-integrated orchestration daemon for Claude Code").helpOption("-h, --help", "print -h for any node or leaf").version(
   JSON.parse(
     readFileSync46(join38(dirname16(fileURLToPath6(import.meta.url)), "..", "package.json"), "utf-8")
   ).version,
@@ -13664,11 +13686,11 @@ Exit codes:
   60  transient (retry-safe: daemon down, timeout, lock contention)
 
 Errors:
-  {"ok": false, "schema_version": 1,
+  {"ok": false,
    "error": {"code": "<stable-enum>", "kind": "<usage|not_found|ambiguous|conflict|transient|permanent>",
              "message": "...", "received"?: ..., "expected"?: ..., "next"?: "...", "candidates"?: [...]}}
 `);
-if (process.argv.includes("--help") && process.argv.some((a) => a === "session")) {
+if ((process.argv.includes("--help") || process.argv.includes("-h")) && process.argv.some((a) => a === "session")) {
   try {
     const resp = await rawSend2({ type: "list", cwd: process.cwd(), all: true }, 250);
     if (resp.ok && Array.isArray(resp.data?.sessions)) {