mixdog 0.8.1 → 0.9.1

package/scripts/parent-abort-link-test.mjs

@@ -0,0 +1,44 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import {
+  getSessionRuntime,
+  linkParentSignalToSession,
+  markSessionCancelled,
+  markSessionError,
+} from '../src/runtime/agent/orchestrator/session/manager.mjs';
+
+test('markSessionError drops parent AbortSignal listener but keeps runtime entry', () => {
+  const sessionId = `parent-abort-error-${Date.now()}`;
+  const parent = new AbortController();
+  linkParentSignalToSession(sessionId, parent.signal);
+  const runtime = getSessionRuntime(sessionId);
+  assert.ok(runtime?.parentAbortLink?.signal === parent.signal);
+  assert.equal(typeof runtime.parentAbortLink.listener, 'function');
+
+  markSessionError(sessionId, 'boom');
+
+  assert.equal(getSessionRuntime(sessionId)?.parentAbortLink, null);
+  assert.equal(getSessionRuntime(sessionId)?.stage, 'error');
+  let childAborted = false;
+  runtime.controller.signal.addEventListener('abort', () => { childAborted = true; }, { once: true });
+  parent.abort();
+  assert.equal(childAborted, false);
+});
+
+test('markSessionCancelled drops parent AbortSignal listener but keeps runtime entry', () => {
+  const sessionId = `parent-abort-cancel-${Date.now()}`;
+  const parent = new AbortController();
+  linkParentSignalToSession(sessionId, parent.signal);
+  const runtime = getSessionRuntime(sessionId);
+  assert.ok(runtime?.parentAbortLink);
+
+  markSessionCancelled(sessionId);
+
+  assert.equal(getSessionRuntime(sessionId)?.parentAbortLink, null);
+  assert.equal(getSessionRuntime(sessionId)?.stage, 'done');
+  let childAborted = false;
+  runtime.controller.signal.addEventListener('abort', () => { childAborted = true; }, { once: true });
+  parent.abort();
+  assert.equal(childAborted, false);
+});
+

package/scripts/patch-agent-brief.mjs

@@ -0,0 +1,48 @@
+import fs from "node:fs";
+const p = "src/runtime/shared/tool-surface.mjs";
+let s = fs.readFileSync(p, "utf8");
+if (s.includes("summarizeAgentSurfaceBrief")) { console.log("skip"); process.exit(0); }
+const insert = `/** Collapsed agent/worker surface card: one-line brief under the header (30-40 chars). */
+export const AGENT_SURFACE_BRIEF_MAX = 40;
+
+export function summarizeAgentSurfaceBrief(name, args, resultText, { isError = false, isResponse = false } = {}) {
+  const a = parseToolArgs(args);
+  const action = String(a?.type || a?.action || "").toLowerCase();
+  const text = String(resultText ?? "").trim();
+
+  if (isResponse && text) {
+    const fromResult = summarizeToolResult(name, args, text, isError);
+    if (fromResult) return truncateSingleLine(stripInlineMarkdown(fromResult), AGENT_SURFACE_BRIEF_MAX);
+    const line = firstAgentResultLine(text);
+    if (line) return truncateSingleLine(stripInlineMarkdown(line), AGENT_SURFACE_BRIEF_MAX);
+  }
+
+  const outbound = firstText(a?.prompt, a?.message);
+  if (outbound && (action === "spawn" || action === "send" || !action)) {
+    return truncateSingleLine(outbound, AGENT_SURFACE_BRIEF_MAX);
+  }
+
+  if ((action === "spawn" || action === "send") && text && !isResponse) {
+    const fromResult = summarizeToolResult(name, args, text, isError);
+    if (fromResult) return truncateSingleLine(stripInlineMarkdown(fromResult), AGENT_SURFACE_BRIEF_MAX);
+  }
+
+  return "";
+}
+
+`;
+const needle = `export function formatToolSurface(name, args, opts = {}) {
+  const parsed = parseToolArgs(args);
+  return {
+    label: displayToolName(name, parsed),
+    summary: summarizeToolArgs(name, parsed, opts),
+    normalizedName: normalizeToolName(name),
+    args: parsed,
+  };
+}
+
+function pluralize`;
+if (!s.includes(needle)) throw new Error("needle not found");
+s = s.replace(needle, insert + "function pluralize");
+fs.writeFileSync(p, s);
+console.log("tool-surface ok");

package/scripts/patch-app.mjs

