@os-eco/overstory-cli 0.9.3 → 0.10.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (116) hide show
  1. package/README.md +49 -18
  2. package/agents/builder.md +9 -8
  3. package/agents/coordinator.md +6 -6
  4. package/agents/lead.md +98 -82
  5. package/agents/merger.md +25 -14
  6. package/agents/reviewer.md +22 -16
  7. package/agents/scout.md +17 -12
  8. package/package.json +6 -3
  9. package/src/agents/capabilities.test.ts +85 -0
  10. package/src/agents/capabilities.ts +125 -0
  11. package/src/agents/headless-mail-injector.test.ts +448 -0
  12. package/src/agents/headless-mail-injector.ts +211 -0
  13. package/src/agents/headless-prompt.test.ts +102 -0
  14. package/src/agents/headless-prompt.ts +68 -0
  15. package/src/agents/hooks-deployer.test.ts +514 -14
  16. package/src/agents/hooks-deployer.ts +141 -0
  17. package/src/agents/overlay.test.ts +4 -4
  18. package/src/agents/overlay.ts +30 -8
  19. package/src/agents/turn-lock.test.ts +181 -0
  20. package/src/agents/turn-lock.ts +235 -0
  21. package/src/agents/turn-runner-dispatch.test.ts +182 -0
  22. package/src/agents/turn-runner-dispatch.ts +105 -0
  23. package/src/agents/turn-runner.test.ts +1450 -0
  24. package/src/agents/turn-runner.ts +1166 -0
  25. package/src/commands/clean.ts +56 -1
  26. package/src/commands/completions.test.ts +4 -1
  27. package/src/commands/coordinator.test.ts +127 -0
  28. package/src/commands/coordinator.ts +205 -6
  29. package/src/commands/dashboard.test.ts +188 -0
  30. package/src/commands/dashboard.ts +13 -3
  31. package/src/commands/doctor.ts +94 -77
  32. package/src/commands/group.test.ts +94 -0
  33. package/src/commands/group.ts +49 -20
  34. package/src/commands/init.test.ts +8 -0
  35. package/src/commands/init.ts +8 -1
  36. package/src/commands/log.test.ts +56 -11
  37. package/src/commands/log.ts +134 -69
  38. package/src/commands/mail.test.ts +162 -0
  39. package/src/commands/mail.ts +64 -9
  40. package/src/commands/merge.test.ts +112 -1
  41. package/src/commands/merge.ts +17 -4
  42. package/src/commands/monitor.ts +2 -1
  43. package/src/commands/nudge.test.ts +351 -4
  44. package/src/commands/nudge.ts +356 -34
  45. package/src/commands/run.test.ts +43 -7
  46. package/src/commands/serve/build.test.ts +202 -0
  47. package/src/commands/serve/build.ts +206 -0
  48. package/src/commands/serve/coordinator-actions.test.ts +339 -0
  49. package/src/commands/serve/coordinator-actions.ts +408 -0
  50. package/src/commands/serve/dev.test.ts +168 -0
  51. package/src/commands/serve/dev.ts +117 -0
  52. package/src/commands/serve/mail-actions.test.ts +312 -0
  53. package/src/commands/serve/mail-actions.ts +167 -0
  54. package/src/commands/serve/rest.test.ts +1323 -0
  55. package/src/commands/serve/rest.ts +708 -0
  56. package/src/commands/serve/static.ts +51 -0
  57. package/src/commands/serve/ws.test.ts +361 -0
  58. package/src/commands/serve/ws.ts +332 -0
  59. package/src/commands/serve.test.ts +459 -0
  60. package/src/commands/serve.ts +565 -0
  61. package/src/commands/sling.test.ts +85 -1
  62. package/src/commands/sling.ts +153 -64
  63. package/src/commands/status.test.ts +9 -0
  64. package/src/commands/status.ts +12 -4
  65. package/src/commands/stop.test.ts +174 -1
  66. package/src/commands/stop.ts +107 -8
  67. package/src/commands/supervisor.ts +2 -1
  68. package/src/commands/watch.test.ts +49 -4
  69. package/src/commands/watch.ts +153 -28
  70. package/src/commands/worktree.test.ts +319 -3
  71. package/src/commands/worktree.ts +86 -0
  72. package/src/config.test.ts +78 -0
  73. package/src/config.ts +43 -1
  74. package/src/doctor/consistency.test.ts +106 -0
  75. package/src/doctor/consistency.ts +50 -3
  76. package/src/doctor/serve.test.ts +95 -0
  77. package/src/doctor/serve.ts +86 -0
  78. package/src/doctor/types.ts +2 -1
  79. package/src/doctor/watchdog.ts +57 -1
  80. package/src/events/tailer.test.ts +234 -1
  81. package/src/events/tailer.ts +90 -0
  82. package/src/index.ts +53 -6
  83. package/src/json.ts +29 -0
  84. package/src/mail/client.ts +15 -2
  85. package/src/mail/store.test.ts +82 -0
  86. package/src/mail/store.ts +41 -4
  87. package/src/merge/lock.test.ts +149 -0
  88. package/src/merge/lock.ts +140 -0
  89. package/src/runtimes/__fixtures__/claude-stream-fixture.ts +22 -0
  90. package/src/runtimes/claude.test.ts +791 -1
  91. package/src/runtimes/claude.ts +323 -1
  92. package/src/runtimes/connections.test.ts +141 -1
  93. package/src/runtimes/connections.ts +73 -4
  94. package/src/runtimes/headless-connection.test.ts +264 -0
  95. package/src/runtimes/headless-connection.ts +158 -0
  96. package/src/runtimes/types.ts +10 -0
  97. package/src/schema-consistency.test.ts +1 -0
  98. package/src/sessions/store.test.ts +390 -24
  99. package/src/sessions/store.ts +184 -19
  100. package/src/test-setup.test.ts +31 -0
  101. package/src/test-setup.ts +28 -0
  102. package/src/types.ts +56 -1
  103. package/src/utils/pid.test.ts +85 -1
  104. package/src/utils/pid.ts +86 -1
  105. package/src/utils/process-scan.test.ts +53 -0
  106. package/src/utils/process-scan.ts +76 -0
  107. package/src/watchdog/daemon.test.ts +1520 -411
  108. package/src/watchdog/daemon.ts +442 -83
  109. package/src/watchdog/health.test.ts +157 -0
  110. package/src/watchdog/health.ts +92 -25
  111. package/src/worktree/process.test.ts +71 -0
  112. package/src/worktree/process.ts +25 -5
  113. package/src/worktree/tmux.test.ts +39 -0
  114. package/src/worktree/tmux.ts +23 -3
  115. package/templates/CLAUDE.md.tmpl +19 -8
  116. package/templates/overlay.md.tmpl +3 -2
