Batch of real bug fixes from a read-only parallel bug hunt

packages/dmoss-agent/src/cli/approval-detail.ts

@@ -87,11 +87,10 @@ function editFileDetail(input: Record<string, unknown>): string[] | null {
   const oldString = typeof input.old_string === 'string' ? input.old_string : undefined;
   const newString = typeof input.new_string === 'string' ? input.new_string : undefined;
   if (oldString === undefined || newString === undefined) return null;
-  const lines = [
-    ...oldString.split('\n').map((line) => `- ${line}`),
-    ...newString.split('\n').map((line) => `+ ${line}`),
-  ];
-  return lines.length ? lines : null;
+  const diff = diffLinesForApproval(oldString, newString);
+  if (!diff) return null;
+  if (diff.every((line) => line.startsWith('  …'))) return null;
+  return diff;
 }
 
 function writeFileDetail(input: Record<string, unknown>, ctx: ApprovalDetailContext): string[] | null {

packages/dmoss-agent/src/cli/approval.ts

@@ -179,7 +179,10 @@ function isReadonlyTail(tokens: readonly string[]): boolean {
 
 function isReadonlySed(tokens: readonly string[]): boolean {
   if (tokens.some((token) => token === '-i' || token.startsWith('-i') || token === '--in-place' || token.startsWith('--in-place='))) return false;
-  return tokens.some((token) => token === '-n' || token === '--quiet' || token === '--silent' || (/^-[A-Za-z]*n[A-Za-z]*$/.test(token)));
+  // Default sed behavior (no -i flag) is readonly: it prints to stdout without
+  // modifying the file. The -n flag is just a convenience for quiet mode, but
+  // sed without -n is still readonly.
+  return true;
 }
 
 function isReadonlyFind(tokens: readonly string[]): boolean {

packages/dmoss-agent/src/cli/args.ts

@@ -99,10 +99,16 @@ function applyConfigOverride(target: CliConfigOverrides, pair: string): void {
     return;
   }
   if (key === 'trustedTools') {
+    if (value.trim() === '') {
+      throw new Error(`Unsupported --config key "trustedTools"; empty value not allowed (omit to use defaults)`);
+    }
     target.trustedTools = parseTrustedTools(value) ?? [];
     return;
   }
   if (key === 'deniedTools') {
+    if (value.trim() === '') {
+      throw new Error(`Unsupported --config key "deniedTools"; empty value not allowed (omit to use defaults)`);
+    }
     target.deniedTools = parseTrustedTools(value) ?? [];
     return;
   }
@@ -124,7 +130,16 @@ function applyConfigOverride(target: CliConfigOverrides, pair: string): void {
     target[key] = parsed;
     return;
   }
-  if (key === 'model' || key === 'provider' || key === 'baseUrl' || key === 'workspace') {
+  if (key === 'model' || key === 'provider' || key === 'baseUrl') {
+    if (!value.trim()) {
+      throw new Error(`Unsupported --config key "${key}"; empty value not allowed`);
+    }
+    target[key] = value;
+  }
+  if (key === 'workspace') {
+    if (!value.trim()) {
+      throw new Error(`Unsupported --config key "workspace"; empty value not allowed (use -C with a path)`);
+    }
     target[key] = value;
   }
 }

packages/dmoss-agent/src/core/goal/task-frame.ts

@@ -216,8 +216,8 @@ export function detectContinuationIntent(userMessage: string): ContinuationInten
       compact,
     );
   const englishPhrase =
-    /^(continue|resume|go on|carry on|next step|keep going|please continue|pls continue)$/iu.test(
-      raw,
+    /^(continue|resume|goon|carryon|nextstep|keepgoing|pleasecontinue|plscontinue)$/iu.test(
+      compact,
     );
   const politeContinue =
     /^(请|麻烦|帮我|劳烦|辛苦)(你|您)?(请)?(继续|接着|往下|执行|处理|生成)/iu.test(compact) ||
@@ -240,7 +240,7 @@ export function createOrUpdateTaskFrame(params: {
     return {
       ...params.previous,
       runId: params.runId,
-      status: params.previous.status === 'completed' ? 'active' : params.previous.status,
+      status: params.previous.status === 'completed' || params.previous.status === 'aborted' ? 'active' : params.previous.status,
       source: 'user',
       updatedAt: now,
       nextAction: params.previous.nextAction || 'Continue from the latest saved task state.',
@@ -393,7 +393,12 @@ export function recordTaskFrameCompaction(
   frame: TaskFrame,
   params: { summaryChars: number; droppedMessages: number; now?: number },
 ): TaskFrame {
-  const next = { ...frame, source: 'compaction' as const, updatedAt: params.now ?? Date.now() };
+  const next = {
+    ...frame,
+    completedSteps: [...frame.completedSteps],
+    source: 'compaction' as const,
+    updatedAt: params.now ?? Date.now(),
+  };
   uniquePush(
     next.completedSteps,
     `Saved context checkpoint (${params.summaryChars} chars, ${params.droppedMessages} messages folded)`,
@@ -417,7 +422,12 @@ export function recordTaskFrameAssistant(
   stopReason: string,
   now = Date.now(),
 ): TaskFrame {
-  const next = { ...frame, source: 'assistant' as const, updatedAt: now };
+  const next = {
+    ...frame,
+    completedSteps: [...frame.completedSteps],
+    source: 'assistant' as const,
+    updatedAt: now,
+  };
   const visible = cleanText(text, MAX_SHORT_TEXT);
   if (visible) uniquePush(next.completedSteps, `Assistant response: ${visible}`);
   if (stopReason === 'end_turn' || stopReason === 'stop_sequence') {

packages/dmoss-agent/src/core/llm/llm-provider-stream-adapter.ts

@@ -136,7 +136,7 @@ function mapUsage(usage: LLMResponse['usage'] | undefined): Usage {
     output: usage.outputTokens,
     cacheRead,
     cacheWrite,
-    totalTokens: usage.inputTokens + usage.outputTokens,
+    totalTokens: usage.inputTokens + usage.outputTokens + cacheRead + cacheWrite,
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
   };
 }

packages/dmoss-agent/src/core/loop/context-budget-planner.ts

@@ -98,7 +98,7 @@ export function planContextBudgetActions(
   if (input.estimatedPromptTokens >= warningThreshold) {
     actions.push({
       kind: 'snip_tail_tool_results',
-      reason: 'warning_threshold',
+      reason: pressureReason === 'proactive_threshold' ? 'proactive_threshold' : 'warning_threshold',
     });
   }
 

packages/dmoss-agent/src/core/loop/follow-up-guard.ts

@@ -67,7 +67,7 @@ export function lastMessageNeedsToolFollowUp(messages: readonly MessageLike[]):
   const last = messages[messages.length - 1];
   if (last.role !== 'user') return false;
   if (typeof last.content === 'string') return false;
-  return (last.content as LLMContentBlock[]).some((b) => b.type === 'tool_result');
+  return (last.content as LLMContentBlock[]).some((b) => b && b.type === 'tool_result');
 }
 
 /**
@@ -278,12 +278,15 @@ export interface FollowUpGuardConfig {
   extraPatterns?: FollowUpPattern[];
   /** Max follow-up nudges per turn (default 1) */
   maxFollowUps?: number;
-  /** Max consecutive follow-up turns before giving up (prevents infinite nudge loops) */
+  /**
+   * @deprecated unused — declared but never read. Hardcoded limit is 1.
+   * Max consecutive follow-up turns before giving up (prevents infinite nudge loops)
+   */
   maxConsecutiveFollowUps?: number;
 }
 
 export const DEFAULT_FOLLOW_UP_GUARD_CONFIG: FollowUpGuardConfig = {
   enabled: true,
   maxFollowUps: 1,
-  maxConsecutiveFollowUps: 1,
+  // maxConsecutiveFollowUps is unused — see interface deprecation note
 };

packages/dmoss-agent/src/core/loop/per-turn-context-management.ts

@@ -166,5 +166,5 @@ export function runPerTurnContextManagement(
     });
   }
 
-  return { savedChars };
+  return { savedChars, savedTokens };
 }

packages/dmoss-agent/src/core/session/session-jsonl-codec.ts

@@ -108,19 +108,27 @@ export async function loadSessionFile(
   };
   const entries: SessionEntry[] = [];
 
+  const entryIds = new Set<string>();
   for (const entry of rest) {
     if (!entry || typeof entry !== "object") continue;
     const typed = entry as SessionEntry;
     if (!typed.type || typeof typed.id !== "string") continue;
     if (typed.type === "message" && (typed as MessageEntry).message) {
       entries.push(typed);
+      entryIds.add(typed.id);
       continue;
     }
     if (
       typed.type === "compaction" &&
       typeof (typed as CompactionEntry).summary === "string" &&
       typeof (typed as CompactionEntry).firstKeptEntryId === "string"
     ) {
+      const comp = typed as CompactionEntry;
+      if (!entryIds.has(comp.firstKeptEntryId)) {
+        console.warn(
+          `compaction entry has nonexistent firstKeptEntryId: ${comp.firstKeptEntryId}`
+        );
+      }
       entries.push(typed);
     }
   }

packages/dmoss-agent/src/core/session/session-manager.ts

@@ -710,6 +710,13 @@ async function rewriteSessionFile(
     lines = [headerLine, ...kept];
     content = `${lines.join("\n")}\n`;
 
+    // Final validation: ensure rotated content fits within the size cap
+    while (Buffer.byteLength(content, "utf-8") > MAX_SESSION_FILE_BYTES && kept.length > 0) {
+      kept.shift();
+      lines = [headerLine, ...kept];
+      content = `${lines.join("\n")}\n`;
+    }
+
     // Archive the oversized file (best-effort; ignore if it doesn't exist yet)
     try {
       await fs.rename(state.filePath, `${state.filePath}.1`);

packages/dmoss-agent/src/mcp/mcp-client.ts

@@ -228,6 +228,7 @@ class McpServerConnection {
   private process: ChildProcess;
   private nextId = 1;
   private pending = new Map<number, PendingRequest>();
+  private MAX_REQUEST_ID = 2147483647; // ~2.1B, safe integer well below MAX_SAFE_INTEGER
   private buffer = '';
   private closed = false;
   private requestTimeoutMs: number;
@@ -256,7 +257,7 @@ class McpServerConnection {
     this.process.on('error', (err) => {
       for (const [, pending] of this.pending) {
         clearTimeout(pending.timer);
-        pending.reject(err);
+        pending.reject(new DmossError({ code: ErrorCode.MCP_CONNECTION_FAILED, message: `MCP server ${serverName} process error: ${err instanceof Error ? err.message : String(err)}` }));
       }
       this.pending.clear();
     });
@@ -305,6 +306,7 @@ class McpServerConnection {
     if (this.closed) throw new DmossError({ code: ErrorCode.MCP_CONNECTION_FAILED, message: `MCP server ${this.serverName} is closed` });
     if (signal?.aborted) throw new DmossError({ code: ErrorCode.MCP_CONNECTION_FAILED, message: `MCP request aborted: ${signal.reason ?? 'aborted'}` });
     const id = this.nextId++;
+    if (this.nextId > this.MAX_REQUEST_ID) this.nextId = 1;
     const msg: JsonRpcRequest = { jsonrpc: '2.0', id, method, params };
     return new Promise((resolve, reject) => {
       const sendCancellation = (reason: string) => {
@@ -339,7 +341,14 @@ class McpServerConnection {
         reject: (e) => { cleanup(); reject(e); },
         timer,
       });
-      this.process.stdin!.write(JSON.stringify(msg) + '\n');
+      try {
+        this.process.stdin!.write(JSON.stringify(msg) + '\n');
+      } catch (err) {
+        this.pending.delete(id);
+        clearTimeout(timer);
+        cleanup();
+        reject(new DmossError({ code: ErrorCode.MCP_CONNECTION_FAILED, message: `MCP server ${this.serverName} stdin write failed: ${err instanceof Error ? err.message : String(err)}` }));
+      }
     });
   }
 
@@ -377,10 +386,12 @@ class McpServerConnection {
         this.process.kill('SIGKILL');
         resolve();
       }, 3000);
-      this.process.on('exit', () => {
+      const onExit = () => {
+        this.process.off('exit', onExit);
         clearTimeout(timeout);
         resolve();
-      });
+      };
+      this.process.once('exit', onExit);
     });
   }
 }

packages/dmoss-agent/src/provider/pi-ai-stream-parser.ts

@@ -136,7 +136,7 @@ export function processEvent(
             ? 'max_tokens'
             : 'end_turn';
     const msg = event.message;
-    const evtUsage = event.usage ?? msg?.usage;
+    const evtUsage = event.usage !== undefined && event.usage !== null ? event.usage : msg?.usage;
 
     if (msg?.content && Array.isArray(msg.content)) {
       const hasTextInContent = content.some(
@@ -325,7 +325,12 @@ export function convertStreamEvent(event: PiAiStreamEvent): LLMStreamEvent | nul
     const sr = event.stopReason ?? event.reason;
     return {
       type: 'message_delta',
-      stopReason: sr === 'toolCall' || sr === 'toolUse' ? 'tool_use' : 'end_turn',
+      stopReason:
+        sr === 'toolCall' || sr === 'toolUse'
+          ? 'tool_use'
+          : sr === 'length'
+            ? 'max_tokens'
+            : 'end_turn',
     };
   }
   return null;

packages/dmoss-agent/src/tools/device-ssh.ts

@@ -295,11 +295,18 @@ export function getDeviceConfigFromEnv(): DeviceSshConfig | null {
 
   const rawDomain = process.env.DMOSS_ROS_DOMAIN_ID;
   const parsedDomain = rawDomain !== undefined ? Number.parseInt(rawDomain, 10) : NaN;
+
+  const portStr = process.env.DMOSS_DEVICE_PORT || '22';
+  const port = Number.parseInt(portStr, 10);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+    throw new Error(`Invalid DMOSS_DEVICE_PORT: "${portStr}" (must be 1-65535)`);
+  }
+
   return {
     host,
     user: process.env.DMOSS_DEVICE_USER || 'root',
     password: process.env.DMOSS_DEVICE_PASSWORD,
-    port: parseInt(process.env.DMOSS_DEVICE_PORT || '22', 10),
+    port,
     keyPath: process.env.DMOSS_DEVICE_KEY,
     ...(Number.isInteger(parsedDomain) && parsedDomain >= 0 ? { rosDomainId: parsedDomain } : {}),
   };

packages/dmoss-agent/src/utils/run-process.ts

@@ -92,11 +92,15 @@ export function runProcess(cmd: string, opts: RunProcessOptions): Promise<RunPro
     }
 
     const onAbort = () => kill();
-    opts.signal?.addEventListener('abort', onAbort, { once: true });
+    if (opts.signal) {
+      opts.signal.addEventListener('abort', onAbort, { once: true });
+    }
 
     const cleanup = () => {
       if (timeoutId) clearTimeout(timeoutId);
-      opts.signal?.removeEventListener('abort', onAbort);
+      if (opts.signal) {
+        opts.signal.removeEventListener('abort', onAbort);
+      }
     };
 
     child.stdout?.on('data', (chunk: Buffer) => {

packages/dmoss-agent/test/cli-approval-edit-detail.spec.mjs

@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+import assert from 'node:assert/strict';
+import { buildApprovalDetailLines } from '../dist/cli/approval-detail.js';
+
+// Test that editFileDetail shows a minimal diff, not all old/new lines
+{
+  const oldContent = `line 1
+line 2
+line 3
+line 4
+line 5`;
+  const newContent = `line 1
+line 2 CHANGED
+line 3
+line 4
+line 5`;
+
+  const lines = buildApprovalDetailLines('edit_file', 'local_write', {
+    old_string: oldContent,
+    new_string: newContent,
+  });
+
+  // Should show a minimal diff with context ellipsis, not all 5 lines removed + 5 lines added
+  assert.ok(lines.some((l) => l.startsWith('  …')), 'should show context ellipsis for unchanged lines');
+  assert.ok(lines.some((l) => l.startsWith('- line 2')), 'should show the removed line');
+  assert.ok(lines.some((l) => l.startsWith('+ line 2 CHANGED')), 'should show the added line');
+
+  // The key assertion: we should NOT have all 5 old lines and all 5 new lines
+  const minusLines = lines.filter((l) => l.startsWith('- ') && !l.startsWith('  …'));
+  const plusLines = lines.filter((l) => l.startsWith('+ ') && !l.startsWith('  …'));
+  assert.equal(minusLines.length, 1, 'should only show the 1 changed old line, not all 5');
+  assert.equal(plusLines.length, 1, 'should only show the 1 changed new line, not all 5');
+}
+
+console.log('[PASS] editFileDetail uses minimal diff');