@@ -0,0 +1,21 @@
+import fs from "node:fs";
+const p = "src/tui/App.jsx";
+let s = fs.readFileSync(p, "utf8");
+const old = `        // EVERY agent card is a single header row whether pending or completed —
+        // ToolExecution drops the ⎿ body for all of them AND the pending-delay
+        // placeholder reserves only 1 row for agent surfaces — so reserve
+        // exactly 1 row regardless of pending/hasResult. Otherwise the estimate
+        // (2) and the real render (1) diverge and the viewport jumps.
+        if (isSkillSurface || isAgentSurface) return 1;`;
+const neu = `        // Skill loads are a single header row; agent cards are header + brief.
+        if (isSkillSurface) return 1;
+        if (isAgentSurface) return 2;`;
+if (s.includes(old)) {
+  s = s.replace(old, neu);
+  fs.writeFileSync(p, s);
+  console.log("App ok");
+} else if (s.includes("if (isAgentSurface) return 2")) {
+  console.log("App already");
+} else {
+  throw new Error("App block not found");
+}

package/scripts/patch-app2.mjs

@@ -0,0 +1,18 @@
+import fs from "node:fs";
+const p = "src/tui/App.jsx";
+let s = fs.readFileSync(p, "utf8");
+const old = `        if (isSkillSurface || isAgentSurface) return 1;`;
+const neu = `        if (isSkillSurface) return 1;
+        if (isAgentSurface) return 2;`;
+if (s.includes(old) && !s.includes("if (isAgentSurface) return 2")) {
+  s = s.replace(old, neu);
+  const commentOld = `        // EVERY agent card is a single header row whether pending or completed —
+        // ToolExecution drops the ⎿ body for all of them AND the pending-delay
+        // placeholder reserves only 1 row for agent surfaces — so reserve
+        // exactly 1 row regardless of pending/hasResult. Otherwise the estimate
+        // (2) and the real render (1) diverge and the viewport jumps.`;
+  const commentNeu = `        // Skill loads are a single header row; agent cards are header + brief.`;
+  s = s.replace(commentOld, commentNeu);
+  fs.writeFileSync(p, s);
+  console.log("App ok");
+} else { console.log("App skip or done"); }

package/scripts/patch-dist-brief.mjs

