@bill10/agent-007 0.9.0 → 0.9.1000

package/README.md

@@ -83,7 +83,7 @@ up a stale local base or whatever unrelated branch you happen to have checked
 out. Override it per agent with **Advanced -> Start from** when you want to
 branch off work in progress.
 
-The job board reuses that same machinery: a dispatched job is an ordinary agent, with a real terminal you can type into and take over at any point. Each job gets its own worktree and branch, so a job maps one-to-one onto a branch and a pull request. When the agent finishes it calls the board's `finish_job` tool (a card that requires a pull request hands over the PR it opened; one that does not hands over a summary), and the card moves to Review with the agent still running, so you can click straight into it to ask about the work. When the card reaches Done the board closes the agent and releases its worktree and local branch; the PR itself is untouched, and work that was never pushed is kept as an orphan rather than deleted. **Re-spawn** on an orphan picks that conversation back up with the CLI it ran, `codex resume <session-id>` (the newest Codex session recorded in that exact worktree) or `claude --continue`, under the permission mode its job card was dispatched with (a board agent whose card is already finished or deleted follows the board's current setting), or, for an agent you spawned by hand, under the permission flags you started it with. When the PR merges the job is filed away as finished -- the record is kept, the card is not.
+The job board reuses that same machinery: a dispatched job is an ordinary agent, with a real terminal you can type into and take over at any point. Each job gets its own worktree and branch, so a job maps one-to-one onto a branch and a pull request. When the agent finishes it calls the board's `finish_job` tool (a card that requires a pull request hands over the PR it opened; one that does not hands over a summary), and the card moves to Review with the agent still running, so you can click straight into it to ask about the work. When the card reaches Done the board closes the agent and releases its worktree and local branch; the PR itself is untouched, and work that was never pushed is kept as an orphan rather than deleted. **Re-spawn** on an orphan picks that conversation back up with the CLI it ran, `codex resume <session-id>` (the newest Codex session recorded in that exact worktree) or `claude --continue`, under the permission mode its job card was dispatched with (a board agent whose card is already finished or deleted follows the board's current setting), or, for an agent you spawned by hand, under the permission flags you started it with. A board worker re-spawned after a restart is its card's worker again: it counts toward the cap, sends its approvals where the card says, is told once to carry on if its card is still In progress, and leaves like any other board worker when the card is filed. When the PR merges the job is filed away as finished -- the record is kept, the card is not.
 
 ```
 ┌─────────────┬──────────────┬────────────────────┐

package/VERSION

@@ -1 +1 @@
-0.9.0.0
+0.9.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bill10/agent-007",
-  "version": "0.9.0",
+  "version": "0.9.1000",
   "description": "From web terminals for your coding agents to a self-running agent company: Claude Code and Codex in parallel git worktrees, a job board they pick work from, and one agent that runs the board from a goal.",
   "license": "MIT",
   "repository": {

package/public/modules/terminal.js

@@ -260,6 +260,9 @@ export function handleSessionEnded(msg) {
   // would transcribe speech into a dead pty forever.
   if (msg.sessionId === activeSessionId) stopVoice({ notice: 'Voice input stopped — agent ended' });
   agent.state = 'DISCONNECTED';
+  // The server's word at exit wins: a re-spawned agent relinked to its card,
+  // or one the board retired, is a board worker even if it opened as a user's.
+  if ('spawnedBy' in msg) { agent.spawnedBy = msg.spawnedBy; agent.jobId = msg.jobId || null; }
 
   // A board agent retired after opening its PR takes its tab with it. Under
   // unattended dispatch these arrive steadily, and a row of dead tabs is pure

package/server/config.js

@@ -121,6 +121,10 @@ export function saveActiveSession(session, broadcast) {
     agent: sessionAgent(session),
     permissionFlags: sessionPermissionFlags(session),
     origin: sessionOrigin(session),
+    // The card it works on, so a re-spawn after a restart is that card's
+    // worker again rather than a stranger on its branch.
+    jobId: session.jobId || null,
+    approvalsToBillion: !!session.approvalsToBillion,
     savedAt: new Date().toISOString(),
   });
   saveConfig(broadcast);
@@ -171,6 +175,8 @@ export function recoverCrashedSessions(broadcast) {
       agent: isValidJobAgent(s.agent) ? s.agent : null,
       permissionFlags: recordedPermissionFlags(s),
       origin: s.origin === 'board' ? 'board' : 'user',
+      jobId: typeof s.jobId === 'string' ? s.jobId : null,
+      approvalsToBillion: s.approvalsToBillion === true,
       reason: 'server-restart',
       createdAt: new Date().toISOString(),
     };

package/server/jobs.js

@@ -1242,7 +1242,9 @@ export async function dispatchOnce(createSession, broadcast, { onSessionCreated,
 // belongs to, or null. relinkSessionToJob below ties the session to it, and
 // resumeCommandForOrphan reads the card's agent through the same lookup before
 // the spawn, so the two cannot disagree about which card the orphan came from.
-export function findJobForBranch({ repoPath, branchName }) {
+// A record that saved its card's id (jobId) picks that card when two share the
+// branch; the branch alone still decides for older records.
+export function findJobForBranch({ repoPath, branchName, jobId }) {
   if (!branchName) return null;
   // in-progress OR review: a job can reach review while its link is null (the
   // PR was found after a restart, so there was no session to retire), and the
@@ -1258,7 +1260,8 @@ export function findJobForBranch({ repoPath, branchName }) {
   );
   // Prefer work still in flight: if an old review job and a new in-progress job
   // share a branch, the agent belongs to the one that is not finished.
-  return matches.find(j => j.state === 'in-progress') || matches[0] || null;
+  return (jobId && matches.find(j => j.id === jobId))
+    || matches.find(j => j.state === 'in-progress') || matches[0] || null;
 }
 
 // What re-adopting an orphan should run. The orphan record says which CLI the
@@ -1326,7 +1329,10 @@ export function relinkSessionToJob(session, broadcast) {
   job.lastErrorAt = null;
   job.prCheckError = null;
   job.prCheckErrorAt = null;
-  session.jobId = job.id;   // so the PR path can retire it like any board agent
+  // A board worker again, so the PR path retires it and its tab and desk go
+  // like any board agent's (the client keys that on spawnedBy + jobId).
+  session.spawnedBy = 'board';
+  session.jobId = job.id;
   persist(broadcast);
   return job;
 }
@@ -1632,6 +1638,10 @@ async function retireAgentForJob(job, askedBranch, askedSessionId, killSession,
   if (!session || session.exited) return false;
   try {
     if (!job.agentName) job.agentName = session.name;
+    // The board retired it, so it leaves as a board worker does: session-ended
+    // carries these, and the client closes the tab and walks it out on them.
+    session.spawnedBy = 'board';
+    session.jobId = job.id;
     await killSession(session.id);
     job.agentSessionId = null;   // only after the kill actually succeeded
     return true;

package/server/pty.js

@@ -158,7 +158,10 @@ export function setupPtyHandlers(session, sessionId, broadcast) {
     dropMessages(sessionId);
     if (session.isBillion) dropApprovals();
     updateState(session, broadcast);
-    broadcast({ type: 'session-ended', sessionId, reason: `Process exited with code ${exitCode}` });
+    // What it is as it ends, which a relink or a board retirement may have
+    // changed since session-created: the client's finished-worker path reads it.
+    broadcast({ type: 'session-ended', sessionId, reason: `Process exited with code ${exitCode}`,
+      spawnedBy: session.spawnedBy, jobId: session.jobId });
   });
 
   session.stateCheckInterval = setInterval(() => {

package/server/ws.js

@@ -11,17 +11,20 @@ import { authEnabled, resolveToken, tokenFromRequest, publicUser, userById, load
 import { saveActiveSession, syncOrphansToConfig, saveConfig } from './config.js';
 import { addRepo, removeRepo, scanFileTree, startTreeScanLoop, getDiff, broadcastReposList, gitExec, deleteBranch } from './git.js';
 import { createSessionFromConfig } from './pty.js';
-import { isTyping } from './messages.js';
+import { isTyping, sendText } from './messages.js';
+import { autoTrusts, trustClaudeFolder } from './claude-trust.js';
 import { waitingPayload, dismissWaiting } from './owner.js';
 import { parseGitStatus, buildFileTree, safeFilename } from '../lib/helpers.js';
-import { isValidJobAgent } from '../lib/jobs.js';
+import { isValidJobAgent, sessionAgentFromCommand } from '../lib/jobs.js';
 import { billionRuns } from './billion.js';
 import {
   addJob, updateJob, deleteJob, moveJob, updateSettings, setJobPaused,
   jobsPayload, broadcastJobs, runScan, relinkSessionToJob, allJobs,
-  orphanResumePlan,
+  orphanResumePlan, findJobForBranch,
 } from './jobs.js';
 
+export const RESPAWN_NUDGE = 'Agent 007 restarted and you were re-spawned. Continue your card where you left off.';
+
 // --- Client tracking ---
 const clients = new Set();
 
@@ -400,8 +403,13 @@ export function setupWebSocket(wss, { createSession, killSession, startBillion }
           // by a card, a transcript or the default is a guess, and writing it
           // down would make a wrong one permanent.
           const { command, mode, flags } = orphanResumePlan(orphan);
-          // Matched on the branch, as relinkSessionToJob does below.
-          const card = allJobs().find(j => j.branchName && j.branchName === orphan.branchName && j.repoPath === orphan.repoPath);
+          // The card it worked on: its saved jobId, or (an older record) the
+          // one on its branch in its repo — the same lookup relinkSessionToJob
+          // makes below. With one, it comes back as that card's board worker.
+          const card = findJobForBranch(orphan);
+          const spawnedBy = card ? 'board' : 'user';
+          const autoTrust = autoTrusts({ spawnedBy, worktreePath: orphan.worktreePath, command });
+          if (autoTrust && sessionAgentFromCommand(command) === 'claude') trustClaudeFolder(orphan.worktreePath);
           const result = createSessionFromConfig({
             sessionId: nextSessionId(),
             name: orphan.name,
@@ -420,7 +428,8 @@ export function setupWebSocket(wss, { createSession, killSession, startBillion }
             // recorded flags, it keeps them.
             permissionFlags: mode ? [] : flags,
             origin: orphan.origin === 'board' ? 'board' : 'user',
-            approvalsToBillion: card?.postedByBillion === true,
+            spawnedBy, jobId: card?.id || null, autoTrust,
+            approvalsToBillion: card ? card.postedByBillion === true : orphan.approvalsToBillion === true,
           }, broadcast);
           if (result.error) {
             adoptingOrphans.delete(msg.orphanId);
@@ -439,6 +448,9 @@ export function setupWebSocket(wss, { createSession, killSession, startBillion }
               type: 'notification', level: 'info',
               message: `${session.name} reconnected to job "${relinked.title}"`,
             });
+            // `claude --continue` resumes at the prompt and waits there. Typed
+            // once it rests at the prompt; a card in Review has nothing to do.
+            if (relinked.state === 'in-progress') sendText(session, RESPAWN_NUDGE);
           }
           adoptingOrphans.delete(msg.orphanId);
           orphans.delete(msg.orphanId);

package/server.js

@@ -159,6 +159,8 @@ async function killSession(sessionId, { discardChanges = false } = {}) {
       agent: sessionAgent(session),
       permissionFlags: sessionPermissionFlags(session),
       origin: sessionOrigin(session),
+      jobId: session.jobId || null,
+      approvalsToBillion: !!session.approvalsToBillion,
       reason, createdAt: new Date().toISOString(),
     };
     orphans.set(orphanId, orphan);