@pikaa-ai/pikaa 0.2.2 → 0.2.3

package/dist/cli.js

@@ -127,6 +127,7 @@ class DefaultModelClientSession {
       model,
       messages,
       stream: true,
+      stream_options: { include_usage: true },
       temperature: params.temperature ?? 0.2
     };
     if (toolsPayload && toolsPayload.length > 0) {
@@ -175,6 +176,7 @@ class DefaultModelClientSession {
     const reader = response.body.getReader();
     const decoder = new TextDecoder;
     let buffer = "";
+    let usageMetrics = {};
     const pendingToolCalls = new Map;
     try {
       while (true) {
@@ -204,11 +206,23 @@ class DefaultModelClientSession {
               };
             }
             pendingToolCalls.clear();
-            yield { type: "done" };
+            yield {
+              type: "done",
+              inputTokens: usageMetrics.inputTokens,
+              outputTokens: usageMetrics.outputTokens,
+              totalTokens: usageMetrics.totalTokens
+            };
             return;
           }
           try {
             const data = JSON.parse(dataStr);
+            if (data.usage) {
+              usageMetrics = {
+                inputTokens: data.usage.prompt_tokens,
+                outputTokens: data.usage.completion_tokens,
+                totalTokens: data.usage.total_tokens
+              };
+            }
             const choice = data.choices?.[0];
             if (!choice)
               continue;
@@ -523,6 +537,8 @@ async function runTurn(session, turnContext, input) {
     skillsPrompt
   });
   let iteration = 0;
+  let accumulatedInputTokens = 0;
+  let accumulatedOutputTokens = 0;
   const clientSession = session.modelClient.newSession();
   try {
     while (iteration < turnContext.maxIterations) {
@@ -532,6 +548,8 @@ async function runTurn(session, turnContext, input) {
       iteration++;
       let currentAgentText = "";
       const toolCallRequests = [];
+      let iterInputTokens = Math.ceil((effectiveSystemPrompt.length + JSON.stringify(session.getHistory()).length) / 4);
+      let iterOutputTokens = 0;
       const stream = clientSession.stream({
         model: turnContext.model,
         systemPrompt: effectiveSystemPrompt,
@@ -558,10 +576,20 @@ async function runTurn(session, turnContext, input) {
           });
         } else if (chunk.type === "tool_call") {
           toolCallRequests.push(chunk);
+        } else if (chunk.type === "done") {
+          if (chunk.inputTokens !== undefined)
+            iterInputTokens = chunk.inputTokens;
+          if (chunk.outputTokens !== undefined)
+            iterOutputTokens = chunk.outputTokens;
         } else if (chunk.type === "error") {
           throw chunk.error;
         }
       }
+      if (iterOutputTokens === 0) {
+        iterOutputTokens = Math.ceil((currentAgentText.length + JSON.stringify(toolCallRequests).length) / 4);
+      }
+      accumulatedInputTokens += iterInputTokens;
+      accumulatedOutputTokens += iterOutputTokens;
       if (currentAgentText.trim()) {
         const agentItem = {
           id: `msg_agent_${Date.now()}`,
@@ -602,6 +630,7 @@ async function runTurn(session, turnContext, input) {
             cwd: turnContext.environment.cwd,
             turnId,
             signal,
+            execPolicy: session.execPolicy,
             requestApproval: async (description, command) => {
               const approvalId = `appr_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`;
               return session.requestApproval({
@@ -639,9 +668,16 @@ async function runTurn(session, turnContext, input) {
       }
       break;
     }
+    const totalContextTokens = estimateTotalTokens(session.getHistory()) + Math.ceil(effectiveSystemPrompt.length / 4);
+    const maxContextTokens = 128000;
     session.emitEvent({
       type: "TurnCompleted",
-      turnId
+      turnId,
+      inputTokens: accumulatedInputTokens,
+      outputTokens: accumulatedOutputTokens,
+      totalTokens: accumulatedInputTokens + accumulatedOutputTokens,
+      contextTokens: totalContextTokens,
+      maxContextTokens
     });
   } catch (error) {
     const isAborted = error instanceof TurnAbortedError || signal.aborted;
@@ -725,6 +761,40 @@ async function submissionLoop(session, queue) {
   }
 }
 
+// src/security/exec-policy.ts
+class ExecPolicy {
+  rules = [];
+  constructor() {
+    this.initDefaultRules();
+  }
+  initDefaultRules() {
+    this.addRule(/^(git\s+(status|log|diff|branch|show|rev-parse))/i, "allow", "Safe git query");
+    this.addRule(/^(ls|dir|cat|grep|rg|find|pwd|echo|head|tail|wc|which|where)\b/i, "allow", "Safe read-only shell command");
+    this.addRule(/^(bun\s+(test|--version|-v)|npm\s+(test|--version|-v)|node\s+-v)\b/i, "allow", "Testing & runtime check");
+    this.addRule(/^(rm|del|rmdir|format|mkfs)\b/i, "prompt", "Destructive file removal");
+    this.addRule(/^(git\s+(push|reset\s+--hard|clean\s+-fd|rebase))\b/i, "prompt", "Destructive git operation");
+    this.addRule(/^(curl|wget|fetch|ssh|scp|ftp)\b/i, "prompt", "Network / remote transfer");
+  }
+  addRule(pattern, decision, description) {
+    this.rules.unshift({ pattern, decision, description });
+  }
+  evaluate(command) {
+    const trimmed = command.trim();
+    for (const rule of this.rules) {
+      if (rule.pattern.test(trimmed)) {
+        return {
+          decision: rule.decision,
+          reason: rule.description
+        };
+      }
+    }
+    return {
+      decision: "prompt",
+      reason: "Command is not in the automatic allowlist"
+    };
+  }
+}
+
 // src/session/session.ts
 class Session {
   threadId;
@@ -735,6 +805,7 @@ class Session {
   tools;
   skillsLoader;
   memoryStore;
+  execPolicy;
   history = [];
   activeTurn = null;
   status = "idle";
@@ -752,6 +823,7 @@ class Session {
     this.tools = options.tools || new ToolRouter;
     this.skillsLoader = options.skillsLoader;
     this.memoryStore = options.memoryStore;
+    this.execPolicy = options.execPolicy || new ExecPolicy;
     this.history = options.initialHistory ? [...options.initialHistory] : [];
     if (options.onEvent) {
       this.eventListeners.push(options.onEvent);
@@ -1001,40 +1073,6 @@ var applyPatchTool = {
     }
   }
 };
-// src/security/exec-policy.ts
-class ExecPolicy {
-  rules = [];
-  constructor() {
-    this.initDefaultRules();
-  }
-  initDefaultRules() {
-    this.addRule(/^(git\s+(status|log|diff|branch|show|rev-parse))/i, "allow", "Safe git query");
-    this.addRule(/^(ls|dir|cat|grep|rg|find|pwd|echo|head|tail|wc|which|where)\b/i, "allow", "Safe read-only shell command");
-    this.addRule(/^(bun\s+(test|--version|-v)|npm\s+(test|--version|-v)|node\s+-v)\b/i, "allow", "Testing & runtime check");
-    this.addRule(/^(rm|del|rmdir|format|mkfs)\b/i, "prompt", "Destructive file removal");
-    this.addRule(/^(git\s+(push|reset\s+--hard|clean\s+-fd|rebase))\b/i, "prompt", "Destructive git operation");
-    this.addRule(/^(curl|wget|fetch|ssh|scp|ftp)\b/i, "prompt", "Network / remote transfer");
-  }
-  addRule(pattern, decision, description) {
-    this.rules.unshift({ pattern, decision, description });
-  }
-  evaluate(command) {
-    const trimmed = command.trim();
-    for (const rule of this.rules) {
-      if (rule.pattern.test(trimmed)) {
-        return {
-          decision: rule.decision,
-          reason: rule.description
-        };
-      }
-    }
-    return {
-      decision: "prompt",
-      reason: "Command is not in the automatic allowlist"
-    };
-  }
-}
-
 // src/tools/handlers/shell.ts
 function createShellTool(policy = new ExecPolicy) {
   return {
@@ -1059,7 +1097,8 @@ function createShellTool(policy = new ExecPolicy) {
       if (!command) {
         return { output: "Error: 'command' argument cannot be empty", isError: true };
       }
-      const policyDecision = policy.evaluate(command);
+      const activePolicy = ctx.execPolicy || policy;
+      const policyDecision = activePolicy.evaluate(command);
       if (policyDecision.decision === "deny") {
         return {
           output: `Error: Command execution denied by policy: ${policyDecision.reason}`,
@@ -3904,7 +3943,7 @@ class AuthClient {
                 </head>
                 <body>
                   <div class="box">
-                    <h1>\u26A1 Authentication Successful!</h1>
+                    <h1>Authentication Successful!</h1>
                     <p>You have successfully logged in to Groupy CLI. You can close this window and return to your terminal.</p>
                   </div>
                 </body>
@@ -4015,12 +4054,29 @@ var style = {
 };
 
 // src/cli/ui/spinner.ts
+function formatDuration(ms) {
+  const totalSec = Math.floor(ms / 1000);
+  if (totalSec < 60) {
+    const sec = (ms / 1000).toFixed(1);
+    return `${sec}s`;
+  }
+  const minutes = Math.floor(totalSec / 60);
+  const seconds = totalSec % 60;
+  if (minutes < 60) {
+    return `${minutes}m ${seconds}s`;
+  }
+  const hours = Math.floor(minutes / 60);
+  const remMinutes = minutes % 60;
+  return `${hours}h ${remMinutes}m ${seconds}s`;
+}
+
 class LiveSpinner {
   frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   frameIndex = 0;
   timer = null;
   currentMessage = "";
   isSpinning = false;
+  startTime = 0;
   start(message = "Thinking...") {
     if (this.isSpinning) {
       this.update(message);
@@ -4028,6 +4084,7 @@ class LiveSpinner {
     }
     this.isSpinning = true;
     this.currentMessage = message;
+    this.startTime = performance.now();
     this.frameIndex = 0;
     this.render();
     this.timer = setInterval(() => {
@@ -4046,7 +4103,10 @@ class LiveSpinner {
   }
   render() {
     const frame = this.frames[this.frameIndex];
-    const output = `\r\x1B[K${c.cyan}${frame}${c.reset} ${c.dim}${this.currentMessage}${c.reset}`;
+    const elapsedMs = performance.now() - this.startTime;
+    const elapsedStr = formatDuration(elapsedMs);
+    const timeBadge = style.dim(`(${elapsedStr})`);
+    const output = `\r\x1B[K  ${c.cyan}${frame}${c.reset} ${c.dim}${this.currentMessage}${c.reset} ${timeBadge}`;
     process.stdout.write(output);
   }
   stop(finalMessage, success = true) {
@@ -4078,30 +4138,271 @@ class LiveSpinner {
   }
 }
 
+// src/cli/ui/diff.ts
+var ESC2 = "\x1B[";
+var R = `${ESC2}0m`;
+var fg = {
+  lineNum: `${ESC2}38;2;120;120;130m`,
+  gutterDel: `${ESC2}38;2;210;90;90m`,
+  gutterAdd: `${ESC2}38;2;80;200;120m`,
+  textDel: `${ESC2}38;2;235;150;150m`,
+  textAdd: `${ESC2}38;2;140;230;160m`,
+  ctx: `${ESC2}38;2;180;180;195m`
+};
+var bg = {
+  del: `${ESC2}48;2;60;20;25m`,
+  add: `${ESC2}48;2;18;55;28m`,
+  wordDel: `${ESC2}48;2;135;40;45m`,
+  wordAdd: `${ESC2}48;2;30;115;50m`
+};
+function tokenize(line) {
+  return line.match(/\w+|\s+|[^\w\s]+/g) ?? [];
+}
+function lcsTokenDiff(oldTokens, newTokens) {
+  const m = oldTokens.length;
+  const n = newTokens.length;
+  const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+  for (let i2 = 1;i2 <= m; i2++) {
+    for (let j2 = 1;j2 <= n; j2++) {
+      dp[i2][j2] = oldTokens[i2 - 1] === newTokens[j2 - 1] ? dp[i2 - 1][j2 - 1] + 1 : Math.max(dp[i2 - 1][j2], dp[i2][j2 - 1]);
+    }
+  }
+  const ops = [];
+  let i = m, j = n;
+  while (i > 0 || j > 0) {
+    if (i > 0 && j > 0 && oldTokens[i - 1] === newTokens[j - 1]) {
+      ops.push({ same: oldTokens[i - 1] });
+      i--;
+      j--;
+    } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
+      ops.push({ add: newTokens[j - 1] });
+      j--;
+    } else {
+      ops.push({ del: oldTokens[i - 1] });
+      i--;
+    }
+  }
+  return ops.reverse();
+}
+function visibleLen(s) {
+  return s.replace(/\x1b\[[0-9;]*m/g, "").length;
+}
+function padToWidth(rendered, bgColor, termWidth) {
+  const pad = Math.max(0, termWidth - visibleLen(rendered));
+  return rendered + bgColor + " ".repeat(pad) + R;
+}
+function gutterWidth(maxLine) {
+  return Math.max(1, String(maxLine).length);
+}
+function renderCtxRow(text, oldLine, newLine, numWidth, termWidth) {
+  const oldNum = String(oldLine).padStart(numWidth);
+  const newNum = String(newLine).padStart(numWidth);
+  const gutter = `${fg.lineNum}${oldNum}${R} ${fg.lineNum}${newNum}${R}   `;
+  const body = `${fg.ctx}${text}${R}`;
+  const raw = gutter + body;
+  const pad = Math.max(0, termWidth - visibleLen(raw));
+  return raw + " ".repeat(pad);
+}
+function renderDelRow(text, oldLine, numWidth, pairText, termWidth) {
+  const num = String(oldLine).padStart(numWidth);
+  const gutter = `${bg.del}${fg.lineNum}${num}${R}${bg.del}${fg.gutterDel} - ${R}`;
+  let body;
+  if (pairText !== undefined) {
+    const ops = lcsTokenDiff(tokenize(text), tokenize(pairText));
+    body = ops.map((op) => {
+      if (op.same)
+        return `${bg.del}${fg.textDel}${op.same}`;
+      if (op.del)
+        return `${bg.wordDel}${fg.textDel}${op.del}`;
+      return "";
+    }).join("") + R;
+  } else {
+    body = `${bg.del}${fg.textDel}${text}${R}`;
+  }
+  return padToWidth(gutter + body, bg.del, termWidth);
+}
+function renderAddRow(text, newLine, numWidth, pairText, termWidth) {
+  const num = String(newLine).padStart(numWidth);
+  const gutter = `${bg.add}${fg.lineNum}${num}${R}${bg.add}${fg.gutterAdd} + ${R}`;
+  let body;
+  if (pairText !== undefined) {
+    const ops = lcsTokenDiff(tokenize(pairText), tokenize(text));
+    body = ops.map((op) => {
+      if (op.same)
+        return `${bg.add}${fg.textAdd}${op.same}`;
+      if (op.add)
+        return `${bg.wordAdd}${fg.textAdd}${op.add}`;
+      return "";
+    }).join("") + R;
+  } else {
+    body = `${bg.add}${fg.textAdd}${text}${R}`;
+  }
+  return padToWidth(gutter + body, bg.add, termWidth);
+}
+function renderDiff(lines, opts = {}) {
+  const termWidth = opts.termWidth ?? process.stdout.columns ?? 80;
+  const maxLineNum = lines.reduce((m, l) => Math.max(m, l.oldLine ?? 0, l.newLine ?? 0), 0);
+  const numWidth = gutterWidth(maxLineNum);
+  const out = [];
+  if (opts.filePath) {
+    const headerText = `  ${opts.filePath}`;
+    const padded = headerText.padEnd(termWidth);
+    out.push(`${ESC2}48;2;30;30;40m${ESC2}38;2;200;180;255m${ESC2}1m${padded}${R}`);
+  }
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line.kind === "ctx") {
+      if (line.oldLine === undefined) {
+        const sep = "  \u22EF".padEnd(termWidth);
+        out.push(`${ESC2}38;2;100;100;120m${sep}${R}`);
+      } else {
+        out.push(renderCtxRow(line.text, line.oldLine, line.newLine, numWidth, termWidth));
+      }
+      i++;
+      continue;
+    }
+    const dels = [];
+    const adds = [];
+    while (i < lines.length && lines[i].kind === "del")
+      dels.push(lines[i++]);
+    while (i < lines.length && lines[i].kind === "add")
+      adds.push(lines[i++]);
+    const pairCount = Math.min(dels.length, adds.length);
+    for (let p = 0;p < pairCount; p++) {
+      out.push(renderDelRow(dels[p].text, dels[p].oldLine, numWidth, adds[p].text, termWidth));
+      out.push(renderAddRow(adds[p].text, adds[p].newLine, numWidth, dels[p].text, termWidth));
+    }
+    for (let p = pairCount;p < dels.length; p++) {
+      out.push(renderDelRow(dels[p].text, dels[p].oldLine, numWidth, undefined, termWidth));
+    }
+    for (let p = pairCount;p < adds.length; p++) {
+      out.push(renderAddRow(adds[p].text, adds[p].newLine, numWidth, undefined, termWidth));
+    }
+  }
+  return out.join(`
+`);
+}
+function parsePatch(oldSrc, newSrc, contextLines = 3) {
+  const oldLines = oldSrc.split(`
+`);
+  const newLines = newSrc.split(`
+`);
+  const m = oldLines.length;
+  const n = newLines.length;
+  const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+  for (let i = 1;i <= m; i++) {
+    for (let j = 1;j <= n; j++) {
+      dp[i][j] = oldLines[i - 1] === newLines[j - 1] ? dp[i - 1][j - 1] + 1 : Math.max(dp[i - 1][j], dp[i][j - 1]);
+    }
+  }
+  const ops = [];
+  let oi = m, ni = n;
+  while (oi > 0 || ni > 0) {
+    if (oi > 0 && ni > 0 && oldLines[oi - 1] === newLines[ni - 1]) {
+      ops.push({ kind: "same", oi: oi - 1, ni: ni - 1 });
+      oi--;
+      ni--;
+    } else if (ni > 0 && (oi === 0 || dp[oi][ni - 1] >= dp[oi - 1][ni])) {
+      ops.push({ kind: "add", ni: ni - 1 });
+      ni--;
+    } else {
+      ops.push({ kind: "del", oi: oi - 1 });
+      oi--;
+    }
+  }
+  ops.reverse();
+  const changed = new Set;
+  ops.forEach((op, idx) => {
+    if (op.kind !== "same")
+      changed.add(idx);
+  });
+  const visible = new Set;
+  changed.forEach((idx) => {
+    for (let k = Math.max(0, idx - contextLines);k <= Math.min(ops.length - 1, idx + contextLines); k++) {
+      visible.add(k);
+    }
+  });
+  const result = [];
+  let prevVisible = -2;
+  for (let idx = 0;idx < ops.length; idx++) {
+    if (!visible.has(idx))
+      continue;
+    if (prevVisible !== -2 && idx > prevVisible + 1) {
+      result.push({ kind: "ctx", text: "\u22EF", oldLine: undefined, newLine: undefined });
+    }
+    prevVisible = idx;
+    const op = ops[idx];
+    if (op.kind === "same") {
+      result.push({ kind: "ctx", oldLine: op.oi + 1, newLine: op.ni + 1, text: oldLines[op.oi] });
+    } else if (op.kind === "del") {
+      result.push({ kind: "del", oldLine: op.oi + 1, text: oldLines[op.oi] });
+    } else {
+      result.push({ kind: "add", newLine: op.ni + 1, text: newLines[op.ni] });
+    }
+  }
+  return result;
+}
+
 // src/cli/ui/formatter.ts
 function renderGroupyBanner(info) {
   CliFormatter.printBanner(info);
 }
-function formatToolCard(toolName, args, output, isError = false) {
-  CliFormatter.formatToolCall(toolName, args);
-  if (output !== undefined) {
-    CliFormatter.formatToolOutput(output, isError);
+function formatTurnSummary(metrics) {
+  CliFormatter.formatTurnSummary(metrics);
+}
+function formatTaskStepStart(step, toolName, args) {
+  const argsSummary = Object.entries(args).map(([k, v]) => {
+    const valStr = typeof v === "string" ? `"${v.length > 35 ? v.slice(0, 32) + "..." : v}"` : JSON.stringify(v);
+    return `${style.dim(k)}=${style.cyan(valStr)}`;
+  }).join(" ");
+  console.log(`  ${style.brand("\u280B")} ${style.bold(`[${step}]`)} ${style.cyan(toolName)} ${argsSummary}`);
+}
+function formatTaskStepFinish(step, toolName, args, output, isError = false) {
+  const icon = isError ? style.red("\u2717") : style.green("\u2714");
+  const toolNameDisplay = style.bold(toolName);
+  if (toolName === "apply_patch" && typeof args.targetContent === "string" && typeof args.replacementContent === "string") {
+    const targetFile = args.path ? String(args.path) : undefined;
+    console.log(`  ${icon} ${style.dim(`[${step}]`)} ${toolNameDisplay} ${style.dim(targetFile || "")}`);
+    CliFormatter.formatPatchDiff(targetFile, args.targetContent, args.replacementContent);
+    return;
+  }
+  let summary = "";
+  if (output) {
+    const trimmed = output.trim();
+    const lines = trimmed.split(`
+`);
+    if (lines.length === 1 && lines[0].length <= 60) {
+      summary = ` ${style.dim("\u21B3")} ${style.dim(lines[0])}`;
+    } else if (toolName === "read_file" || toolName === "read_file_range") {
+      summary = ` ${style.dim(`\u21B3 (${lines.length} lines read)`)}`;
+    } else if (toolName === "grep_search" || toolName === "find_files") {
+      summary = ` ${style.dim(`\u21B3 (${lines.length} items found)`)}`;
+    } else {
+      summary = ` ${style.dim(`\u21B3 (${lines.length} lines output)`)}`;
+    }
+  }
+  console.log(`  ${icon} ${style.dim(`[${step}]`)} ${toolNameDisplay}${summary}`);
+  if (isError && output) {
+    const firstLine = output.trim().split(`
+`)[0] || output;
+    console.log(`    ${style.red(firstLine.slice(0, 120))}`);
   }
 }
-
 class CliFormatter {
   static printBanner(info) {
     const b = c.brandBold;
     const r = c.reset;
     const g = c.dim;
     const t = c.bold;
+    const userDisplay = info.user ? style.cyan(info.user) : style.dim("Guest");
     console.log();
     console.log(`  ${b}       \u2584\u2584\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2584\u2584${r}`);
     console.log(`  ${b}    \u2584\u2588\u2588\u2588\u2580\u2580      \u2580\u2580\u2588\u2588\u2588\u2584${r}`);
     console.log(`  ${b}  \u2584\u2588\u2588\u2580              \u2580\u2588\u2588\u2584${r}           ${t}PIKAA AGENT${r}`);
     console.log(`  ${b} \u2588\u2588\u2588    \u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584      \u2588\u2588\u2588${r}          ${g}Autonomous Coding Engine${r}`);
-    console.log(`  ${b}\u2588\u2588\u2588   \u2584\u2588\u2588\u2580    \u2580\u2588\u2588\u2584     \u2580\u2580${r}          ${style.dim("Model:")} ${style.brand(info.model)}`);
-    console.log(`  ${b}\u2588\u2588\u2588   \u2588\u2588\u258C  \u2588\u2588  \u2590\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2584${r}    ${style.dim("Role:")}  ${style.yellow(info.role)}`);
+    console.log(`  ${b}\u2588\u2588\u2588   \u2584\u2588\u2588\u2580    \u2580\u2588\u2588\u2584     \u2580\u2580${r}          ${style.dim("User:")}  ${userDisplay}`);
+    console.log(`  ${b}\u2588\u2588\u2588   \u2588\u2588\u258C  \u2588\u2588  \u2590\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2584${r}    ${style.dim("Model:")} ${style.brand(info.model)}`);
     console.log(`  ${b}\u2588\u2588\u2588   \u2588\u2588\u258C  \u2588\u2588  \u2590\u2588\u2588    \u2588\u2588  \u2588\u2588 \u2580${r}     ${style.dim("Dir:")}   ${style.dim(info.cwd)}`);
     console.log(`  ${b}\u2588\u2588\u2588   \u2580\u2588\u2588\u2584    \u2584\u2588\u2588\u2580     \u2584\u2584${r}`);
     console.log(`  ${b} \u2588\u2588\u2588    \u2580\u2580\u2588\u2588\u2588\u2588\u2580\u2580      \u2588\u2588\u2588${r}`);
@@ -4119,6 +4420,12 @@ class CliFormatter {
     }).join(" ");
     console.log(`  ${style.brand("\u25C6")} ${style.bold("tool:")} ${style.cyan(toolName)} ${argsSummary}`);
   }
+  static formatPatchDiff(filePath, oldSrc, newSrc) {
+    const lines = parsePatch(oldSrc, newSrc);
+    if (lines.length === 0)
+      return;
+    console.log(renderDiff(lines, { filePath }));
+  }
   static formatToolOutput(output, isError = false) {
     const prefix = isError ? style.red("  \u2717 error:") : style.dim("  \u21B3 output:");
     const lines = output.trim().split(`
@@ -4130,6 +4437,62 @@ class CliFormatter {
     console.log(`${prefix}
 ${preview}${more}`);
   }
+  static formatTurnSummary(metrics) {
+    const formatTokens = (n) => {
+      if (n >= 1e6)
+        return `${(n / 1e6).toFixed(1)}M`;
+      if (n >= 1000) {
+        const val = (n / 1000).toFixed(1);
+        return val.endsWith(".0") ? `${val.slice(0, -2)}k` : `${val}k`;
+      }
+      return String(n);
+    };
+    const durationSec = (metrics.durationMs / 1000).toFixed(1);
+    const parts = [`${c.bold}${durationSec}s${c.reset}`];
+    if (metrics.inputTokens !== undefined || metrics.outputTokens !== undefined) {
+      const inStr = metrics.inputTokens !== undefined ? formatTokens(metrics.inputTokens) : "0";
+      const outStr = metrics.outputTokens !== undefined ? formatTokens(metrics.outputTokens) : "0";
+      parts.push(`${style.cyan(`${inStr} in`)} ${style.dim("/")} ${style.cyan(`${outStr} out`)}`);
+    } else if (metrics.totalTokens !== undefined && metrics.totalTokens > 0) {
+      parts.push(`${style.dim(`${formatTokens(metrics.totalTokens)} tokens`)}`);
+    }
+    if (metrics.contextTokens !== undefined && metrics.maxContextTokens !== undefined && metrics.maxContextTokens > 0) {
+      const pct = Math.round(metrics.contextTokens / metrics.maxContextTokens * 100);
+      const colorFn = pct < 50 ? style.green : pct < 80 ? style.yellow : style.red;
+      const ctxLabel = colorFn(`${pct}% context`);
+      parts.push(ctxLabel);
+    }
+    if (metrics.toolCalls && metrics.toolCalls.length > 0) {
+      const count = metrics.toolCalls.length;
+      const uniqueTools = Array.from(new Set(metrics.toolCalls));
+      const toolLabel = count === 1 ? `1 tool (${uniqueTools.join(", ")})` : `${count} tools (${uniqueTools.join(", ")})`;
+      parts.push(`${style.cyan(toolLabel)}`);
+    }
+    if (metrics.filesModified && metrics.filesModified.length > 0) {
+      const count = metrics.filesModified.length;
+      const fileLabel = count === 1 ? `1 file updated` : `${count} files updated`;
+      parts.push(`${style.green(fileLabel)}`);
+    }
+    const dot = `${style.dim(" \xB7 ")}`;
+    console.log(`
+  ${c.brandBold}\u273B${c.reset} ${style.dim("Completed in")} ${parts.join(dot)}`);
+    const sessionParts = [];
+    if (metrics.sessionUptimeMs !== undefined && metrics.sessionUptimeMs >= 1000) {
+      sessionParts.push(`${style.dim("session:")} ${style.bold(formatDuration(metrics.sessionUptimeMs))}`);
+    }
+    if (metrics.subAgents && metrics.subAgents.length > 0) {
+      const agentBadges = metrics.subAgents.map((a) => {
+        const timeStr = formatDuration(a.runningTimeMs);
+        const icon = a.status === "running" ? style.brand("\u25CF") : a.status === "completed" ? style.green("\u2714") : style.red("\u2717");
+        return `${icon} ${style.cyan(a.nickname)} ${style.dim(`(${a.role}, ${timeStr})`)}`;
+      });
+      sessionParts.push(`${style.dim("sub-agents:")} [${agentBadges.join(", ")}]`);
+    }
+    if (sessionParts.length > 0) {
+      console.log(`    ${style.dim("\u21B3")} ${sessionParts.join(dot)}`);
+    }
+    console.log();
+  }
   static formatMarkdownLine(chunk) {
     let formatted = chunk.replace(/\*\*(.*?)\*\*/g, `${c.bold}$1${c.reset}`);
     formatted = formatted.replace(/`([^`]+)`/g, `${c.cyan}$1${c.reset}`);
@@ -4158,9 +4521,12 @@ function ensureKeypressInitialized() {
 
 class InteractiveLineEditor {
   promptSymbol;
+  cwd;
   onInterrupt;
+  searchEngine = new FileSearchEngine;
   constructor(options = {}) {
     this.promptSymbol = options.promptSymbol || `${c.brandBold}\u276F${c.reset} `;
+    this.cwd = options.cwd || process.cwd();
     this.onInterrupt = options.onInterrupt;
   }
   async readLine() {
@@ -4178,6 +4544,7 @@ class InteractiveLineEditor {
       let buffer = "";
       let cursor = 0;
       let selectedIndex = 0;
+      let scrollTop = 0;
       let renderedMenuLines = 0;
       let popupDismissed = false;
       if (!globalRawMode && process.stdin.isTTY) {
@@ -4194,6 +4561,47 @@ class InteractiveLineEditor {
         const matches = AVAILABLE_SLASH_COMMANDS.filter((cmd) => cmd.name.startsWith(term));
         return matches.length > 0 ? matches : AVAILABLE_SLASH_COMMANDS;
       };
+      const getActiveFileQuery = () => {
+        if (popupDismissed)
+          return null;
+        const beforeCursor = buffer.slice(0, cursor);
+        const match = beforeCursor.match(/(?:^|\s)@([^\s]*)$/);
+        if (!match)
+          return null;
+        const query = match[1] ?? "";
+        const atIndex = beforeCursor.lastIndexOf("@");
+        return { query, atIndex };
+      };
+      const getMatchingFiles = (fileQuery) => {
+        try {
+          return this.searchEngine.findFiles(this.cwd, {
+            pattern: fileQuery,
+            maxResults: 30
+          });
+        } catch {
+          return [];
+        }
+      };
+      const ensureVisible = (totalItems, visibleRows) => {
+        if (totalItems === 0 || visibleRows === 0) {
+          scrollTop = 0;
+          return;
+        }
+        if (selectedIndex < 0)
+          selectedIndex = 0;
+        if (selectedIndex >= totalItems)
+          selectedIndex = totalItems - 1;
+        if (selectedIndex < scrollTop) {
+          scrollTop = selectedIndex;
+        } else if (selectedIndex >= scrollTop + visibleRows) {
+          scrollTop = selectedIndex + 1 - visibleRows;
+        }
+        if (scrollTop < 0)
+          scrollTop = 0;
+        const maxScroll = Math.max(0, totalItems - visibleRows);
+        if (scrollTop > maxScroll)
+          scrollTop = maxScroll;
+      };
       const clearMenu = () => {
         if (renderedMenuLines > 0) {
           for (let i = 0;i < renderedMenuLines; i++) {
@@ -4207,28 +4615,79 @@ class InteractiveLineEditor {
       const redraw = () => {
         clearMenu();
         process.stdout.write(`\r\x1B[2K${this.promptSymbol}${buffer}`);
-        const matches = getMatchingCommands();
-        if (buffer.startsWith("/") && !popupDismissed && matches.length > 0) {
-          const maxVisible = Math.min(matches.length, 8);
-          if (selectedIndex >= matches.length)
-            selectedIndex = 0;
-          if (selectedIndex < 0)
-            selectedIndex = matches.length - 1;
+        const slashMatches = getMatchingCommands();
+        const activeFile = getActiveFileQuery();
+        const fileMatches = activeFile ? getMatchingFiles(activeFile.query) : [];
+        if (buffer.startsWith("/") && !popupDismissed && slashMatches.length > 0) {
+          const BOX_WIDTH = 70;
+          const maxVisible = Math.min(slashMatches.length, 7);
+          ensureVisible(slashMatches.length, maxVisible);
+          const visibleMatches = slashMatches.slice(scrollTop, scrollTop + maxVisible);
           const menuLines = [];
-          menuLines.push(`  ${style.dim("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510")}`);
-          for (let i = 0;i < maxVisible; i++) {
-            const cmd = matches[i];
-            const isSelected = i === selectedIndex;
+          menuLines.push(`  ${style.dim("\u250C" + "\u2500".repeat(BOX_WIDTH) + "\u2510")}`);
+          for (let i = 0;i < visibleMatches.length; i++) {
+            const cmd = visibleMatches[i];
+            const actualIdx = scrollTop + i;
+            const isSelected = actualIdx === selectedIndex;
             const marker = isSelected ? style.brand("\u276F") : " ";
-            const name = isSelected ? style.brandBold(cmd.name.padEnd(12)) : style.cyan(cmd.name.padEnd(12));
-            const desc = isSelected ? style.bold(cmd.description.padEnd(38)) : style.dim(cmd.description.padEnd(38));
-            menuLines.push(`  ${style.dim("\u2502")} ${marker} ${name} ${desc} ${style.dim("\u2502")}`);
+            const rawName = cmd.name.padEnd(13).slice(0, 13);
+            const rawDesc = cmd.description.length > 50 ? cmd.description.slice(0, 47) + "..." : cmd.description.padEnd(50);
+            const coloredName = isSelected ? style.brandBold(rawName) : style.cyan(rawName);
+            const coloredDesc = isSelected ? style.bold(rawDesc) : style.dim(rawDesc);
+            menuLines.push(`  ${style.dim("\u2502")} ${marker} ${coloredName}  ${coloredDesc}  ${style.dim("\u2502")}`);
           }
-          if (matches.length > maxVisible) {
-            const moreCount = matches.length - maxVisible;
-            menuLines.push(`  ${style.dim(`\u2502   ... and ${moreCount} more commands (use arrows to scroll)`).padEnd(68)} ${style.dim("\u2502")}`);
+          let footerMsg = "";
+          const moreAbove = scrollTop;
+          const moreBelow = Math.max(0, slashMatches.length - (scrollTop + visibleMatches.length));
+          if (moreAbove > 0 && moreBelow > 0) {
+            footerMsg = `  ... ${moreAbove} more above, ${moreBelow} more below (\u2191/\u2193 to scroll)`;
+          } else if (moreBelow > 0) {
+            footerMsg = `  ... and ${moreBelow} more commands (use arrows to scroll)`;
+          } else if (moreAbove > 0) {
+            footerMsg = `  ... and ${moreAbove} more commands above (use arrows to scroll)`;
+          } else {
+            footerMsg = `  ${slashMatches.length} commands (\u2191/\u2193 to navigate \u2022 Tab to select)`;
           }
-          menuLines.push(`  ${style.dim("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518")}`);
+          const footerPadded = footerMsg.padEnd(BOX_WIDTH).slice(0, BOX_WIDTH);
+          menuLines.push(`  ${style.dim("\u2502")}${style.dim(footerPadded)}${style.dim("\u2502")}`);
+          menuLines.push(`  ${style.dim("\u2514" + "\u2500".repeat(BOX_WIDTH) + "\u2518")}`);
+          for (const line of menuLines) {
+            process.stdout.write(`
+\x1B[2K${line}`);
+          }
+          renderedMenuLines = menuLines.length;
+          process.stdout.write(`\x1B[${renderedMenuLines}A`);
+        } else if (activeFile && !popupDismissed && fileMatches.length > 0) {
+          const BOX_WIDTH = 70;
+          const maxVisible = Math.min(fileMatches.length, 7);
+          ensureVisible(fileMatches.length, maxVisible);
+          const visibleMatches = fileMatches.slice(scrollTop, scrollTop + maxVisible);
+          const menuLines = [];
+          menuLines.push(`  ${style.dim("\u250C\u2500\u2500")} ${style.brandBold("Files")} ${style.dim("\u2500".repeat(Math.max(10, BOX_WIDTH - 9)) + "\u2510")}`);
+          for (let i = 0;i < visibleMatches.length; i++) {
+            const filePath = visibleMatches[i];
+            const actualIdx = scrollTop + i;
+            const isSelected = actualIdx === selectedIndex;
+            const marker = isSelected ? style.brand("\u276F") : " ";
+            const rawPath = filePath.length > 62 ? "..." + filePath.slice(filePath.length - 59) : filePath.padEnd(62);
+            const coloredPath = isSelected ? style.brandBold(rawPath) : style.cyan(rawPath);
+            menuLines.push(`  ${style.dim("\u2502")} ${marker} ${coloredPath} ${style.dim("\u2502")}`);
+          }
+          let footerMsg = "";
+          const moreAbove = scrollTop;
+          const moreBelow = Math.max(0, fileMatches.length - (scrollTop + visibleMatches.length));
+          if (moreAbove > 0 && moreBelow > 0) {
+            footerMsg = `  ... ${moreAbove} more above, ${moreBelow} more below (\u2191/\u2193 to scroll)`;
+          } else if (moreBelow > 0) {
+            footerMsg = `  ... and ${moreBelow} more files (use arrows \u2022 Tab to insert)`;
+          } else if (moreAbove > 0) {
+            footerMsg = `  ... and ${moreAbove} more files above (use arrows \u2022 Tab to insert)`;
+          } else {
+            footerMsg = `  ${fileMatches.length} files (\u2191/\u2193 to navigate \u2022 Tab to insert)`;
+          }
+          const footerPadded = footerMsg.padEnd(BOX_WIDTH).slice(0, BOX_WIDTH);
+          menuLines.push(`  ${style.dim("\u2502")}${style.dim(footerPadded)}${style.dim("\u2502")}`);
+          menuLines.push(`  ${style.dim("\u2514" + "\u2500".repeat(BOX_WIDTH) + "\u2518")}`);
           for (const line of menuLines) {
             process.stdout.write(`
 \x1B[2K${line}`);
@@ -4259,6 +4718,7 @@ class InteractiveLineEditor {
             buffer = "";
             cursor = 0;
             selectedIndex = 0;
+            scrollTop = 0;
             popupDismissed = false;
             redraw();
             return;
@@ -4290,10 +4750,24 @@ class InteractiveLineEditor {
           cleanupAndResolve("/exit");
           return;
         }
+        const slashMatches = getMatchingCommands();
+        const activeFile = getActiveFileQuery();
+        const fileMatches = activeFile ? getMatchingFiles(activeFile.query) : [];
         if (key.name === "return" || key.name === "enter") {
-          const matches = getMatchingCommands();
-          if (buffer.startsWith("/") && !popupDismissed && matches.length > 0 && selectedIndex >= 0 && selectedIndex < matches.length) {
-            const selected = matches[selectedIndex];
+          if (activeFile && !popupDismissed && fileMatches.length > 0) {
+            const chosen = fileMatches[selectedIndex] || fileMatches[0];
+            const beforeAt = buffer.slice(0, activeFile.atIndex);
+            const afterCursor = buffer.slice(cursor);
+            buffer = `${beforeAt}@${chosen} ${afterCursor}`;
+            cursor = beforeAt.length + chosen.length + 2;
+            selectedIndex = 0;
+            scrollTop = 0;
+            popupDismissed = false;
+            redraw();
+            return;
+          }
+          if (buffer.startsWith("/") && !popupDismissed && slashMatches.length > 0 && selectedIndex >= 0 && selectedIndex < slashMatches.length) {
+            const selected = slashMatches[selectedIndex];
             cleanupAndResolve(selected.name);
             return;
           }
@@ -4301,13 +4775,25 @@ class InteractiveLineEditor {
           return;
         }
         if (key.name === "tab") {
-          const matches = getMatchingCommands();
-          if (matches.length > 0) {
-            const match = matches[selectedIndex] || matches[0];
+          if (activeFile && !popupDismissed && fileMatches.length > 0) {
+            const chosen = fileMatches[selectedIndex] || fileMatches[0];
+            const beforeAt = buffer.slice(0, activeFile.atIndex);
+            const afterCursor = buffer.slice(cursor);
+            buffer = `${beforeAt}@${chosen} ${afterCursor}`;
+            cursor = beforeAt.length + chosen.length + 2;
+            selectedIndex = 0;
+            scrollTop = 0;
+            popupDismissed = false;
+            redraw();
+            return;
+          }
+          if (slashMatches.length > 0) {
+            const match = slashMatches[selectedIndex] || slashMatches[0];
             if (match) {
               buffer = match.name + " ";
               cursor = buffer.length;
               selectedIndex = 0;
+              scrollTop = 0;
               popupDismissed = false;
               redraw();
             }
@@ -4315,17 +4801,25 @@ class InteractiveLineEditor {
           return;
         }
         if (key.name === "up") {
-          const matches = getMatchingCommands();
-          if (matches.length > 0) {
-            selectedIndex = (selectedIndex - 1 + matches.length) % matches.length;
+          if (activeFile && fileMatches.length > 0) {
+            selectedIndex = (selectedIndex - 1 + fileMatches.length) % fileMatches.length;
+            redraw();
+            return;
+          }
+          if (slashMatches.length > 0) {
+            selectedIndex = (selectedIndex - 1 + slashMatches.length) % slashMatches.length;
             redraw();
             return;
           }
         }
         if (key.name === "down") {
-          const matches = getMatchingCommands();
-          if (matches.length > 0) {
-            selectedIndex = (selectedIndex + 1) % matches.length;
+          if (activeFile && fileMatches.length > 0) {
+            selectedIndex = (selectedIndex + 1) % fileMatches.length;
+            redraw();
+            return;
+          }
+          if (slashMatches.length > 0) {
+            selectedIndex = (selectedIndex + 1) % slashMatches.length;
             redraw();
             return;
           }
@@ -4349,6 +4843,7 @@ class InteractiveLineEditor {
             buffer = buffer.slice(0, cursor - 1) + buffer.slice(cursor);
             cursor--;
             selectedIndex = 0;
+            scrollTop = 0;
             popupDismissed = false;
             redraw();
           }
@@ -4358,6 +4853,7 @@ class InteractiveLineEditor {
           buffer = buffer.slice(0, cursor) + _str + buffer.slice(cursor);
           cursor += _str.length;
           selectedIndex = 0;
+          scrollTop = 0;
           popupDismissed = false;
           redraw();
         }
@@ -4371,6 +4867,7 @@ class InteractiveLineEditor {
 // src/cli/commands.ts
 var AVAILABLE_SLASH_COMMANDS = [
   { name: "/help", description: "Show command list and help menu" },
+  { name: "/stats", description: "Display session runtime, turn stats & sub-agent status" },
   { name: "/model", description: "Select or switch active AI model" },
   { name: "/models", description: "List available AI models from gateway" },
   { name: "/reasoning", description: "Toggle internal reasoning chain visibility" },
@@ -4397,6 +4894,11 @@ async function handleSlashCommand(input, ctx) {
     case "/help":
       printHelp();
       return true;
+    case "/stats":
+    case "/time":
+    case "/uptime":
+      printSessionStats(ctx);
+      return true;
     case "/model":
     case "/models":
       await handleModelSelection(ctx, args[0]);
@@ -4736,11 +5238,170 @@ function printSessions(ctx) {
   }
   console.log();
 }
+function printSessionStats(ctx) {
+  const uptimeMs = ctx.repl ? Date.now() - ctx.repl.sessionStartTime : 0;
+  const turns = ctx.repl?.turnCount ?? 0;
+  const history = ctx.session.getHistory();
+  const historyTokens = estimateTotalTokens(history);
+  const maxTokens = 128000;
+  const contextPct = Math.round(historyTokens / maxTokens * 100);
+  const colorFn = contextPct < 50 ? style.green : contextPct < 80 ? style.yellow : style.red;
+  const agents = ctx.spawner?.listAgents() || [];
+  const activeAgents = agents.filter((a) => a.status === "running");
+  console.log();
+  console.log(style.bold("  \u250C\u2500\u2500 Session Runtime & Statistics \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(`  \u2502  ${style.dim("Uptime:")}         ${style.bold(formatDuration(uptimeMs))}`);
+  console.log(`  \u2502  ${style.dim("Turns:")}          ${turns} completed`);
+  console.log(`  \u2502  ${style.dim("History Items:")}  ${history.length} items`);
+  console.log(`  \u2502  ${style.dim("Context Usage:")}  ${colorFn(`${contextPct}%`)} ${style.dim(`(~${historyTokens} tokens / ${maxTokens} max)`)}`);
+  console.log(`  \u2502  ${style.dim("Model:")}          ${style.brand(ctx.session.model)}`);
+  console.log(`  \u2502  ${style.dim("Working Dir:")}    ${style.dim(ctx.session.cwd)}`);
+  console.log("  \u2502");
+  if (agents.length === 0) {
+    console.log(`  \u2502  ${style.dim("Sub-agents:")}     None spawned yet`);
+  } else {
+    console.log(`  \u2502  ${style.bold("Sub-agents:")} (${activeAgents.length} active, ${agents.length - activeAgents.length} completed)`);
+    for (const a of agents) {
+      const runtime = formatDuration(Date.now() - a.createdAt);
+      const icon = a.status === "running" ? style.brand("\u25CF") : a.status === "completed" ? style.green("\u2714") : style.red("\u2717");
+      console.log(`  \u2502    ${icon} ${style.cyan(a.nickname)} [${style.dim(a.role)}] - ${a.status} (${runtime})`);
+      console.log(`  \u2502      ${style.dim(`Task: ${a.taskName}`)}`);
+    }
+  }
+  console.log(style.bold("  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log();
+}
+
+// src/cli/ui/prompt.ts
+import readline2 from "readline";
+async function promptChoice(config) {
+  const { message, choices, defaultIndex = 0 } = config;
+  if (!process.stdin.isTTY) {
+    if (!process.stdin.readable) {
+      return choices[defaultIndex]?.value ?? choices[0].value;
+    }
+    return new Promise((resolve13) => {
+      const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
+      const hint = choices.map((c3) => c3.isDefault ? `[${c3.key.toUpperCase()}]` : `[${c3.key}]`).join("/");
+      let resolved = false;
+      const doResolve = (val) => {
+        if (!resolved) {
+          resolved = true;
+          rl.close();
+          resolve13(val);
+        }
+      };
+      rl.question(`${message} ${hint}: `, (answer) => {
+        const trimmed = answer.trim().toLowerCase();
+        const matched = choices.find((c3) => c3.key.toLowerCase() === trimmed);
+        doResolve(matched ? matched.value : choices[defaultIndex].value);
+      });
+      rl.on("close", () => {
+        doResolve(choices[defaultIndex].value);
+      });
+    });
+  }
+  return new Promise((resolve13) => {
+    let selectedIndex = defaultIndex;
+    if (selectedIndex < 0 || selectedIndex >= choices.length)
+      selectedIndex = 0;
+    readline2.emitKeypressEvents(process.stdin);
+    const wasRaw = process.stdin.isRaw;
+    try {
+      process.stdin.setRawMode(true);
+    } catch {}
+    process.stdin.resume();
+    const render = () => {
+      const parts = choices.map((choice, idx) => {
+        const isSelected = idx === selectedIndex;
+        const keyTag = `[${choice.key}]`;
+        if (isSelected) {
+          return `${c.bgBrand}${c.white}${c.bold} \u276F ${keyTag} ${choice.label} ${c.reset}`;
+        }
+        return `${style.dim(`  ${keyTag} ${choice.label}`)}`;
+      });
+      process.stdout.write(`\r\x1B[2K  ${style.bold(message)}
+\r\x1B[2K${parts.join("  ")}`);
+    };
+    const cleanup = (confirmedChoice) => {
+      process.stdin.removeListener("keypress", onKeypress);
+      try {
+        process.stdin.setRawMode(wasRaw ?? false);
+      } catch {}
+      process.stdout.write(`\r\x1B[1A\r\x1B[2K  ${style.bold(message)} ${style.cyan(`[${confirmedChoice.key}] ${confirmedChoice.label}`)}
+\r\x1B[2K`);
+      resolve13(confirmedChoice.value);
+    };
+    const onKeypress = (_str, key) => {
+      if (!key)
+        return;
+      if (key.ctrl && key.name === "c") {
+        cleanup(choices.find((c3) => c3.key.toLowerCase() === "n") || choices[defaultIndex]);
+        return;
+      }
+      if (key.name === "escape") {
+        cleanup(choices.find((c3) => c3.key.toLowerCase() === "n") || choices[defaultIndex]);
+        return;
+      }
+      if (key.name === "return" || key.name === "enter") {
+        cleanup(choices[selectedIndex]);
+        return;
+      }
+      if (key.name === "left") {
+        selectedIndex = (selectedIndex - 1 + choices.length) % choices.length;
+        process.stdout.write("\x1B[1A");
+        render();
+        return;
+      }
+      if (key.name === "right" || key.name === "tab") {
+        selectedIndex = (selectedIndex + 1) % choices.length;
+        process.stdout.write("\x1B[1A");
+        render();
+        return;
+      }
+      const char = _str ? _str.toLowerCase() : key.name ? key.name.toLowerCase() : "";
+      if (char) {
+        const directMatch = choices.find((c3) => c3.key.toLowerCase() === char);
+        if (directMatch) {
+          cleanup(directMatch);
+          return;
+        }
+      }
+    };
+    process.stdin.on("keypress", onKeypress);
+    render();
+  });
+}
+async function promptToolApproval(params) {
+  const boxWidth = Math.min(process.stdout.columns ?? 80, 70);
+  const border = "\u2500".repeat(Math.max(10, boxWidth - 24));
+  console.log(`
+  ${style.yellow("\u250C\u2500\u2500")} ${style.bold("Approval Required")} ${style.yellow(border)}`);
+  console.log(`  ${style.yellow("\u2502")}  ${style.dim("Tool:")}    ${style.bold(params.toolName)}`);
+  if (params.command) {
+    console.log(`  ${style.yellow("\u2502")}  ${style.dim("Command:")} ${style.cyan(params.command)}`);
+  }
+  console.log(`  ${style.yellow("\u2502")}  ${style.dim("Reason:")}  ${style.dim(params.description)}`);
+  console.log(`  ${style.yellow("\u2514" + "\u2500".repeat(Math.max(10, boxWidth - 4)))}
+`);
+  const decision = await promptChoice({
+    message: "Allow execution?",
+    choices: [
+      { key: "y", label: "Yes", value: "yes", isDefault: true },
+      { key: "n", label: "No", value: "no" },
+      { key: "a", label: "Always allow this session", value: "always" }
+    ],
+    defaultIndex: 0
+  });
+  return decision;
+}
 
 // src/cli/ui/markdown.ts
 class MarkdownHighlighter {
   inCodeBlock = false;
   currentLanguage = "";
+  diffBuffer = [];
+  inDiffBlock = false;
   lineBuffer = "";
   static highlight(markdown) {
     const highlighter = new MarkdownHighlighter;
@@ -4774,17 +5435,53 @@ class MarkdownHighlighter {
       if (!this.inCodeBlock) {
         this.inCodeBlock = true;
         this.currentLanguage = fenceMatch[1] || "";
+        if (this.currentLanguage.toLowerCase() === "diff") {
+          this.inDiffBlock = true;
+          this.diffBuffer = [];
+          return "";
+        }
         const langBadge = this.currentLanguage ? ` ${style.brandBold(this.currentLanguage.toUpperCase())} ` : "";
         return `
   ${style.dim("\u250C\u2500\u2500")}${langBadge}${style.dim("\u2500".repeat(Math.max(10, 60 - (this.currentLanguage.length + 6))))}`;
       } else {
         this.inCodeBlock = false;
         this.currentLanguage = "";
+        if (this.inDiffBlock) {
+          this.inDiffBlock = false;
+          const raw = this.diffBuffer.join(`
+`);
+          this.diffBuffer = [];
+          const oldLines = [];
+          const newLines = [];
+          for (const l of raw.split(`
+`)) {
+            if (l.startsWith("-")) {
+              oldLines.push(l.slice(1));
+              newLines.push("");
+            } else if (l.startsWith("+")) {
+              oldLines.push("");
+              newLines.push(l.slice(1));
+            } else {
+              oldLines.push(l.startsWith(" ") ? l.slice(1) : l);
+              newLines.push(l.startsWith(" ") ? l.slice(1) : l);
+            }
+          }
+          const diffLines = parsePatch(oldLines.join(`
+`), newLines.join(`
+`), 3);
+          return `
+` + renderDiff(diffLines) + `
+`;
+        }
         return `  ${style.dim("\u2514" + "\u2500".repeat(60))}
 `;
       }
     }
     if (this.inCodeBlock) {
+      if (this.inDiffBlock) {
+        this.diffBuffer.push(line);
+        return "";
+      }
       const highlightedCode = this.highlightCode(line, this.currentLanguage);
       return `  ${style.dim("\u2502")} ${highlightedCode}`;
     }
@@ -4941,6 +5638,8 @@ ${style.bold(c.brightCyan + text.replace(/^##\s+/, "\u25A0 "))}${c.reset}`;
 // src/cli/repl.ts
 class CliRepl {
   showReasoning = false;
+  sessionStartTime = Date.now();
+  turnCount = 0;
   session;
   spawner;
   mcpManager;
@@ -4956,6 +5655,11 @@ class CliRepl {
   isClosed = false;
   highlighter = new MarkdownHighlighter;
   turnDoneResolver;
+  turnStartTime = 0;
+  turnToolCalls = [];
+  turnFilesModified = new Set;
+  turnCharsOut = 0;
+  activeToolArgs = {};
   constructor(options) {
     this.session = options.session;
     this.spawner = options.spawner;
@@ -4974,9 +5678,13 @@ class CliRepl {
       switch (msg.type) {
         case "TurnStarted":
           this.isProcessing = true;
+          this.turnCount++;
           this.currentTurnHasOutput = false;
           this.reasoningStarted = false;
-          this.highlighter = new MarkdownHighlighter;
+          this.turnStartTime = performance.now();
+          this.turnToolCalls = [];
+          this.turnFilesModified.clear();
+          this.turnCharsOut = 0;
           this.spinner.start("Thinking...");
           break;
         case "ReasoningDelta":
@@ -4985,7 +5693,7 @@ class CliRepl {
             if (!this.reasoningStarted) {
               this.spinner.stop();
               console.log(style.dim(`
-  \u250C\u2500\u2500 \uD83D\uDCAD Thinking \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`));
+  \u250C\u2500\u2500  Thinking \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`));
               this.reasoningStarted = true;
             }
             process.stdout.write(style.dim(msg.delta));
@@ -5004,6 +5712,7 @@ class CliRepl {
             this.spinner.stop();
             this.currentTurnHasOutput = true;
           }
+          this.turnCharsOut += msg.delta.length;
           if (this.currentTurnHasOutput) {
             const formatted = this.highlighter.feed(msg.delta);
             if (formatted) {
@@ -5019,13 +5728,18 @@ class CliRepl {
             this.reasoningStarted = false;
           }
           this.spinner.stop();
+          this.turnToolCalls.push(msg.toolName);
+          this.activeToolArgs = msg.arguments || {};
+          if ((msg.toolName === "apply_patch" || msg.toolName === "write_file") && msg.arguments && typeof msg.arguments.path === "string") {
+            this.turnFilesModified.add(msg.arguments.path);
+          }
           console.log();
-          formatToolCard(msg.toolName, msg.arguments);
-          this.spinner.start(`Executing ${msg.toolName}...`);
+          formatTaskStepStart(this.turnToolCalls.length, msg.toolName, msg.arguments);
+          this.spinner.start(`Executing [${this.turnToolCalls.length}] ${msg.toolName}...`);
           break;
         case "ToolCallFinished":
           this.spinner.stop();
-          formatToolCard(msg.toolName, {}, msg.output, msg.isError);
+          formatTaskStepFinish(this.turnToolCalls.length, msg.toolName, this.activeToolArgs, msg.output, msg.isError);
           break;
         case "InteractiveApprovalRequired":
         case "ApprovalRequired":
@@ -5045,11 +5759,26 @@ class CliRepl {
             process.stdout.write(flushed);
           }
           this.isProcessing = false;
-          console.log();
-          if (msg.totalTokens) {
-            console.log(style.dim(`[Turn completed | ${msg.totalTokens} tokens]`));
-          }
-          console.log();
+          const durationMs = this.turnStartTime > 0 ? performance.now() - this.turnStartTime : 0;
+          const sessionUptimeMs = Date.now() - this.sessionStartTime;
+          const subAgents = this.spawner?.listAgents().map((a) => ({
+            nickname: a.nickname,
+            role: a.role,
+            status: a.status,
+            runningTimeMs: Date.now() - a.createdAt
+          }));
+          formatTurnSummary({
+            durationMs,
+            inputTokens: msg.inputTokens,
+            outputTokens: msg.outputTokens || (this.turnCharsOut > 0 ? Math.round(this.turnCharsOut / 3.8) : undefined),
+            totalTokens: msg.totalTokens,
+            contextTokens: msg.contextTokens,
+            maxContextTokens: msg.maxContextTokens,
+            sessionUptimeMs,
+            subAgents,
+            toolCalls: this.turnToolCalls,
+            filesModified: Array.from(this.turnFilesModified)
+          });
           if (this.turnDoneResolver) {
             const resolve13 = this.turnDoneResolver;
             this.turnDoneResolver = undefined;
@@ -5078,35 +5807,34 @@ class CliRepl {
     });
   }
   async handleInteractiveApproval(msg) {
-    console.log();
-    console.log(style.yellow(`[!] Approval Required for action:`));
-    console.log(`    Tool: ${style.bold(msg.toolName)}`);
-    if (msg.command) {
-      console.log(`    Command: ${style.cyan(msg.command)}`);
-    }
-    console.log(`    Reason: ${style.dim(msg.description)}`);
     try {
-      const editor = new InteractiveLineEditor({ promptSymbol: style.bold(`
-Allow execution? [y/N]: `) });
-      const answer = (await editor.readLine()).trim().toLowerCase();
-      const approved = answer === "y" || answer === "yes";
-      this.session.resolveApproval(msg.approvalId, approved);
-      if (approved) {
+      const decision = await promptToolApproval(msg);
+      if (decision === "always") {
+        this.session.execPolicy.addRule(/.*/, "allow", "User allowed all actions for this session");
+        this.session.resolveApproval(msg.approvalId, true);
+        this.spinner.start(`Executing approved action (auto-approved for session)...`);
+      } else if (decision === "yes") {
+        this.session.resolveApproval(msg.approvalId, true);
         this.spinner.start(`Executing approved action...`);
       } else {
-        console.log(style.dim("Action rejected by user."));
+        this.session.resolveApproval(msg.approvalId, false);
+        console.log(style.dim("  Action rejected by user."));
       }
     } catch {
       this.session.resolveApproval(msg.approvalId, false);
     }
   }
   async start() {
+    const creds = new CredentialsStore().load();
+    const accountUser = creds?.user?.username || creds?.user?.email || (creds?.accessToken ? "Authenticated" : undefined);
     renderGroupyBanner({
+      user: accountUser,
       role: this.role,
       model: this.session.model,
       cwd: this.session.cwd
     });
     const editor = new InteractiveLineEditor({
+      cwd: this.session.cwd,
       onInterrupt: () => {
         if (this.isProcessing) {
           const activeTurn = this.session.getActiveTurn();
@@ -5330,7 +6058,7 @@ Execution failed: ${err instanceof Error ? err.message : String(err)}`));
 async function handleLogin(authClient, backendUrl) {
   const targetBackend = backendUrl || process.env.GROUPY_BACKEND_URL || "https://api.groupy-hub.store";
   console.log(style.brand(`
-\uD83D\uDD10 Logging into Backend: ${targetBackend}`));
+ Logging into Backend: ${targetBackend}`));
   try {
     const { authUrl, waitForToken } = await authClient.startOAuthFlow({
       backendUrl: targetBackend