@ctrl-spc/cs 0.7.5 → 0.7.7

package/dist/panel3/prompt.js

@@ -550,6 +550,23 @@ export function levelOnePrompt(cardTitle, messages, produced, attachments = [],
  * Every child it starts, and every grandchild THEY start, would be working
  * from nothing but a responsibility sentence somebody else wrote down.
  */
+export const OWNER_COMPLETION_RULES = [
+    'ASSIGNMENT STATUS — THIS OVERRIDES OLDER ENDING INSTRUCTIONS IN YOUR BRIEF.',
+    'A reply or process exit does not finish the assignment. Keep working through all remaining',
+    'required steps and checks. Status questions never cancel work already in progress.',
+    'When you yield to workers, write_report with what remains and exit; you resume with results.',
+    'When no worker is active and work remains, continue it yourself or dispatch it. If you exit',
+    'without declaring completion, the product starts you again to carry on.',
+    'Only when the latest user assignment is fulfilled, call write_report with work_complete=true',
+    'and a report explaining what fulfilled it. Check all required steps and verification first.',
+    'Then give the final answer and exit. Do not declare completion for an interim status answer.',
+    'A failed or skipped required step is unfinished work, even if all workers have returned.',
+    'Resolve it or ask for the real required intervention; never convert it into a completion caveat.',
+    'If a required user action prevents progress, use ask_question and stop. It must name the actual',
+    'approval, credential or manual action needed. Never ask just because no agent is running.',
+    'A handover explicitly requested by the person may finish that request without finishing a',
+    'feature. Say exactly what was handed over and do not claim the unfinished feature is done.',
+].join('\n');
 export function workBrief(level, responsibility, boundary, workItemId, attachments = [], codebase) {
     /* ═══ ONLY WHEN A WORKFLOW IS ACTUALLY ON THE CARD. ═══ An owner is not
        instructed about a process that is not there, which is the rule
@@ -562,6 +579,7 @@ export function workBrief(level, responsibility, boundary, workItemId, attachmen
             ? [
                 'You see one thing a person asked for through to done. Keep the whole picture and stay',
                 'available to the person while the work moves.',
+                OWNER_COMPLETION_RULES,
                 '',
                 /* ═══ THE FIRST THING, EVERY TIME, AND IT IS NOT THE REPLY. ═══ Nothing
                    an owner writes reaches the person until its process exits, and a turn
@@ -836,7 +854,7 @@ export const landingOutcomeContext = (landing) => {
             'They chose neither of the two answers, so nothing was merged and the work is still on '
                 + `${landing.branch ?? 'its branch'}.`,
             'Read what they actually wrote and answer it. If they still want the work put back, offer the',
-            'ending again with `offer_ending` rather than replying: a reply finishes the card, and an',
+            'ending again with `offer_ending` rather than declaring completion: an',
             'offer leaves it with them.',
         ];
     }
@@ -915,6 +933,7 @@ landing = null) {
     });
     return [
         'YOU OWN THIS CTRL+SPC CONVERSATION.',
+        OWNER_COMPLETION_RULES,
         'You are this conversation\'s one owner, started for one serialized activation. Speak directly to the',
         'person as CTRL+SPC. The launcher is finished and cannot answer or receive an escalation.',
         '',

package/dist/panel3/run.js

@@ -133,7 +133,7 @@
 // `import type` loses its v3 header in the published `dist/`.
 import { out, returned, signedInClient } from './client.js';
 import { readableWriteError } from '../firewall.js';
-import { answerPrompt, escalationPrompt, levelOnePrompt, ownerActivationPrompt, readBackPrompt, landingOutcomeContext, presentedArtifactAnswerContext, resumePrompt, retryPrompt, standingRules, whatWasAttached, workingRules, } from './prompt.js';
+import { answerPrompt, escalationPrompt, levelOnePrompt, ownerActivationPrompt, readBackPrompt, landingOutcomeContext, presentedArtifactAnswerContext, resumePrompt, retryPrompt, standingRules, whatWasAttached, workingRules, OWNER_COMPLETION_RULES, } from './prompt.js';
 import { ASK_CONTENT_COLUMNS, attachmentLine, gitRulesFor, loadAttachments, loadOutputNames, outputOf, recordBaseProtection, standingRulesFor, withAskContent, } from './show.js';
 import { forgetSecrets, redactSecrets } from './secrets.js';
 import { sayListening, stopListening } from './presence.js';
@@ -148,6 +148,7 @@ import { listCodebases } from '../codebases.js';
 import { killTree, processIsAlive } from '../win-shell.js';
 import { hostname, uptime } from 'node:os';
 import { execFileSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 const USAGE = 'usage: run [--once]';
@@ -1030,6 +1031,14 @@ export async function picturesOnDisk(client, cardId, where, level) {
         .eq('card_id', cardId).order('created_at'), 'read', `the pictures on card ${cardId}`);
     if (images.length === 0)
         return [];
+    /* ═══ A CWD THAT IS GONE IS A FAILURE, NOT A FOLDER TO MAKE. ═══ `recursive`
+       below would rebuild a removed worktree as a plain directory holding one
+       `ctrl-spc-images/`, which is exactly the folder `worktreeForCard` then
+       refuses on every start (.bugs/.resolved/20260905-card-stuck-not-a-working-copy). */
+    if (!existsSync(where.cwd)) {
+        throw new Error('This card\'s working copy went away while its agent was starting. Send your message '
+            + 'again and it is made afresh.');
+    }
     const folder = join(gitDirOf(where.cwd) ?? where.cwd, 'ctrl-spc-images');
     await mkdir(folder, { recursive: true });
     const lines = [];
@@ -1941,8 +1950,17 @@ export function ownerContinuationPrompt(brief, report, events, children, deliver
     const messages = events.filter((event) => event.kind === 'user' && event.needsReply);
     return [
         'CONTINUE THE CTRL+SPC CONVERSATION YOU ALREADY OWN.',
+        OWNER_COMPLETION_RULES,
         'Use only the new facts below as the new turn. Keep coordinating the whole card and speak as CTRL+SPC.',
         '',
+        ...(messages.length === 0 && delivered === null ? [
+            'WHY YOU WERE STARTED AGAIN',
+            'The assignment is still open. Your previous final reply did not record completion.',
+            'Do not repeat a completion reply by itself. If the assignment is fulfilled, call',
+            'write_report with work_complete=true NOW, then give the final answer. Otherwise do the',
+            'remaining work or resolve the new worker results below. No new user message is needed.',
+            '',
+        ] : []),
         'NEW USER MESSAGES',
         ...(messages.length === 0
             ? ['None.']
@@ -2416,15 +2434,17 @@ export async function reconcileOwnerSessions(client, machineId, _machineHarness,
 async function killStopped(client, machineId) {
     const stopped = await returned(client
         .from('panel3_runs')
-        .select('id, card_id, pid, started_at, resumed_at')
+        .select('id, card_id, pid, state, started_at, resumed_at')
         .eq('machine_id', machineId)
-        .in('state', ENDED_BY_THE_PERSON)
+        .in('state', [...ENDED_BY_THE_PERSON, 'finished', 'failed'])
         .not('pid', 'is', null), 'read', 'the runs on this machine that are not coming back');
     if (stopped.length === 0)
         return;
     const booted = bootedAt();
     for (const run of stopped) {
         if (runProcessIsAlive(run, booted)) {
+            if (!ENDED_BY_THE_PERSON.includes(run.state))
+                continue;
             try {
                 process.kill(run.pid);
                 out(`stopped  run ${run.id}  card ${run.card_id}  killed pid ${run.pid}`);
@@ -2446,11 +2466,11 @@ async function killStopped(client, machineId) {
             await returned(client
                 .from('panel3_runs')
                 .update({ pid: null })
-                // STILL NOT COMING BACK. Nothing starts either of these states, so
-                // this cannot lose a race, and saying so in the statement is what
-                // keeps that true if something one day does.
+                // A finished owner may activate again between this read and write.
+                // Only acknowledge the exact process whose exit was observed.
                 .eq('id', run.id)
-                .in('state', ENDED_BY_THE_PERSON)
+                .eq('pid', run.pid)
+                .in('state', [...ENDED_BY_THE_PERSON, 'finished', 'failed'])
                 .select('id'), 'clear the process id of', `run ${run.id}`);
         }
         catch (error) {
@@ -2553,7 +2573,9 @@ async function recoverStranded(client, tools, machineId, mine, hold) {
                     await writeAnswer(client, run.id, run.card_id, null, run.process_token ?? undefined);
                 }
                 else {
-                    const resumed = await activateOwner(client, tools, machineId, run.id, run.process_token, run.pid);
+                    // This process belonged to a previous daemon. Use the fenced recovery
+                    // claim, not a failed-attempt retry whose budget may already be spent.
+                    const resumed = await activateOwner(client, tools, machineId, run.id, run.process_token, null);
                     if (resumed)
                         hold(run.id, resumed.settled);
                 }
@@ -2847,6 +2869,8 @@ export async function takeHandedBack(client, tools, machineId, mine, hold) {
  * normalised into a constant getter below, so there is one shape inside `run`
  * and no branch anywhere near the poll.
  */
+/** The card states in which nobody will start again on the card's copy. */
+const CARD_IS_OVER = ['done', 'failed', 'stopped'];
 /**
  * ═══ THE CARD IS OVER, SO ITS COPY GOES — AND THE BRANCH STAYS. ═══
  *
@@ -2865,7 +2889,7 @@ export async function takeHandedBack(client, tools, machineId, mine, hold) {
  * A folder no row explains is LEFT ALONE. Nothing here deletes something it
  * cannot account for.
  */
-async function sweepFinishedWorktrees(client) {
+export async function sweepFinishedWorktrees(client) {
     const held = worktreesOnThisMachine();
     if (held.length === 0)
         return;
@@ -2889,14 +2913,27 @@ async function sweepFinishedWorktrees(client) {
     const cards = [...new Set([...cardOfFolder.values()].flat())];
     if (cards.length === 0)
         return;
+    /* ═══ THE CARD IS ASKED, NOT ONLY ITS RUNS. ═══ A conversational owner is
+       parked between wakes with `ended_at` set, so the second its last worker
+       finishes, no run on the card is open, while the card itself still reads
+       `working`. Reading the runs alone called that card finished and took the
+       copy out from under the owner as it was starting
+       (.bugs/.resolved/20260905-card-stuck-not-a-working-copy). The card's own
+       state is the record's word for whether it is over; the runs still guard a
+       card that is over on paper while a process of it is going. */
+    const over = new Set((await returned(client.from('panel3_cards')
+        .select('id, state')
+        .in('id', cards), 'read', 'which of those cards are over')).filter((row) => CARD_IS_OVER.includes(row.state)).map((row) => row.id));
     const live = new Set((await returned(client.from('panel3_runs')
         .select('card_id')
         .in('card_id', cards)
-        .is('ended_at', null), 'read', 'which of those cards still have an agent going')).map((row) => row.card_id));
+        .or('ended_at.is.null,pid.not.is.null'), 'read', 'which of those cards still have an agent going')).map((row) => row.card_id));
     const touched = new Set();
     for (const one of held) {
         const cardIds = cardOfFolder.get(one.folder) ?? [];
-        if (cardIds.length === 0 || cardIds.some((cardId) => live.has(cardId)))
+        if (cardIds.length === 0)
+            continue;
+        if (!cardIds.every((cardId) => over.has(cardId) && !live.has(cardId)))
             continue;
         try {
             settleCardWorktree(one.folder);

package/dist/panel3/tools.js

@@ -2481,11 +2481,21 @@ const TOOLS = [
         description: 'Write down what is true NOW: what you have done, what you decided and why, and what is still '
             + 'open. It REPLACES your last report rather than adding to it, and it is what you are handed if '
             + 'you are respawned, so write it as the thing you would want to read to carry on. Write it as '
-            + 'you go, not only at the end. '
+            + 'you go, not only at the end. The conversation owner MUST set work_complete=true only when '
+            + 'the latest user assignment is fulfilled, including its required steps and checks. A status '
+            + 'reply is not completion. This records intent; Done waits for all agents to exit. '
             + FIREWALL_WRITING_RULE,
-        input: { report: z.string().min(1) },
-        handler: async ({ client, runId, processToken }, args) => {
-            const { report } = args;
+        input: { report: z.string().min(1), work_complete: z.boolean().optional() },
+        handler: async ({ client, runId, processToken, isOwner }, args) => {
+            const { report, work_complete } = args;
+            if (work_complete) {
+                if (!isOwner || processToken === undefined)
+                    throw new Error('Only the conversation owner can declare the assignment complete.');
+                await whileRunning(client.rpc('panel3_request_completion', {
+                    p_run_id: runId, p_process_token: processToken, p_summary: report,
+                }), runId, 'declare completion of');
+                return 'Completion recorded. Give your final answer and exit. Done waits until all processes have exited.';
+            }
             await whileRunning(processToken === undefined
                 ? client.from('panel3_runs').update({ report }).eq('id', runId)
                     .in('state', STILL_WRITING).is('ended_at', null).select('id')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ctrl-spc/cs",
-  "version": "0.7.5",
-  "description": "CTRL+SPC — minimal, reliable per-machine agent presence. Sign-in, auto-start, agent detection, heartbeat presence, and ping acknowledgement.",
+  "version": "0.7.7",
+  "description": "CTRL+SPC \u2014 minimal, reliable per-machine agent presence. Sign-in, auto-start, agent detection, heartbeat presence, and ping acknowledgement.",
   "engines": {
     "node": ">=22"
   },