borgmcp 2.6.0 → 2.7.0

package/src/opencode-drone.ts

@@ -67,7 +67,6 @@ export type OpenCodeDeliveryState =
 interface OpenCodeDelivery {
   entryId: string;
   text: string;
-  messageId: string;
   allowSubmit: boolean;
   state: Exclude<OpenCodeDeliveryState, 'failed'>;
   resolve: (delivered: boolean) => void;
@@ -212,22 +211,16 @@ async function listSessionMessages(id: string): Promise<OCMessage[]> {
   return JSON.parse(body);
 }
 
-async function getSessionMessage(
-  sessionId: string,
-  messageId: string,
-): Promise<'found' | 'missing'> {
-  const { status, body } = await rawGet(
-    `/session/${sessionId}/message/${encodeURIComponent(messageId)}`,
-  );
-  if (status === 404) return 'missing';
-  if (status !== 200) {
-    throw new Error(`OpenCode message request failed (${status})`);
-  }
-  const message = JSON.parse(body) as OCMessage;
-  if (message.info?.id !== messageId || message.info.role !== 'user') {
-    throw new Error('OpenCode returned the wrong injected message');
+async function findInjectedMessage(sessionId: string, text: string): Promise<string | null> {
+  const messages = await listSessionMessages(sessionId);
+  for (let index = messages.length - 1; index >= 0; index--) {
+    const message = messages[index];
+    if (message?.info?.role !== 'user' || typeof message.info.id !== 'string') continue;
+    if (message.parts?.some((part) => part.type === 'text' && part.text === text)) {
+      return message.info.id;
+    }
   }
-  return 'found';
+  return null;
 }
 
 async function promptSession(id: string, bodyObj: Record<string, unknown>): Promise<number> {
@@ -443,11 +436,6 @@ async function resolveInjectionSession(): Promise<OCSession | null> {
   return bound;
 }
 
-function openCodeMessageId(entryId: string): string {
-  const digest = createHash('sha256').update(entryId).digest('hex');
-  return `msg_borg_${digest}`;
-}
-
 function rememberBounded(
   entries: Map<string, string>,
   entryId: string,
@@ -476,8 +464,10 @@ async function deliverOpenCodeEntry(
   let target: OCSession | null = null;
 
   // Before the one allowed POST, retries are safe: no submission has happened.
-  // A replayed inbox entry sets allowSubmit=false, so it can only confirm an
-  // earlier submission and can never manufacture a second prompt.
+  // OpenCode must generate the message ID: its run loop treats IDs as
+  // lexicographically ordered, so arbitrary caller IDs can persist without
+  // ever becoming the active user turn. The unique inbox text correlates the
+  // generated message across confirmation and process-replay instead.
   for (let attempt = 0; attempt < OPEN_CODE_DELIVERY_RETRY_DELAYS_MS.length; attempt++) {
     if (state !== owner || !owner.connected) return 'failed';
     if (attempt > 0) {
@@ -498,7 +488,7 @@ async function deliverOpenCodeEntry(
     }
 
     try {
-      if (await getSessionMessage(target.id, delivery.messageId) === 'found') {
+      if (await findInjectedMessage(target.id, delivery.text)) {
         return 'delivered';
       }
     } catch (err) {
@@ -510,14 +500,12 @@ async function deliverOpenCodeEntry(
       continue;
     }
 
-    // OpenCode does not deduplicate repeated prompt_async calls by messageID:
-    // they append duplicate parts. Submit at most once, then only poll the
-    // exact message. A transport failure is ambiguous and follows the same
+    // prompt_async is not idempotent. Submit at most once, then only poll for
+    // the exact text. A transport failure is ambiguous and follows the same
     // confirmation-only path.
     let status: number | null = null;
     try {
       status = await promptSession(target.id, {
-        messageID: delivery.messageId,
         parts: [{ type: 'text', text: delivery.text }],
       });
     } catch (err) {
@@ -543,7 +531,7 @@ async function deliverOpenCodeEntry(
         delivery.state = 'delivered-unconfirmed';
       }
       try {
-        if (await getSessionMessage(target.id, delivery.messageId) === 'found') {
+        if (await findInjectedMessage(target.id, delivery.text)) {
           return 'delivered';
         }
       } catch (err) {
@@ -583,7 +571,7 @@ async function processOpenCodeDeliveries(owner: OpenCodeDroneState): Promise<voi
       } else if (outcome === 'delivered-unconfirmed') {
         owner.failedEntries.delete(delivery.entryId);
         rememberBounded(owner.unconfirmedEntries, delivery.entryId, delivery.text);
-        delivery.resolve(true);
+        delivery.resolve(false);
       } else {
         owner.unconfirmedEntries.delete(delivery.entryId);
         rememberBounded(owner.failedEntries, delivery.entryId, delivery.text);
@@ -642,8 +630,9 @@ export async function injectInitialKickoff(launch: OpenCodeLaunchKickoff): Promi
 
 /**
  * Queue one durable inbox entry for delivery into the bound OpenCode session.
- * The SSE entry ID becomes a stable OpenCode message ID, so retries and replay
- * can confirm an earlier ambiguous submission without running it twice.
+ * The durable inbox text identifies the OpenCode-generated user message, so
+ * retries and replay can confirm an earlier ambiguous submission without
+ * supplying an ordering-breaking caller message ID or running it twice.
  */
 export function injectOpenCodeEntry(
   text: string,
@@ -670,7 +659,7 @@ export function injectOpenCodeEntry(
       rememberBounded(owner.failedEntries, entryId, text);
       return Promise.resolve(false);
     }
-    return Promise.resolve(true);
+    return Promise.resolve(false);
   }
 
   const active = owner.activeDeliveries.get(entryId);
@@ -690,7 +679,6 @@ export function injectOpenCodeEntry(
   const delivery: OpenCodeDelivery = {
     entryId,
     text,
-    messageId: openCodeMessageId(entryId),
     allowSubmit,
     state: 'queued',
     resolve: resolveDelivery,

package/src/opencode-wake-copy.ts

@@ -1,7 +1,7 @@
 export const OPENCODE_WAKE_PATH_GUIDANCE =
   'OpenCode wakes through HTTP entry injection into its session through the local HTTP API. ' +
   'Borg writes each entry to the durable inbox before one injection attempt and ' +
-  'confirms delivery by exact message ID; no inbox Monitor or secondary wake loop is used. ' +
+  'confirms delivery by the unique persisted entry text; no inbox Monitor or secondary wake loop is used. ' +
   'If injection is rejected or cannot be ' +
   'confirmed, the durable entry remains available and `borg_stream-status` reports ' +
   'it as failed or delivered-unconfirmed; run `borg_read-log unread_only=true` and ' +

package/src/regen-format.ts

@@ -27,9 +27,8 @@ import { OPENCODE_WAKE_PATH_GUIDANCE } from './opencode-wake-copy.js';
  * one of `startup` / `resume` / `clear` / `compact`. The `borg-regen`
  * SessionStart hook uses this to detect a `/clear` re-orientation, which is
  * the FIRST time the hook is the SOLE orientation path (the launch kickoff
- * prompt is gone) AND the moment Claude Code clears the session-scoped
- * `/loop` + `ScheduleWakeup` — so the re-injected orientation must instruct
- * an operational re-arm.
+ * prompt is gone), so the re-injected orientation must instruct an operational
+ * Monitor re-arm.
  *
  * Best-effort + total: empty input (manual / TTY run with no stdin),
  * malformed JSON, a missing `source`, or a non-string `source` all return
@@ -60,9 +59,8 @@ export type AgentKind = 'claude' | 'codex' | 'opencode';
  *
  * Agent-branched on the existing env-agnostic signal (BORG_SESSION-style
  * `isCodexRemoteWakeEnabled`), NOT on a mutable server-recorded field:
- * - claude: arm the inbox-file tail Monitor + engage `/loop` + maintain one
- *   adaptive `ScheduleWakeup` recovery deadline (long while the Monitor is
- *   healthy or indeterminate; short only while explicitly broken).
+ * - claude: arm the inbox-file tail Monitor, drain unread entries on every
+ *   wake, and re-arm the Monitor after an exit or whenever none is armed.
  * - codex: Borg's activity stream reaches the app-server remote-control inbox
  *   channel; each wake is followed by an unread-log drain. Manual full regen
  *   + drain is a degraded fallback when remote control is unavailable.
@@ -98,9 +96,8 @@ export function wakePathArming(
   return [
     'Arm your wake path before working:',
     `1. **Inbox Monitor** (wake path) — run a persistent Monitor on \`${monitorCommand}\` so cube posts wake you in real time.`,
-    '2. **Engage `/loop`** (self-paced) so you keep waking to triage the cube.',
-    '3. **Adaptive recovery** — set ONE `ScheduleWakeup`: [9000, 12600]s (3h ±30m) when Monitor healthy/indeterminate; [720, 1080]s (15m ±3m) when broken. Re-arm Monitor; retry short until healthy. A real Monitor wake resets, not stacks.',
-    '4. **Recovery tick** — drain `borg_read-log unread_only=true`. If empty, check wake status, set deadline, resume prior work. No full-regen or liveness post on empty; safety probes may still wake.',
+    '2. **On every wake** — drain `borg_read-log unread_only=true`. If empty, resume prior work without a full regen or liveness post; safety probes may still wake.',
+    '3. **Monitor recovery** — re-arm the Monitor when its exit notification wakes you, and whenever you notice no Monitor is armed.',
   ].join('\n');
 }
 
@@ -165,8 +162,8 @@ export function formatLeanOrientation(args: {
         ? '\n_(`/clear` cleared your conversation; Codex remote-control wake remains active. Follow the required Codex wake path below.)_\n'
         : agentKind === 'claude'
           ? [
-              '\n_(`/clear` cleared Claude\'s `/loop` and recovery deadline — re-arm them now.)_',
-              '_Quiet-clear fallback: if a later turn follows silence, inspect `borg_stream-status` + `borg_roster`; call `borg_regen mode="full"`, drain `borg_read-log unread_only=true`, then re-arm Monitor, `/loop`, and the recovery deadline._\n',
+              '\n_(`/clear` cleared Claude\'s conversation — re-arm the inbox Monitor now.)_',
+              '_Quiet-clear fallback: if a later turn follows silence, inspect `borg_stream-status` + `borg_roster`; call `borg_regen mode="full"`, drain `borg_read-log unread_only=true`, then re-arm the Monitor._\n',
             ].join('\n')
           : ''
       : '';

package/src/repository-cube-init.ts

@@ -158,7 +158,7 @@ function renderResult(
       `Next: borg assimilate --host ${shellEscape(input.serverOrigin)}`,
     );
   } else {
-    lines.push('Continuing with role and seat setup...');
+    lines.push('Continuing with role and seat setup…');
   }
   resultWriter(`${lines.join('\n')}\n`);
 }
@@ -176,6 +176,7 @@ export async function initializeRepositoryCube(input: {
     input.flags.template !== undefined || input.flags.noTemplate === true || input.flags.yes === true;
   const creationOptionsUnused = association !== null && creationOptionsRequested;
   if (association) {
+    deps.write(`Checking for this repository's cube on ${input.serverOrigin}…\n`);
     const cube = await deps.getCube(association.cubeId);
     const response: CreateCubeResponse = {
       result: 'resolved',
@@ -241,6 +242,7 @@ export async function initializeRepositoryCube(input: {
     return { kind: 'success', creation: { response, cube }, existing: true };
   };
 
+  deps.write(`Checking for this repository's cube on ${input.serverOrigin}…\n`);
   const serverAssociation = await deps.resolveAssociation(repository, input.context.derivedName);
   if (serverAssociation.result === 'resolved') {
     return saveResolvedAssociation(serverAssociation, {
@@ -263,9 +265,14 @@ export async function initializeRepositoryCube(input: {
       return { kind: 'stop', code: 1 };
     }
     if (!deps.isTTY() || input.flags.yes) {
+      const retryCommand = input.mode === 'cube-init'
+        ? `borg server cube init --host ${shellEscape(input.serverOrigin)}`
+        : `borg assimilate --host ${shellEscape(input.serverOrigin)}`;
       deps.write(
-        'Adopting an existing cube requires interactive confirmation; --yes is not accepted here.\n' +
-        'Rerun without --yes in an interactive terminal. No cube, repository binding, or drone was created.\n',
+        `Found existing cube '${matches[0].name}' on ${input.serverOrigin}.\n` +
+        'Linking a repository to an existing cube requires one interactive confirmation.\n' +
+        `Run ${retryCommand} --cube-name ${shellEscape(matches[0].name)} once in an interactive terminal to link it; scripted runs work from then on.\n` +
+        'No cube, repository binding, or drone was created.\n',
       );
       return { kind: 'stop', code: 1 };
     }
@@ -276,16 +283,17 @@ export async function initializeRepositoryCube(input: {
       `  server:     ${input.serverOrigin}\n`,
     );
     while (true) {
-      const answer = await ask(deps, 'Link this repository to that cube? [y/N]: ', 'adoption');
+      const answer = await ask(deps, 'Link this repository to that cube? [Y/n]: ', 'adoption');
       if ('stop' in answer) return { kind: 'stop', code: answer.stop };
       const confirmation = answer.value.trim().toLowerCase();
-      if (confirmation === 'y' || confirmation === 'yes') break;
-      if (confirmation === '' || confirmation === 'n' || confirmation === 'no') {
+      if (confirmation === '' || confirmation === 'y' || confirmation === 'yes') break;
+      if (confirmation === 'n' || confirmation === 'no') {
         deps.write('No cube, repository binding, or drone was created.\n');
         return { kind: 'stop', code: 0 };
       }
       deps.write('Enter y or n.\n');
     }
+    deps.write(`Linking this repository to cube '${matches[0].name}'…\n`);
     const associated = await deps.associateCube({
       cubeId: matches[0].id,
       workingRepoName: input.context.derivedName,
@@ -299,7 +307,11 @@ export async function initializeRepositoryCube(input: {
       if (confirmed.result !== 'resolved' || confirmed.cube_id !== associated.cube_id) {
         throw new RepositoryAssociationConfirmationError();
       }
-      return await saveResolvedAssociation(confirmed, { adopted: true, creationOptionsUnused: creationOptionsRequested });
+      return await saveResolvedAssociation(confirmed, {
+        adopted: true,
+        creationOptionsUnused: input.flags.template !== undefined ||
+          input.flags.noTemplate === true,
+      });
     } catch (error) {
       if (error instanceof RepositoryAssociationSaveError) throw error;
       throw new RepositoryAssociationConfirmationError();
@@ -380,16 +392,12 @@ export async function initializeRepositoryCube(input: {
   template ??= 'software-dev';
 
   if (deps.isTTY() && !input.flags.yes) {
-    deps.write(
-      `Create this cube?\n` +
-      `  Name: ${name}\n` +
-      `  Template: ${presentation(template).label}\n` +
-      `  Repository: ${input.context.root}\n` +
-      `  Server: ${input.serverOrigin}\n`,
-    );
     let confirmed = false;
     while (!confirmed) {
-      const answer = await ask(deps, 'Create cube? [Y/n]: ');
+      const answer = await ask(
+        deps,
+        `Create cube '${name}' (${presentation(template).label}) on ${input.serverOrigin}? [Y/n]: `,
+      );
       if ('stop' in answer) return { kind: 'stop', code: answer.stop };
       const confirmation = answer.value.trim().toLowerCase();
       if (confirmation === '' || confirmation === 'y' || confirmation === 'yes') {
@@ -404,7 +412,7 @@ export async function initializeRepositoryCube(input: {
     }
   }
 
-  deps.write('Creating cube...\n');
+  deps.write(`Creating cube '${name}'…\n`);
   const workingRepoName = input.context.derivedName;
   let creation: RepositoryCubeCreation;
   try {

package/src/stream-status.ts

@@ -385,7 +385,7 @@ export function formatWakePathPrefix(inputs: {
   return [
     `## ⚠ Wake path broken — arm Monitor NOW`,
     ``,
-    `No process is tailing this drone's inbox file. SSE delivery is healthy (entries reach disk), but Claude Code has no event source to wake on. Until you arm a Monitor, this session only wakes on the /loop fallback heartbeat and will miss live coordination from other drones:`,
+    `No process is tailing this drone's inbox file. SSE delivery is healthy (entries reach disk), but Claude Code has no event source to wake on. Until you arm a Monitor, this session has no wake path and will miss live coordination from other drones:`,
     ``,
     `> Monitor command: \`${monitorCommand(inboxPath, monitorStateRoot)}\` — persistent, 1h timeout, description "borg inbox for ${droneLabel} on cube ${cubeName}".`,
     ``,

package/src/tool-manifest.ts

@@ -172,7 +172,7 @@ export const TOOL_MANIFEST: ToolManifestEntry[] = [
         {
           name: 'borg_roster',
           description:
-            "List all currently connected drones in your cube, with each drone's label, role, and last-seen time. Optional `since` argument adds a sender-side liveness column — pass either an activity_log entry id (e.g., from a dispatch you posted) or an ISO-8601 timestamp; each drone is marked `awake` if they've posted a log entry after that point, otherwise `stale-since-X`. Useful for confirming a dispatch reached its named recipients (catches the silent-wake-path-failure class where SSE delivered but the drone's /loop never woke).",
+            "List all currently connected drones in your cube, with each drone's label, role, and last-seen time. Optional `since` argument adds a sender-side liveness column — pass either an activity_log entry id (e.g., from a dispatch you posted) or an ISO-8601 timestamp; each drone is marked `awake` if they've posted a log entry after that point, otherwise `stale-since-X`. Useful for confirming a dispatch reached its named recipients (catches the silent-wake-path-failure class where SSE delivered but the drone's inbox Monitor never woke it).",
           inputSchema: {
             type: 'object',
             properties: {
@@ -188,7 +188,7 @@ export const TOOL_MANIFEST: ToolManifestEntry[] = [
         {
           name: 'borg_stream-status',
           description:
-            "Diagnostic probe of the local SSE log-stream consumer: returns `connected`, `lastContentEventAt`, `lastWireActivityAt`, `lastHeartbeatAt`, `lastPersistedEventId`, `reconnectAttempts`, plus a wake-path check that flags if SSE is attached but no inbox-Monitor is watching the file (the silent failure where `/loop` never wakes on incoming entries). Read-only in-process state; does NOT re-open the stream. Use when troubleshooting wake-ups or verifying the stream is alive.",
+            "Diagnostic probe of the local SSE log-stream consumer: returns `connected`, `lastContentEventAt`, `lastWireActivityAt`, `lastHeartbeatAt`, `lastPersistedEventId`, `reconnectAttempts`, plus a wake-path check that flags if SSE is attached but no inbox Monitor is watching the file (the silent failure where incoming entries reach disk but do not wake the drone). Read-only in-process state; does NOT re-open the stream. Use when troubleshooting wake-ups or verifying the stream is alive.",
           inputSchema: {
             type: 'object',
             properties: {},