@@ -0,0 +1,96 @@
+import fs from "node:fs";
+const p = "src/tui/dist/index.mjs";
+let s = fs.readFileSync(p, "utf8");
+
+const helpers = `const AGENT_SURFACE_BRIEF_MAX = 40;
+function truncateAgentSurfaceBrief(value, max = AGENT_SURFACE_BRIEF_MAX) {
+  const text = String(value ?? "").replace(/\\s+/g, " ").trim();
+  if (!text) return "";
+  if (text.length <= max) return text;
+  return \`\${text.slice(0, Math.max(1, max - 1))}…\`;
+}
+function summarizeAgentSurfaceBrief(name, args, resultText, { isError = false, isResponse = false } = {}) {
+  const a = parseToolArgs(args);
+  const action = String(a?.type || a?.action || "").toLowerCase();
+  const text = String(resultText ?? "").trim();
+
+  if (isResponse && text) {
+    const fromResult = summarizeToolResult(name, args, text, isError);
+    if (fromResult) return truncateAgentSurfaceBrief(stripInlineMarkdown(fromResult));
+    const line = firstAgentResultLine(text);
+    if (line) return truncateAgentSurfaceBrief(stripInlineMarkdown(line));
+  }
+
+  const outbound = firstText(a?.prompt, a?.message);
+  if (outbound && (action === "spawn" || action === "send" || !action)) {
+    return truncateAgentSurfaceBrief(outbound);
+  }
+
+  if ((action === "spawn" || action === "send") && text && !isResponse) {
+    const fromResult = summarizeToolResult(name, args, text, isError);
+    if (fromResult) return truncateAgentSurfaceBrief(stripInlineMarkdown(fromResult));
+  }
+
+  return "";
+}
+
+`;
+
+if (!s.includes("function summarizeAgentSurfaceBrief")) {
+  const needle = `function formatToolSurface(name, args, opts = {}) {
+  const parsed = parseToolArgs(args);
+  return {
+    label: displayToolName(name, parsed),
+    summary: summarizeToolArgs(name, parsed, opts),
+    normalizedName: normalizeToolName(name),
+    args: parsed
+  };
+}
+function pluralize`;
+  if (!s.includes(needle)) throw new Error("formatToolSurface needle missing");
+  s = s.replace(needle, `function formatToolSurface(name, args, opts = {}) {
+  const parsed = parseToolArgs(args);
+  return {
+    label: displayToolName(name, parsed),
+    summary: summarizeToolArgs(name, parsed, opts),
+    normalizedName: normalizeToolName(name),
+    args: parsed
+  };
+}
+` + helpers + `function pluralize`);
+}
+
+const oldVisible = `  const isAgentSurfaceCard = isAgentTool(normalizedName);
+  const visibleDetailLines = (isAgentSurfaceCard || isSkillSurface) && !showRawResult ? [] : detailLines;`;
+const newVisible = `  const isAgentSurfaceCard = isAgentTool(normalizedName);
+  const agentSurfaceBriefRaw = isAgentSurfaceCard && !showRawResult
+    ? summarizeAgentSurfaceBrief(name, parsedArgs, displayedResultText || "", { isError, isResponse: isAgentResponse })
+    : "";
+  const agentSurfaceBrief = agentSurfaceBriefRaw
+    ? truncateToWidth(agentSurfaceBriefRaw, Math.min(AGENT_SURFACE_BRIEF_MAX, maxResultChars))
+    : "";
+  let visibleDetailLines = detailLines;
+  if (isSkillSurface && !showRawResult) {
+    visibleDetailLines = [];
+  } else if (isAgentSurfaceCard && !showRawResult) {
+    const agentDetailFallback = collapsedDetail
+      || (pending ? (pendingDetailPlaceholder || "Running") : "Finished");
+    const agentDetailLine = agentSurfaceBrief
+      || truncateToWidth(String(agentDetailFallback), Math.min(AGENT_SURFACE_BRIEF_MAX, maxResultChars));
+    visibleDetailLines = [agentDetailLine];
+  }`;
+if (s.includes(oldVisible)) s = s.replace(oldVisible, newVisible);
+else if (!s.includes("agentSurfaceBriefRaw")) throw new Error("visibleDetailLines block missing");
+
+s = s.replace(
+  "const placeholderSingleRow = !aggregate && (SKILL_SURFACE_NAMES.has(placeholderNormalizedName) || isAgentTool(placeholderNormalizedName));",
+  "const placeholderSingleRow = !aggregate && SKILL_SURFACE_NAMES.has(placeholderNormalizedName);"
+);
+
+s = s.replace(
+  "        if (isSkillSurface || isAgentSurface) return 1;",
+  "        if (isSkillSurface) return 1;\n        if (isAgentSurface) return 2;"
+);
+
+fs.writeFileSync(p, s);
+console.log("dist patched");

package/scripts/patch-tool-exec.mjs

