borgmcp 3.0.0 → 3.0.2

package/src/cubes.ts

@@ -84,6 +84,13 @@ interface LaunchFile {
   projects: Record<string, { cli: BorgCli }>;
 }
 
+const UNREADABLE_STATE = Symbol('unreadable-state-file');
+type StateFileRead<T> = T | null | typeof UNREADABLE_STATE;
+
+function unreadableStateError(filePath: string): Error {
+  return new Error(`Borg state file is unreadable; refusing to overwrite it: ${filePath}`);
+}
+
 export interface CodexWakeTargetRecord {
   threadId: string;
   socketPath: string;
@@ -225,7 +232,7 @@ function isLaunchFile(data: any): data is LaunchFile {
   );
 }
 
-async function readLaunchFile(): Promise<LaunchFile | null> {
+async function readLaunchFile(): Promise<StateFileRead<LaunchFile>> {
   let raw: string;
   try {
     raw = await readFile(LAUNCH_FILE, 'utf8');
@@ -235,9 +242,9 @@ async function readLaunchFile(): Promise<LaunchFile | null> {
   }
   try {
     const parsed = JSON.parse(raw);
-    return isLaunchFile(parsed) ? parsed : null;
+    return isLaunchFile(parsed) ? parsed : UNREADABLE_STATE;
   } catch {
-    return null;
+    return UNREADABLE_STATE;
   }
 }
 
@@ -263,7 +270,7 @@ function isCodexWakeTargetsFile(data: any): data is CodexWakeTargetsFile {
   );
 }
 
-async function readCodexWakeTargetsFile(): Promise<CodexWakeTargetsFile | null> {
+async function readCodexWakeTargetsFile(): Promise<StateFileRead<CodexWakeTargetsFile>> {
   let raw: string;
   try {
     raw = await readFile(CODEX_WAKE_TARGETS_FILE, 'utf8');
@@ -273,9 +280,9 @@ async function readCodexWakeTargetsFile(): Promise<CodexWakeTargetsFile | null>
   }
   try {
     const parsed = JSON.parse(raw);
-    return isCodexWakeTargetsFile(parsed) ? parsed : null;
+    return isCodexWakeTargetsFile(parsed) ? parsed : UNREADABLE_STATE;
   } catch {
-    return null;
+    return UNREADABLE_STATE;
   }
 }
 
@@ -574,6 +581,7 @@ export async function refreshActiveCubeMetadata(active: ActiveCubeInput): Promis
 
 export async function getProjectCliPreference(): Promise<BorgCli | null> {
   const data = await readLaunchFile();
+  if (data === UNREADABLE_STATE) throw unreadableStateError(LAUNCH_FILE);
   if (!data) return null;
   const entry = data.projects[findProjectRoot()];
   return entry?.cli === 'claude' || entry?.cli === 'codex' || entry?.cli === 'opencode' ? entry.cli : null;
@@ -586,6 +594,7 @@ export async function getProjectCliPreference(): Promise<BorgCli | null> {
  */
 export async function getProjectCliPreferenceForPath(dir: string): Promise<BorgCli | null> {
   const data = await readLaunchFile();
+  if (data === UNREADABLE_STATE) throw unreadableStateError(LAUNCH_FILE);
   if (!data) return null;
   const entry = data.projects[findProjectRoot(dir)];
   return entry?.cli === 'claude' || entry?.cli === 'codex' || entry?.cli === 'opencode' ? entry.cli : null;
@@ -617,9 +626,11 @@ export async function readAllProjectIdentities(): Promise<
  * sibling worktree but the process still began in the invoking checkout.
  */
 export async function setProjectCliPreference(cli: BorgCli, dir?: string): Promise<void> {
-  const existing = (await readLaunchFile()) ?? { projects: {} };
-  existing.projects[findProjectRoot(dir)] = { cli };
-  await writeLaunchFile(existing);
+  const existing = await readLaunchFile();
+  if (existing === UNREADABLE_STATE) throw unreadableStateError(LAUNCH_FILE);
+  const next = existing ?? { projects: {} };
+  next.projects[findProjectRoot(dir)] = { cli };
+  await writeLaunchFile(next);
 }
 
 export async function setCodexWakeTarget(
@@ -627,12 +638,14 @@ export async function setCodexWakeTarget(
   droneId: string,
   target: Omit<CodexWakeTargetRecord, 'updatedAt'>
 ): Promise<void> {
-  const existing = (await readCodexWakeTargetsFile()) ?? { targets: {} };
-  existing.targets[codexWakeTargetKey(cubeId, droneId)] = {
+  const existing = await readCodexWakeTargetsFile();
+  if (existing === UNREADABLE_STATE) throw unreadableStateError(CODEX_WAKE_TARGETS_FILE);
+  const next = existing ?? { targets: {} };
+  next.targets[codexWakeTargetKey(cubeId, droneId)] = {
     ...target,
     updatedAt: new Date().toISOString(),
   };
-  await writeCodexWakeTargetsFile(existing);
+  await writeCodexWakeTargetsFile(next);
 }
 
 export async function getCodexWakeTarget(
@@ -640,6 +653,7 @@ export async function getCodexWakeTarget(
   droneId: string
 ): Promise<CodexWakeTargetRecord | null> {
   const existing = await readCodexWakeTargetsFile();
+  if (existing === UNREADABLE_STATE) throw unreadableStateError(CODEX_WAKE_TARGETS_FILE);
   if (!existing) return null;
   const target = existing.targets[codexWakeTargetKey(cubeId, droneId)];
   if (!target || typeof target.threadId !== 'string' || typeof target.socketPath !== 'string') {
@@ -661,6 +675,7 @@ export async function pruneDeadCodexWakeTargets(
   socketLiveness: (socketPath: string) => boolean | null
 ): Promise<void> {
   const existing = await readCodexWakeTargetsFile();
+  if (existing === UNREADABLE_STATE) throw unreadableStateError(CODEX_WAKE_TARGETS_FILE);
   if (!existing) return;
   const { targets, changed } = pruneDeadWakeTargets(existing.targets, socketLiveness);
   if (changed) await writeCodexWakeTargetsFile({ ...existing, targets });

package/src/first-run-server.ts

@@ -177,8 +177,11 @@ export async function offerFirstRunServerInstall(
       : decision === 'eof'
         ? 'Installation was cancelled because confirmation input ended.'
         : 'Installation was declined.';
+    const setupRecovery = options.initializeServer
+      ? ', and no agent configuration was written. Run `borg setup` again to configure your agents.'
+      : '.';
     deps.stderr(
-      `${reason} No server package or server state was changed.\n` +
+      `${reason} No server package or server state was changed${setupRecovery}\n` +
       `To install it later, run \`${command}\`. Then run \`borg server setup\` and \`borg server start\`.\n`,
     );
     return { kind: 'declined' };

package/src/lifecycle-log-guard.ts

@@ -28,6 +28,15 @@ interface LifecycleStateFile {
   entries: Record<string, LifecycleStateEntry>;
 }
 
+const UNREADABLE_STATE = Symbol('unreadable-lifecycle-state');
+type LifecycleStateRead = LifecycleStateFile | typeof UNREADABLE_STATE;
+
+function unreadableStateError(): Error {
+  return new Error(
+    `Lifecycle log state is unreadable; refusing to overwrite it: ${STATE_FILE}`,
+  );
+}
+
 export function lifecycleSignalForMessage(message: string): LifecycleSignal | null {
   if (message.startsWith('ARRIVAL: ')) return 'arrival';
   if (
@@ -44,7 +53,7 @@ function stateKey(subject: LifecycleLogSubject): string {
   return `${subject.cubeId}:${subject.droneId}`;
 }
 
-async function readState(): Promise<LifecycleStateFile> {
+async function readState(): Promise<LifecycleStateRead> {
   try {
     const raw = await readFile(STATE_FILE, 'utf8');
     const parsed = JSON.parse(raw);
@@ -58,9 +67,10 @@ async function readState(): Promise<LifecycleStateFile> {
       return parsed as LifecycleStateFile;
     }
   } catch (err: any) {
-    if (err?.code !== 'ENOENT') throw err;
+    if (err?.code === 'ENOENT') return { entries: {} };
+    return UNREADABLE_STATE;
   }
-  return { entries: {} };
+  return UNREADABLE_STATE;
 }
 
 async function writeState(state: LifecycleStateFile): Promise<void> {
@@ -100,6 +110,7 @@ export async function shouldSuppressLifecycleLog(
   message: string
 ): Promise<{ suppress: boolean; signal: LifecycleSignal | null }> {
   const state = await readState();
+  if (state === UNREADABLE_STATE) throw unreadableStateError();
   return shouldSuppressLifecycleLogFromState(
     message,
     state.entries[stateKey(subject)]
@@ -138,6 +149,7 @@ export async function recordLifecycleLog(
   message: string
 ): Promise<void> {
   const state = await readState();
+  if (state === UNREADABLE_STATE) throw unreadableStateError();
   const key = stateKey(subject);
   state.entries[key] = nextLifecycleStateAfterLog(message, state.entries[key]);
   await writeState(state);

package/src/remote-client.ts

@@ -95,16 +95,22 @@ export const LOCAL_SERVER_REQUEST_TIMEOUT_MS = 5_000;
 const LOCAL_SERVER_RESPONSE_LIMIT_MESSAGE =
   'Local Borg server response exceeded the response limit';
 
+export const SERVER_ADVISORY_MAX_CHARS = 512;
+// Keep enough source headroom to remove control sequences that cross the
+// visible 512-character boundary without letting regex work scale with the
+// 32 MiB response-body limit.
+const SERVER_MESSAGE_SANITIZE_MAX_CHARS = SERVER_ADVISORY_MAX_CHARS * 8;
+
 function sanitizeServerMessage(message: string): string {
-  return message
-    .replace(/\u001b\][^\u0007]*(?:\u0007|\u001b\\)/g, '')
-    .replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, '')
+  const bounded = message.slice(0, SERVER_MESSAGE_SANITIZE_MAX_CHARS);
+
+  return bounded
+    .replace(/\u001b\][^\u0007]*(?:\u0007|\u001b\\|$)/g, '')
+    .replace(/\u001b\[[0-?]*[ -/]*(?:[@-~]|$)/g, '')
     .replace(/[\u0000-\u001f\u007f-\u009f]/g, '')
     .replace(/\\u(?:000[0-9a-f]|001[0-9a-f]|007f|008[0-9a-f]|009[0-9a-f])/gi, '');
 }
 
-export const SERVER_ADVISORY_MAX_CHARS = 512;
-
 export function sanitizeServerAdvisory(value: unknown): string | undefined {
   if (typeof value !== 'string') return undefined;
   const sanitized = sanitizeServerMessage(value).trim();