@@ -4,6 +4,8 @@ import { mkdtemp } from "node:fs/promises";
4
4
  import { tmpdir } from "node:os";
5
5
  import { join } from "node:path";
6
6
  import { createEventStore } from "../events/store.ts";
7
+ import { removeConnection, setConnection } from "../runtimes/connections.ts";
8
+ import type { NudgeableConnection, NudgeResult } from "../runtimes/headless-connection.ts";
7
9
  import { createSessionStore } from "../sessions/store.ts";
8
10
  import { cleanupTempDir } from "../test-helpers.ts";
9
11
  import type { AgentSession, StoredEvent } from "../types.ts";
@@ -63,6 +65,32 @@ function makeSession(overrides: Partial<AgentSession> = {}): AgentSession {
63
65
  };
64
66
  }
65
67
 
68
+ describe("paneAppearsBusy", () => {
69
+ test("flags Claude Code mid-think pane as busy", async () => {
70
+ const { paneAppearsBusy } = await import("./nudge.ts");
71
+ const sample = [
72
+ "╭───────────────────────────────────────────╮",
73
+ "│ ✻ Cooking… (5s · ↓ 0 tokens · esc to interrupt)",
74
+ "╰───────────────────────────────────────────╯",
75
+ " ⏵⏵ bypass permissions on (alt+m to cycle)",
76
+ ].join("\n");
77
+ expect(paneAppearsBusy(sample)).toBe(true);
78
+ });
79
+
80
+ test("treats idle pane (no esc-to-interrupt) as not busy", async () => {
81
+ const { paneAppearsBusy } = await import("./nudge.ts");
82
+ const sample = [
83
+ "$ ❯ ls",
84
+ "src/",
85
+ "╭───────────────────────────────────────────╮",
86
+ "│ > _ │",
87
+ "╰───────────────────────────────────────────╯",
88
+ " ⏵⏵ bypass permissions on (alt+m to cycle)",
89
+ ].join("\n");
90
+ expect(paneAppearsBusy(sample)).toBe(false);
91
+ });
92
+ });
93
+
66
94
  describe("nudgeAgent", () => {
67
95
  // We dynamically import to avoid circular issues
68
96
  async function importNudge() {
@@ -77,20 +105,28 @@ describe("nudgeAgent", () => {
77
105
  expect(result.reason).toContain("No active session");
78
106
  });
79
107
 
80
- test("returns error when agent is zombie", async () => {
81
- writeSessionsToStore(tempDir, [makeSession({ state: "zombie" })]);
108
+ test("returns error with recovery hint when agent is zombie", async () => {
109
+ writeSessionsToStore(tempDir, [
110
+ makeSession({ state: "zombie", capability: "lead", taskId: "task-42" }),
111
+ ]);
82
112
  const { nudgeAgent } = await importNudge();
83
113
  const result = await nudgeAgent(tempDir, "test-agent");
84
114
  expect(result.delivered).toBe(false);
85
115
  expect(result.reason).toContain("No active session");
116
+ expect(result.reason).toContain("state: zombie");
117
+ expect(result.reason).toContain("ov sling task-42 --capability lead --recover");
86
118
  });
87
119
 
88
- test("returns error when agent is completed", async () => {
89
- writeSessionsToStore(tempDir, [makeSession({ state: "completed" })]);
120
+ test("returns error with recovery hint when agent is completed", async () => {
121
+ writeSessionsToStore(tempDir, [
122
+ makeSession({ state: "completed", capability: "lead", taskId: "task-42" }),
123
+ ]);
90
124
  const { nudgeAgent } = await importNudge();
91
125
  const result = await nudgeAgent(tempDir, "test-agent");
92
126
  expect(result.delivered).toBe(false);
93
127
  expect(result.reason).toContain("No active session");
128
+ expect(result.reason).toContain("state: completed");
129
+ expect(result.reason).toContain("ov sling task-42 --capability lead --recover");
94
130
  });
95
131
 
96
132
  test("finds active agent in working state", async () => {
@@ -230,3 +266,314 @@ describe("nudgeAgent", () => {
230
266
  }
231
267
  });
232
268
  });
269
+
270
+ describe("nudgeAgent with headless connection", () => {
271
+ async function importNudge() {
272
+ return await import("./nudge.ts");
273
+ }
274
+
275
+ /** Build a NudgeableConnection stub that records calls. */
276
+ function makeNudgeableConn(
277
+ result: NudgeResult = { status: "Queued" },
278
+ onNudge?: (text: string) => void,
279
+ ): NudgeableConnection {
280
+ return {
281
+ sendPrompt: async () => {},
282
+ followUp: async () => {},
283
+ abort: async () => {},
284
+ getState: async () => ({ status: "idle" as const }),
285
+ close: () => {},
286
+ nudge: async (text: string) => {
287
+ if (onNudge) onNudge(text);
288
+ return result;
289
+ },
290
+ };
291
+ }
292
+
293
+ afterEach(() => {
294
+ removeConnection("headless-test-agent");
295
+ });
296
+
297
+ test("routes nudge through connection.nudge() when connection exists", async () => {
298
+ let capturedText = "";
299
+ setConnection(
300
+ "headless-test-agent",
301
+ makeNudgeableConn({ status: "Queued" }, (t) => {
302
+ capturedText = t;
303
+ }),
304
+ );
305
+
306
+ const { nudgeAgent } = await importNudge();
307
+ const result = await nudgeAgent(tempDir, "headless-test-agent", "ping", true);
308
+
309
+ expect(result.delivered).toBe(true);
310
+ expect(result.queued).toBe(true);
311
+ expect(capturedText).toBe("ping");
312
+ });
313
+
314
+ test("queued=false when connection returns Delivered", async () => {
315
+ setConnection("headless-test-agent", makeNudgeableConn({ status: "Delivered" }));
316
+
317
+ const { nudgeAgent } = await importNudge();
318
+ const result = await nudgeAgent(tempDir, "headless-test-agent", "ping", true);
319
+
320
+ expect(result.delivered).toBe(true);
321
+ expect(result.queued).toBe(false);
322
+ });
323
+
324
+ test("falls back to tmux path when connection has no nudge() method", async () => {
325
+ // Register a plain RuntimeConnection (no nudge method)
326
+ setConnection("headless-test-agent", {
327
+ sendPrompt: async () => {},
328
+ followUp: async () => {},
329
+ abort: async () => {},
330
+ getState: async () => ({ status: "idle" as const }),
331
+ close: () => {},
332
+ });
333
+ // Also add a sessions.db entry so resolveTargetSession can find something
334
+ writeSessionsToStore(tempDir, [makeSession({ agentName: "headless-test-agent" })]);
335
+
336
+ const { nudgeAgent } = await importNudge();
337
+ const result = await nudgeAgent(tempDir, "headless-test-agent");
338
+ // Falls through to tmux — tmux session not alive
339
+ expect(result.delivered).toBe(false);
340
+ expect(result.reason).toContain("not alive");
341
+ // No queued field when tmux path runs
342
+ expect(result.queued).toBeUndefined();
343
+ });
344
+
345
+ test("debounce applies to headless nudges", async () => {
346
+ let nudgeCount = 0;
347
+ setConnection(
348
+ "headless-test-agent",
349
+ makeNudgeableConn({ status: "Queued" }, () => {
350
+ nudgeCount++;
351
+ }),
352
+ );
353
+
354
+ const { nudgeAgent } = await importNudge();
355
+ // First nudge — forced to bypass debounce and prime the state
356
+ await nudgeAgent(tempDir, "headless-test-agent", "first", true);
357
+ // Second nudge immediately — should be debounced (within 500ms window)
358
+ const second = await nudgeAgent(tempDir, "headless-test-agent", "second");
359
+
360
+ expect(nudgeCount).toBe(1);
361
+ expect(second.delivered).toBe(false);
362
+ expect(second.reason).toContain("Debounced");
363
+ });
364
+
365
+ test("records nudge event for headless delivery", async () => {
366
+ setConnection("headless-test-agent", makeNudgeableConn({ status: "Queued" }));
367
+
368
+ const { nudgeAgent } = await importNudge();
369
+ await nudgeAgent(tempDir, "headless-test-agent", "event test", true);
370
+
371
+ const eventsDbPath = join(tempDir, ".overstory", "events.db");
372
+ const store = createEventStore(eventsDbPath);
373
+ try {
374
+ const events: StoredEvent[] = store.getTimeline({ since: "2000-01-01T00:00:00Z" });
375
+ const nudgeEvent = events.find((e) => {
376
+ if (!e.data) return false;
377
+ const data = JSON.parse(e.data) as Record<string, unknown>;
378
+ return data.type === "nudge";
379
+ });
380
+ expect(nudgeEvent).toBeDefined();
381
+ expect(nudgeEvent?.agentName).toBe("headless-test-agent");
382
+ const data = JSON.parse(nudgeEvent?.data ?? "{}") as Record<string, unknown>;
383
+ expect(data.delivered).toBe(true);
384
+ } finally {
385
+ store.close();
386
+ }
387
+ });
388
+
389
+ test("tmux path: send-keys path invoked for agent with no connection", async () => {
390
+ writeSessionsToStore(tempDir, [makeSession({ state: "working" })]);
391
+
392
+ const { nudgeAgent } = await importNudge();
393
+ const result = await nudgeAgent(tempDir, "test-agent");
394
+ // No connection registered → tmux path → tmux session not alive
395
+ expect(result.delivered).toBe(false);
396
+ expect(result.reason).toContain("not alive");
397
+ expect(result.queued).toBeUndefined();
398
+ });
399
+ });
400
+
401
+ describe("nudgeAgent spawn-per-turn dispatch", () => {
402
+ async function importNudge() {
403
+ return await import("./nudge.ts");
404
+ }
405
+
406
+ function fakeLoadConfig(): typeof import("../config.ts").loadConfig {
407
+ return (async (root: string) => ({
408
+ project: { name: "test", root, canonicalBranch: "main" },
409
+ agents: {
410
+ baseDir: "agents",
411
+ manifestPath: ".overstory/agent-manifest.json",
412
+ maxConcurrent: 5,
413
+ maxSessionsPerRun: 0,
414
+ maxAgentsPerLead: 5,
415
+ maxDepth: 2,
416
+ staggerDelayMs: 0,
417
+ autoNudgeOnMail: false,
418
+ },
419
+ worktrees: { baseDir: ".overstory/worktrees" },
420
+ merge: { mode: "manual" },
421
+ mulch: { enabled: false, domains: {} },
422
+ canopy: { enabled: false },
423
+ taskTracker: { backend: "seeds", enabled: true },
424
+ watchdog: {
425
+ tier0Enabled: false,
426
+ tier0IntervalMs: 30_000,
427
+ tier1Enabled: false,
428
+ maxEscalationLevel: 3,
429
+ },
430
+ models: {},
431
+ logging: { verbose: false, redactSecrets: true },
432
+ runtime: { default: "claude" },
433
+ providers: {},
434
+ })) as unknown as typeof import("../config.ts").loadConfig;
435
+ }
436
+
437
+ async function writeManifest(projectRoot: string): Promise<void> {
438
+ mkdirSync(join(projectRoot, ".overstory"), { recursive: true });
439
+ mkdirSync(join(projectRoot, "agents"), { recursive: true });
440
+ await Bun.write(join(projectRoot, "agents", "builder.md"), "# Builder\n");
441
+ await Bun.write(
442
+ join(projectRoot, ".overstory", "agent-manifest.json"),
443
+ JSON.stringify(
444
+ {
445
+ version: "1",
446
+ agents: {
447
+ builder: {
448
+ file: "builder.md",
449
+ model: "claude-sonnet",
450
+ tools: [],
451
+ capabilities: ["build"],
452
+ canSpawn: false,
453
+ constraints: [],
454
+ },
455
+ },
456
+ },
457
+ null,
458
+ "\t",
459
+ ),
460
+ );
461
+ }
462
+
463
+ test("routes builder nudge through runTurn when flag is on", async () => {
464
+ writeSessionsToStore(tempDir, [makeSession({ state: "working", capability: "builder" })]);
465
+ await writeManifest(tempDir);
466
+
467
+ const calls: Array<{ userTurnNdjson: string }> = [];
468
+ const stubRunTurn = async (opts: import("../agents/turn-runner.ts").RunTurnOpts) => {
469
+ calls.push({ userTurnNdjson: opts.userTurnNdjson });
470
+ return {
471
+ exitCode: 0,
472
+ cleanResult: true,
473
+ newSessionId: null,
474
+ resumeMismatch: false,
475
+ terminalMailObserved: false,
476
+ durationMs: 1,
477
+ initialState: "booting" as const,
478
+ finalState: "working" as const,
479
+ stallAborted: false,
480
+ terminalMailMissing: false,
481
+ };
482
+ };
483
+
484
+ const { nudgeAgent } = await importNudge();
485
+ const result = await nudgeAgent(tempDir, "test-agent", "please pivot", true, {
486
+ _loadConfig: fakeLoadConfig(),
487
+ _runTurnFn: stubRunTurn,
488
+ });
489
+
490
+ expect(result.delivered).toBe(true);
491
+ expect(calls.length).toBe(1);
492
+ const parsed = JSON.parse(calls[0]?.userTurnNdjson?.trimEnd() ?? "");
493
+ expect(parsed.type).toBe("user");
494
+ expect(parsed.message.content[0].text).toBe("please pivot");
495
+ });
496
+
497
+ test("task-scoped non-builder capability (scout) IS routed to spawn-per-turn", async () => {
498
+ writeSessionsToStore(tempDir, [
499
+ makeSession({ state: "working", capability: "scout", agentName: "scout-1" }),
500
+ ]);
501
+ await writeManifest(tempDir);
502
+
503
+ let runTurnCalled = false;
504
+ const stubRunTurn = async () => {
505
+ runTurnCalled = true;
506
+ return {
507
+ exitCode: 0,
508
+ cleanResult: true,
509
+ newSessionId: null,
510
+ resumeMismatch: false,
511
+ terminalMailObserved: false,
512
+ durationMs: 1,
513
+ initialState: "booting" as const,
514
+ finalState: "working" as const,
515
+ stallAborted: false,
516
+ terminalMailMissing: false,
517
+ };
518
+ };
519
+
520
+ const { nudgeAgent } = await importNudge();
521
+ await nudgeAgent(tempDir, "scout-1", "ping", true, {
522
+ _loadConfig: fakeLoadConfig(),
523
+ _runTurnFn: stubRunTurn,
524
+ });
525
+
526
+ expect(runTurnCalled).toBe(true);
527
+ });
528
+
529
+ test("persistent capability (coordinator) is NOT routed to spawn-per-turn", async () => {
530
+ writeSessionsToStore(tempDir, [
531
+ makeSession({ state: "working", capability: "coordinator", agentName: "coord-1" }),
532
+ ]);
533
+ await writeManifest(tempDir);
534
+
535
+ let runTurnCalled = false;
536
+ const stubRunTurn = async () => {
537
+ runTurnCalled = true;
538
+ return {
539
+ exitCode: 0,
540
+ cleanResult: true,
541
+ newSessionId: null,
542
+ resumeMismatch: false,
543
+ terminalMailObserved: false,
544
+ durationMs: 1,
545
+ initialState: "booting" as const,
546
+ finalState: "working" as const,
547
+ stallAborted: false,
548
+ terminalMailMissing: false,
549
+ };
550
+ };
551
+
552
+ const { nudgeAgent } = await importNudge();
553
+ await nudgeAgent(tempDir, "coord-1", "ping", true, {
554
+ _loadConfig: fakeLoadConfig(),
555
+ _runTurnFn: stubRunTurn,
556
+ });
557
+
558
+ expect(runTurnCalled).toBe(false);
559
+ });
560
+
561
+ test("returns delivery error when runTurn throws", async () => {
562
+ writeSessionsToStore(tempDir, [makeSession({ state: "working", capability: "builder" })]);
563
+ await writeManifest(tempDir);
564
+
565
+ const stubRunTurn = async (): Promise<never> => {
566
+ throw new Error("simulated spawn failure");
567
+ };
568
+
569
+ const { nudgeAgent } = await importNudge();
570
+ const result = await nudgeAgent(tempDir, "test-agent", "ping", true, {
571
+ _loadConfig: fakeLoadConfig(),
572
+ _runTurnFn: stubRunTurn,
573
+ });
574
+
575
+ expect(result.delivered).toBe(false);
576
+ expect(result.reason).toContain("Spawn-per-turn dispatch failed");
577
+ expect(result.reason).toContain("simulated spawn failure");
578
+ });
579
+ });