@@ -0,0 +1,70 @@
+import fs from "node:fs";
+const p = "src/tui/components/ToolExecution.jsx";
+let s = fs.readFileSync(p, "utf8");
+if (!s.includes("summarizeAgentSurfaceBrief,")) {
+  s = s.replace(
+    "  displayModelName,\n} from '../../runtime/shared/tool-surface.mjs';",
+    "  displayModelName,\n  summarizeAgentSurfaceBrief,\n  AGENT_SURFACE_BRIEF_MAX,\n} from '../../runtime/shared/tool-surface.mjs';",
+  );
+}
+s = s.replace(
+  `    // Skill surfaces AND agent surfaces both collapse to a single header row in
+    // estimateTranscriptItemRows (agent cards drop their ⎿ body entirely), so
+    // the pending-delay placeholder must reserve exactly 1 row for them too —
+    // otherwise the card paints 2 blank rows for ~1s then snaps to 1 ("튐").
+    const placeholderSingleRow = !aggregate
+      && (SKILL_SURFACE_NAMES.has(placeholderNormalizedName) || isAgentTool(placeholderNormalizedName));`,
+  `    // Skill surfaces collapse to a single header row; agent surfaces reserve
+    // header + one brief detail row (see estimateTranscriptItemRows).
+    const placeholderSingleRow = !aggregate && SKILL_SURFACE_NAMES.has(placeholderNormalizedName);`,
+);
+const oldBlock = `  // Every agent card is a single header row when collapsed: spawn/send/response/
+  // status/list/cancel/close/cleanup all fold their context into the header
+  // label, so the ⎿ detail body (response summary, "agents: N …" worker list,
+  // status metadata) is dropped unless the user expands with ctrl+o.
+  const isAgentSurfaceCard = isAgentTool(normalizedName);
+  // Skill loads carry the skill name in the header already
+  // ("Loaded 1 skill (name)"); the collapsed detail row just repeats it, so
+  // drop it and keep the card a single line. Expanding (ctrl+o) still shows the
+  // full skill body via the raw-result path.
+  // Agent responses now identify the responder in the header itself
+  // ("Heavy Worker (Opus 4.8)"); the collapsed body just echoed the response
+  // summary ("All green. Done."), so drop it and keep the card a single line.
+  // ctrl+o expand (showRawResult) still surfaces the full response body.
+  // Suppression is COLLAPSED-ONLY: agent/skill cards hide their ⎿ body when
+  // collapsed, but once the user expands (showRawResult) the raw body — the
+  // response, the "agents: N …" worker list, the status metadata — must render.
+  const visibleDetailLines = ((isAgentSurfaceCard || isSkillSurface) && !showRawResult)
+    ? []
+    : detailLines;`;
+const newBlock = `  const isAgentSurfaceCard = isAgentTool(normalizedName);
+  const agentSurfaceBriefRaw = isAgentSurfaceCard && !showRawResult
+    ? summarizeAgentSurfaceBrief(name, parsedArgs, displayedResultText || '', { isError, isResponse: isAgentResponse })
+    : '';
+  const agentSurfaceBrief = agentSurfaceBriefRaw
+    ? truncateToWidth(agentSurfaceBriefRaw, Math.min(AGENT_SURFACE_BRIEF_MAX, maxResultChars))
+    : '';
+  // Skill loads carry the skill name in the header already
+  // ("Loaded 1 skill (name)"); the collapsed detail row just repeats it, so
+  // drop it and keep the card a single line. Expanding (ctrl+o) still shows the
+  // full skill body via the raw-result path.
+  // Agent spawn/send/response cards show a tight brief under the ⎿ gutter when
+  // collapsed; ctrl+o expand still surfaces the full body.
+  let visibleDetailLines = detailLines;
+  if (isSkillSurface && !showRawResult) {
+    visibleDetailLines = [];
+  } else if (isAgentSurfaceCard && !showRawResult) {
+    if (agentSurfaceBrief) {
+      visibleDetailLines = [agentSurfaceBrief];
+    } else if (pending) {
+      visibleDetailLines = [pendingDetailPlaceholder || 'Running'];
+    } else {
+      visibleDetailLines = [];
+    }
+  }`;
+if (!s.includes("agentSurfaceBriefRaw")) {
+  if (!s.includes(oldBlock)) throw new Error("ToolExecution block not found");
+  s = s.replace(oldBlock, newBlock);
+}
+fs.writeFileSync(p, s);
+console.log("ToolExecution ok");

package/scripts/pretool-ask-runtime-test.mjs

@@ -0,0 +1,54 @@
+
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import {
+  approvalGranted,
+  formatMissingToolApprovalUiDenial,
+  resolvePreToolAskApproval,
+} from '../src/runtime/agent/orchestrator/session/loop.mjs';
+
+test('PreToolUse ask without approval callback returns explicit denial', async () => {
+  const outcome = await resolvePreToolAskApproval({
+    toolName: 'shell',
+    args: { command: 'echo hi' },
+    cwd: '/tmp',
+    sessionId: 'sess_test',
+    toolCallId: 'call_1',
+    askReason: 'needs human approval',
+    toolApprovalHook: undefined,
+  });
+  assert.equal(outcome.approval, undefined);
+  assert.match(outcome.denial, /approval required but no approval UI is available/);
+  assert.match(outcome.denial, /needs human approval/);
+  assert.equal(
+    outcome.denial,
+    formatMissingToolApprovalUiDenial('shell', 'needs human approval'),
+  );
+});
+
+test('PreToolUse ask with rejected approval returns structured denial', async () => {
+  const outcome = await resolvePreToolAskApproval({
+    toolName: 'read',
+    args: { path: 'README.md' },
+    cwd: '/tmp',
+    sessionId: 'sess_test',
+    toolCallId: 'call_2',
+    askReason: 'confirm read',
+    toolApprovalHook: async () => ({ approved: false, reason: 'user declined' }),
+  });
+  assert.match(outcome.denial, /denied by hook: user declined/);
+});
+
+test('PreToolUse ask with granted approval allows tool execution', async () => {
+  const outcome = await resolvePreToolAskApproval({
+    toolName: 'grep',
+    args: { pattern: 'foo' },
+    cwd: '/tmp',
+    sessionId: 'sess_test',
+    toolCallId: 'call_3',
+    askReason: 'confirm grep',
+    toolApprovalHook: async () => ({ approved: true }),
+  });
+  assert.equal(outcome.denial, undefined);
+  assert.equal(approvalGranted(outcome.approval), true);
+});