oceancode 0.1.0 → 0.1.1

package/dist/{chunk-EB736JHH.js → chunk-U5PZQWEB.js}

@@ -63,7 +63,14 @@ var AGENT_SYSTEM_PROMPT = `You are OceanCode, an elite, autonomous AI software e
      \u2022 \u{1F522} Numbered Steps: Use numbered lists (1., 2., 3.) for chronological execution steps, install steps, or procedures.
      \u2022 \u{1F524} Bold & Code Highlights: Bold key concepts (**keyword**, **feature**) and use inline code (\`path/file.ts\`, \`function()\`) to clearly separate technical terms from explanation.
      \u2022 \u{1F4BB} Fenced Code Blocks: Always specify syntax language for code snippets (\`\`\`typescript, \`\`\`bash, etc.).
-     \u2022 \u2702\uFE0F Crisp Executive Summaries: Start with a brief, punchy overview, present the structured content (bullets), and finish with clear next steps.`;
+     \u2022 \u2702\uFE0F Crisp Executive Summaries: Start with a brief, punchy overview, present the structured content (bullets), and finish with clear next steps.
+7. CLEAN, TO THE POINT & DECORATIVE GREETINGS / RESPONSES:
+   - When introducing yourself, greeting the user, or providing project overviews:
+     \u2022 Keep it concise, punchy, decorative, and directly to the point \u2014 avoid rambling filler.
+     \u2022 Open with a stylish, clean greeting header (e.g. \u{1F30A} **OceanCode** \xB7 *<Project Name> Engineer*).
+     \u2022 Highlight capabilities with crisp emoji bullets (\u{1F680}, \u26A1, \u{1F527}, \u{1F50D}).
+     \u2022 Present project tech stack in a clean, compact markdown table.
+     \u2022 Finish with a friendly, direct prompt asking what the user wants to tackle.`;
 function setupServerConfig(oceanConfigDir) {
   const opencodeConfigDir = path.join(oceanConfigDir, "opencode");
   fs.mkdirSync(opencodeConfigDir, { recursive: true });
@@ -446,7 +453,6 @@ function renderTopBar(modelName, cwd = process.cwd()) {
   const width = Math.max(60, process.stdout.columns || 80);
   const folderStr = cwd.length > 35 ? "..." + cwd.slice(-32) : cwd;
   renderBigLogo(INDENT);
-  console.log("");
   const leftText = folderStr;
   const rightText = modelName + "  /help";
   const spaces = Math.max(2, width - (leftText.length + rightText.length + 6));
@@ -454,14 +460,16 @@ function renderTopBar(modelName, cwd = process.cwd()) {
     INDENT + chalk.dim(leftText) + " ".repeat(spaces) + chalk.hex(OCEAN_BLUE).bold(modelName) + "  " + chalk.dim("/help")
   );
   console.log(INDENT + chalk.dim("\u2500".repeat(Math.max(40, width - 4))));
-  console.log("");
 }
 function renderUserMessageCard(text, _modelName) {
   const width = Math.min(80, (process.stdout.columns || 80) - 4);
   const bar = chalk.hex(OCEAN_BLUE)("\u258C");
   const bg = chalk.bgHex("#161b22");
-  const pad = Math.max(2, width - text.length - 3);
-  console.log(bar + bg(" " + text + " ".repeat(pad)));
+  const lines = text.split("\n");
+  for (const l of lines) {
+    const pad = Math.max(2, width - l.length - 3);
+    console.log(bar + bg(" " + l + " ".repeat(pad)));
+  }
 }
 function renderFooter(modelName, durationSec, agent = "Build") {
   const icon = chalk.hex(OCEAN_BLUE)("\u25A3");
@@ -469,10 +477,7 @@ function renderFooter(modelName, durationSec, agent = "Build") {
   const dot = chalk.dim(" \xB7 ");
   const modelLabel = chalk.hex("#94a3b8")(modelName);
   const timeLabel = chalk.dim(`${durationSec.toFixed(1)}s`);
-  console.log(`
-
-${INDENT}${icon}  ${agentLabel}${dot}${modelLabel}${dot}${timeLabel}
-`);
+  console.log(`${INDENT}${icon}  ${agentLabel}${dot}${modelLabel}${dot}${timeLabel}`);
 }
 
 // src/ui/toolLabels.ts
@@ -555,7 +560,6 @@ function getFriendlyToolLabel(rawName) {
 }
 
 // src/ui/renderer.ts
-var BOTTOM_BAR_ROWS = 3;
 var StreamRenderer = class {
   reasoningStarted = false;
   textStarted = false;
@@ -566,42 +570,25 @@ var StreamRenderer = class {
   toolsUsed = [];
   thinkingTimer = null;
   thinkingFrame = 0;
-  /** Injected by interactive.ts — repaints the full bottom bar in place */
+  eraseBarFn = null;
   pinBarFn = null;
-  /** How many rows the bar currently occupies (updated by interactive.ts) */
-  barRows = BOTTOM_BAR_ROWS;
   /** Dedupe tracker: OpenCode emits pending → running → completed updates per tool part */
   seenTools = /* @__PURE__ */ new Map();
   /** Per-part streamed text length — prevents duplicate/lost output across parts */
   textLens = /* @__PURE__ */ new Map();
-  /** Throttle for bottom-bar repaints during streaming */
-  lastRepinAt = 0;
-  /** Call this from interactive.ts right after constructing StreamRenderer */
-  setPinBar(fn, rows) {
-    this.pinBarFn = fn;
-    const origFn = fn;
-    this.pinBarFn = () => {
-      this.barRows = rows();
-      origFn();
-    };
+  /** Wire the interactive bar renderer and eraser */
+  setPinBar(pinFn, eraseFn) {
+    this.pinBarFn = pinFn;
+    this.eraseBarFn = eraseFn;
+  }
+  getThinkingFrame() {
+    return this.thinkingFrame;
   }
-  // ── With scroll regions, bar rows are scroll-protected — no erasing needed ──
-  // Output always goes inside the scroll region; bar rows are untouched.
   eraseBar() {
+    this.eraseBarFn?.();
   }
-  /** Repaint the bar after a chunk of output (forced — for tool/finish boundaries) */
   repinBar() {
-    if (!this.pinBarFn) return;
-    this.lastRepinAt = Date.now();
-    this.pinBarFn();
-  }
-  /** Throttled repaint for hot paths (per-token streaming). Max ~4 repaints/sec. */
-  repinBarThrottled() {
-    if (!this.pinBarFn) return;
-    const now = Date.now();
-    if (now - this.lastRepinAt < 250) return;
-    this.lastRepinAt = now;
-    this.pinBarFn();
+    this.pinBarFn?.();
   }
   /** Collapse a tool detail to a single short line so long commands don't scroll */
   formatDetail(detail) {
@@ -623,35 +610,21 @@ var StreamRenderer = class {
     this.toolsUsed = [];
     this.seenTools.clear();
     this.textLens.clear();
-    this.lastRepinAt = 0;
+    this.thinkingFrame = 0;
+    this.repinBar();
     this.startThinkingAnimation();
   }
   startThinkingAnimation() {
     if (this.thinkingTimer) return;
-    const frames = [
-      chalk2.hex("#f59e0b").bold("  \u224B Thinking   "),
-      chalk2.hex("#fbbf24").bold("  \u224B Thinking.  "),
-      chalk2.hex("#fde68a").bold("  \u224B Thinking.. "),
-      chalk2.hex("#fef08a").bold("  \u224B Thinking..."),
-      chalk2.hex("#fde68a").bold("  \u224B Thinking.. "),
-      chalk2.hex("#fbbf24").bold("  \u224B Thinking.  "),
-      chalk2.hex("#f59e0b").bold("  \u224B Thinking   "),
-      chalk2.dim("  \u224B Thinking   ")
-    ];
-    const writeFrame = (frame) => {
-      process.stdout.write(`\r${frame}\x1B[K`);
-    };
-    writeFrame(frames[0]);
     this.thinkingTimer = setInterval(() => {
       this.thinkingFrame++;
-      writeFrame(frames[this.thinkingFrame % frames.length]);
-    }, 180);
+      this.repinBar();
+    }, 200);
   }
   stopThinkingAnimation() {
     if (!this.thinkingTimer) return;
     clearInterval(this.thinkingTimer);
     this.thinkingTimer = null;
-    process.stdout.write("\r\x1B[K");
   }
   // ── Public event handlers ────────────────────────────────────────────────────
   handleReasoning(fullText) {
@@ -674,22 +647,20 @@ var StreamRenderer = class {
     const action = chalk2.bold.hex("#60a5fa")(`${icon} ${label}`);
     const clean = this.formatDetail(detail);
     const info = clean ? chalk2.dim(`  ${clean}`) : "";
-    process.stdout.write(`
-${INDENT}${badge} ${action}${info}
+    process.stdout.write(`${INDENT}${badge} ${action}${info}
 `);
     this.repinBar();
     this.startThinkingAnimation();
   }
   handleDelta(delta, partId = "default") {
     if (!delta) return;
-    if (this.thinkingTimer) this.stopThinkingAnimation();
+    this.stopThinkingAnimation();
     if (!this.textStarted) {
       this.textStarted = true;
       this.eraseBar();
       if (this.toolsUsed.length > 0) {
         process.stdout.write(
           `${INDENT}${chalk2.green("\u2713")} ${chalk2.dim(`Used tools: ${this.toolsUsed.join(", ")}`)}
-
 `
         );
       }
@@ -697,16 +668,16 @@ ${INDENT}${badge} ${action}${info}
     this.currentTextLength += delta.length;
     this.textLens.set(partId, (this.textLens.get(partId) ?? 0) + delta.length);
     process.stdout.write(delta);
-    this.repinBarThrottled();
   }
   handleText(fullText, partId = "default") {
+    if (!fullText) return;
+    this.stopThinkingAnimation();
     if (!this.textStarted) {
       this.textStarted = true;
       this.eraseBar();
       if (this.toolsUsed.length > 0) {
         process.stdout.write(
           `${INDENT}${chalk2.green("\u2713")} ${chalk2.dim(`Used tools: ${this.toolsUsed.join(", ")}`)}
-
 `
         );
       }
@@ -717,7 +688,6 @@ ${INDENT}${badge} ${action}${info}
     this.textLens.set(partId, fullText.length);
     this.currentTextLength += slice.length;
     process.stdout.write(slice);
-    this.repinBarThrottled();
   }
   finish(agent = "Build") {
     this.stopThinkingAnimation();
@@ -1117,8 +1087,8 @@ async function runCommand(messages, options) {
         }
       }
       if (event.type === "message.part.delta") {
-        const partId = event.properties?.partID;
-        if (partId && reasoningPartIds.has(partId)) return;
+        const partId = event.properties?.partID || event.properties?.partId || event.properties?.id || "default";
+        if (reasoningPartIds.has(partId)) return;
         const delta = event.properties?.delta;
         const field = event.properties?.field;
         if (field === "text" && typeof delta === "string") {

package/dist/index.js

@@ -17,7 +17,7 @@ import {
   runCommand,
   saveProviderKey,
   validateProviderKey
-} from "./chunk-EB736JHH.js";
+} from "./chunk-U5PZQWEB.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -220,7 +220,7 @@ async function interactiveChatCommand(options) {
       lines.push(line);
     }
     if (lines.length > 0) {
-      const { runCommand: runCommand2 } = await import("./run-R7NU5EID.js");
+      const { runCommand: runCommand2 } = await import("./run-WPMSAWQ3.js");
       await runCommand2(lines, { model: currentBackendModel });
     }
     return;
@@ -246,17 +246,78 @@ async function interactiveChatCommand(options) {
   let lastUserMsgId = null;
   let lastSubmittedPrompt = "";
   const renderer = new StreamRenderer();
+  let currentScrollBottom = 0;
+  let contentRow = 8;
+  let lastBarStartRow = 0;
+  let lastBarLinesCount = 0;
+  const printToContent = (text) => {
+    if (!process.stdout.isTTY) {
+      process.stdout.write(text.endsWith("\n") ? text : text + "\n");
+      return;
+    }
+    process.stdout.write(`\x1B[${contentRow};1H`);
+    const formatted = text.endsWith("\n") ? text : text + "\n";
+    process.stdout.write(formatted);
+    const lineCount = (formatted.match(/\n/g) || []).length;
+    contentRow = Math.min(currentScrollBottom || 20, contentRow + lineCount);
+  };
+  const getBarMetrics = (linesCount) => {
+    const rows = process.stdout.rows || 24;
+    const barRows = linesCount;
+    const barStartRow = Math.max(1, rows - barRows + 1);
+    const scrollBottom = Math.max(1, barStartRow - 1);
+    return { rows, barRows, barStartRow, scrollBottom };
+  };
+  const applyScrollRegion = (scrollBottom) => {
+    if (!process.stdout.isTTY) return;
+    if (currentScrollBottom !== scrollBottom) {
+      currentScrollBottom = scrollBottom;
+      process.stdout.write(`\x1B[1;${scrollBottom}r`);
+    }
+  };
+  const resetScrollRegion = () => {
+    if (!process.stdout.isTTY) return;
+    const rows = process.stdout.rows || 24;
+    process.stdout.write(`\x1B[1;${rows}r`);
+    currentScrollBottom = 0;
+  };
+  const onSignal = () => {
+    cleanup();
+    process.exit(0);
+  };
+  process.on("SIGINT", onSignal);
+  process.on("SIGTERM", onSignal);
   const cleanup = () => {
+    process.off("SIGINT", onSignal);
+    process.off("SIGTERM", onSignal);
     if (activityTimeoutTimer) clearTimeout(activityTimeoutTimer);
     if (process.stdout.isTTY) {
-      process.stdout.write("\x1B[r");
-      process.stdout.write("\x1B[?25h");
+      process.stdout.off("resize", onResize);
+      resetScrollRegion();
+      const rows = process.stdout.rows || 24;
+      if (lastBarStartRow > 0) {
+        for (let r = lastBarStartRow; r < lastBarStartRow + lastBarLinesCount; r++) {
+          process.stdout.write(`\x1B[${r};1H\x1B[2K`);
+        }
+      }
+      process.stdout.write(`\x1B[${rows};1H
+\x1B[?25h`);
       try {
         process.stdin.setRawMode(false);
       } catch {
       }
     }
   };
+  const onResize = () => {
+    if (!process.stdout.isTTY) return;
+    const lines = buildBarLines();
+    const { scrollBottom } = getBarMetrics(lines.length);
+    applyScrollRegion(scrollBottom);
+    paintBar();
+  };
+  if (process.stdout.isTTY) {
+    process.stdout.on("resize", onResize);
+  }
   const resetActivityTimeout = () => {
     if (activityTimeoutTimer) clearTimeout(activityTimeoutTimer);
     activityTimeoutTimer = setTimeout(() => {
@@ -264,11 +325,9 @@ async function interactiveChatCommand(options) {
         isProcessing = false;
         renderer.finish(currentAgent === "build" ? "Build" : "Plan");
         const friendlyName = getFriendlyModelName(currentBackendModel);
-        process.stdout.write(
+        printToContent(
           chalk.yellow(
-            `
-\u26A0\uFE0F Operation timed out waiting for ${friendlyName}. You can retry or switch models with /models.
-`
+            `\u26A0\uFE0F Operation timed out waiting for ${friendlyName}. You can retry or switch models with /models.`
           )
         );
         render();
@@ -276,23 +335,6 @@ async function interactiveChatCommand(options) {
     }, 18e4);
     activityTimeoutTimer.unref();
   };
-  const BAR_ROWS = 3;
-  let currentBarRows = BAR_ROWS;
-  const applyScrollRegion = (rows) => {
-    const scrollBottom = Math.max(1, rows - currentBarRows);
-    process.stdout.write(`\x1B[1;${scrollBottom}r`);
-    process.stdout.write(`\x1B[${scrollBottom};1H`);
-  };
-  const paintBar = (lines) => {
-    const rows = process.stdout.rows || 24;
-    const barStartRow = rows - lines.length + 1;
-    for (let i = 0; i < lines.length; i++) {
-      process.stdout.write(`\x1B[${barStartRow + i};1H\x1B[2K`);
-      process.stdout.write(lines[i]);
-    }
-    const scrollBottom = Math.max(1, rows - lines.length);
-    process.stdout.write(`\x1B[${scrollBottom};1H`);
-  };
   const buildBarLines = () => {
     const cols = process.stdout.columns || 80;
     const friendlyModel = getFriendlyModelName(currentBackendModel);
@@ -316,7 +358,17 @@ async function interactiveChatCommand(options) {
       if (filtered.length === 0) {
         lines.push(chalk.dim("  No matching models found."));
       } else {
-        filtered.forEach((m, idx) => {
+        const MAX_MODELS = 6;
+        let startIdx = 0;
+        if (filtered.length > MAX_MODELS) {
+          startIdx = Math.max(0, Math.min(modelIndex - 2, filtered.length - MAX_MODELS));
+        }
+        const visibleModels = filtered.slice(startIdx, startIdx + MAX_MODELS);
+        if (filtered.length > MAX_MODELS) {
+          lines.push(chalk.dim(`  Models (${modelIndex + 1}/${filtered.length}) \xB7 \u2191/\u2193 to navigate`));
+        }
+        visibleModels.forEach((m, relIdx) => {
+          const idx = startIdx + relIdx;
           const isCurrent = m.id === currentBackendModel;
           const prefix = isCurrent ? "\u25CF " : "  ";
           const left = prefix + m.name;
@@ -377,15 +429,32 @@ async function interactiveChatCommand(options) {
         const matching = COMMANDS.filter((c) => c.name.startsWith(input));
         if (menuIndex >= matching.length) menuIndex = Math.max(0, matching.length - 1);
         if (matching.length > 0) {
-          matching.forEach((c, idx) => {
+          const MAX_VISIBLE = 6;
+          let startIdx = 0;
+          if (matching.length > MAX_VISIBLE) {
+            startIdx = Math.max(0, Math.min(menuIndex - 2, matching.length - MAX_VISIBLE));
+          }
+          const visible = matching.slice(startIdx, startIdx + MAX_VISIBLE);
+          lines.push(
+            chalk.dim(`  Commands (${menuIndex + 1}/${matching.length}) \xB7 \u2191/\u2193 navigate \xB7 Tab/Enter select \xB7 Esc cancel`)
+          );
+          visible.forEach((c, relIdx) => {
+            const absIdx = startIdx + relIdx;
+            const isSelected = absIdx === menuIndex;
             const row = "  " + c.name.padEnd(12) + c.desc;
             const padded = row + " ".repeat(Math.max(2, width - row.length));
-            lines.push(idx === menuIndex ? peachBg(padded) : chalk.white(row));
+            lines.push(isSelected ? peachBg(padded) : chalk.white(row));
           });
         }
       }
       const friendlyAgent = currentAgent === "build" ? "Build" : "Plan";
-      lines.push(`${bar} ${input}\u2588`);
+      if (isProcessing) {
+        const frameIdx = renderer.getThinkingFrame() % THINKING_FRAMES.length;
+        const thinkingText = THINKING_FRAMES[frameIdx].trim();
+        lines.push(`${bar} ${thinkingText}`);
+      } else {
+        lines.push(`${bar} ${input}\u2588`);
+      }
       lines.push(`${bar}`);
       lines.push(
         `  ${chalk.hex(OCEAN_BLUE).bold(friendlyAgent)} ${chalk.dim("\xB7")} ${chalk.white(friendlyModel)} ${chalk.dim("\xB7 OceanCode")}`
@@ -393,29 +462,51 @@ async function interactiveChatCommand(options) {
     }
     return lines;
   };
-  const render = () => {
-    if (!process.stdout.isTTY) return;
-    const lines = buildBarLines();
-    const rows = process.stdout.rows || 24;
-    if (lines.length !== currentBarRows) {
-      currentBarRows = lines.length;
-      applyScrollRegion(rows);
-    }
-    paintBar(lines);
-  };
-  const clearPromptArea = () => {
-    if (!process.stdout.isTTY) return;
-    const rows = process.stdout.rows || 24;
-    const barStartRow = rows - currentBarRows + 1;
-    for (let i = 0; i < currentBarRows; i++) {
-      process.stdout.write(`\x1B[${barStartRow + i};1H\x1B[2K`);
+  const paintBar = () => {
+    try {
+      if (!process.stdout.isTTY) return;
+      const lines = buildBarLines();
+      const { rows, barStartRow, scrollBottom } = getBarMetrics(lines.length);
+      applyScrollRegion(scrollBottom);
+      if (lastBarStartRow > 0) {
+        if (lastBarStartRow !== barStartRow) {
+          for (let r = lastBarStartRow; r < lastBarStartRow + lastBarLinesCount; r++) {
+            process.stdout.write(`\x1B[${r};1H\x1B[2K`);
+          }
+        } else if (lastBarLinesCount > lines.length) {
+          for (let r = barStartRow + lines.length; r < barStartRow + lastBarLinesCount; r++) {
+            process.stdout.write(`\x1B[${r};1H\x1B[2K`);
+          }
+        }
+      }
+      lastBarStartRow = barStartRow;
+      lastBarLinesCount = lines.length;
+      for (let i = 0; i < lines.length; i++) {
+        const r = barStartRow + i;
+        process.stdout.write(`\x1B[${r};1H\x1B[2K${lines[i]}`);
+      }
+      if (!isProcessing && mode === "normal") {
+        process.stdout.write("\x1B[?25h");
+        const inputLineIdx = Math.max(0, lines.length - 3);
+        const targetRow = barStartRow + inputLineIdx;
+        const col = Math.min(process.stdout.columns || 80, 3 + input.length);
+        process.stdout.write(`\x1B[${targetRow};${col}H`);
+      } else if (!isProcessing && mode === "model_selector") {
+        process.stdout.write("\x1B[?25h");
+        const col = Math.min(process.stdout.columns || 80, 9 + modelSearch.length);
+        process.stdout.write(`\x1B[${barStartRow + 1};${col}H`);
+      } else {
+        process.stdout.write("\x1B[?25l");
+        process.stdout.write(`\x1B[${contentRow};1H`);
+      }
+    } catch {
     }
-    const scrollBottom = Math.max(1, rows - currentBarRows);
-    process.stdout.write(`\x1B[${scrollBottom};1H`);
   };
+  const render = () => paintBar();
   renderer.setPinBar(
-    () => paintBar(buildBarLines()),
-    () => currentBarRows
+    () => paintBar(),
+    () => {
+    }
   );
   const reasoningPartIds = /* @__PURE__ */ new Set();
   const textPartIds = /* @__PURE__ */ new Set();
@@ -454,8 +545,8 @@ async function interactiveChatCommand(options) {
       }
     }
     if (event.type === "message.part.delta") {
-      const partId = event.properties?.partID;
-      if (partId && reasoningPartIds.has(partId)) return;
+      const partId = event.properties?.partID || event.properties?.partId || event.properties?.id || "default";
+      if (reasoningPartIds.has(partId)) return;
       const delta = event.properties?.delta;
       const field = event.properties?.field;
       if (field === "text" && typeof delta === "string") {
@@ -477,9 +568,7 @@ async function interactiveChatCommand(options) {
       renderer.finish(currentAgent === "build" ? "Build" : "Plan");
       const errObj = event.properties?.error;
       const errMsg = errObj?.message || errObj?.data?.message || (typeof errObj === "string" ? errObj : "Model request failed or timed out.");
-      console.error(chalk.red(`
-\u26A0\uFE0F Model Error (${getFriendlyModelName(currentBackendModel)}): ${errMsg}
-`));
+      printToContent(chalk.red(`\u26A0\uFE0F Model Error (${getFriendlyModelName(currentBackendModel)}): ${errMsg}`));
       render();
     }
   }, void 0, session.directory);
@@ -535,7 +624,6 @@ async function interactiveChatCommand(options) {
         if (str === "d" || str === "D") {
           const prov = SUPPORTED_BYOK_PROVIDERS[connectProviderIndex];
           removeProviderKey(prov.id);
-          clearPromptArea();
           console.log(chalk.yellow(`
 \u2713 Disconnected API key for ${prov.name}.
 `));
@@ -569,7 +657,6 @@ async function interactiveChatCommand(options) {
             connectStep = "provider_list";
             connectKeyInput = "";
             connectErrorMsg = "";
-            clearPromptArea();
             console.log(
               chalk.green(
                 `
@@ -631,11 +718,8 @@ async function interactiveChatCommand(options) {
         mode = "normal";
         input = "";
         modelSearch = "";
-        clearPromptArea();
         if (selectedFriendly) {
-          console.log(chalk.green(`
-\u2713 Active model changed to: ${selectedFriendly} (${selectedId})
-`));
+          printToContent(chalk.green(`\u2713 Active model changed to: ${selectedFriendly} (${selectedId})`));
         }
         render();
         return;
@@ -688,7 +772,7 @@ async function interactiveChatCommand(options) {
       input = "";
       menuIndex = 0;
       if (!submitted) {
-        render();
+        paintBar();
         return;
       }
       if (submitted === "/exit" || submitted === "/quit") {
@@ -700,68 +784,60 @@ async function interactiveChatCommand(options) {
         process.exit(0);
       }
       if (submitted === "/clear") {
-        clearPromptArea();
         if (process.stdout.isTTY) {
           process.stdout.write("\x1B[2J\x1B[H");
+          const { scrollBottom } = getBarMetrics(3);
+          applyScrollRegion(scrollBottom);
+          process.stdout.write("\x1B[1;1H");
         }
         renderTopBar(getFriendlyModelName(currentBackendModel));
-        render();
+        contentRow = 8;
+        lastBarStartRow = 0;
+        paintBar();
         return;
       }
       if (submitted === "/init") {
-        clearPromptArea();
         try {
           const res = initializeAgentsDoc(process.cwd());
-          console.log(chalk.green(`
-\u2714 ${res.summary}`));
-          console.log(chalk.dim(`  Location: ${res.filePath}
-`));
+          printToContent(`${chalk.green(`\u2714 ${res.summary}`)}
+${chalk.dim(`  Location: ${res.filePath}`)}`);
         } catch (err) {
-          console.error(chalk.red(`
-\u26A0\uFE0F Initialization failed: ${err.message}
-`));
+          printToContent(chalk.red(`\u26A0\uFE0F Initialization failed: ${err.message}`));
         }
         render();
         return;
       }
       if (submitted === "/new") {
-        clearPromptArea();
         try {
           session = await client.createSession("Ocean Session", process.cwd());
-          console.log(chalk.green("\n\u2714 Started a new coding session.\n"));
+          printToContent(chalk.green("\u2714 Started a new coding session."));
         } catch (err) {
-          console.error(chalk.red(`
-Failed to create new session: ${err.message}
-`));
+          printToContent(chalk.red(`Failed to create new session: ${err.message}`));
         }
         render();
         return;
       }
       if (submitted === "/undo") {
-        clearPromptArea();
         if (lastUserMsgId) {
           try {
             const success = await client.revertSession(session.id, lastUserMsgId);
             if (success) {
-              console.log(chalk.green("\n\u2714 Reverted the last AI action and restored previous file states.\n"));
+              printToContent(chalk.green("\u2714 Reverted the last AI action and restored previous file states."));
             } else {
-              console.log(chalk.yellow("\nCould not revert the last action.\n"));
+              printToContent(chalk.yellow("Could not revert the last action."));
             }
           } catch (err) {
-            console.error(chalk.red(`
-Revert failed: ${err.message}
-`));
+            printToContent(chalk.red(`Revert failed: ${err.message}`));
           }
         } else {
-          console.log(chalk.yellow("\nNo previous action found to undo.\n"));
+          printToContent(chalk.yellow("No previous action found to undo."));
         }
         render();
         return;
       }
       if (submitted === "/redo") {
         if (!lastSubmittedPrompt) {
-          clearPromptArea();
-          console.log(chalk.yellow("\nNo previous action to redo.\n"));
+          printToContent(chalk.yellow("No previous action to redo."));
           render();
           return;
         }
@@ -770,10 +846,9 @@ Revert failed: ${err.message}
       if (submitted.startsWith("/goal")) {
         const goalDesc = submitted.replace(/^\/goal\s*/, "").trim();
         if (!goalDesc) {
-          clearPromptArea();
-          console.log(
+          printToContent(
             chalk.yellow(
-              "\nPlease provide a goal description.\nUsage: /goal <your objective or feature description>\nExample: /goal Add user authentication with JWT and refresh tokens\n"
+              "Please provide a goal description.\nUsage: /goal <your objective or feature description>\nExample: /goal Add user authentication with JWT and refresh tokens"
             )
           );
           render();
@@ -794,22 +869,17 @@ Please accomplish this goal systematically:
         const provArg = parts[1]?.toLowerCase();
         const keyArg = parts[2];
         if (provArg && keyArg) {
-          clearPromptArea();
-          console.log(chalk.cyan(`
-Validating API key with ${provArg.toUpperCase()}...`));
+          printToContent(chalk.cyan(`Validating API key with ${provArg.toUpperCase()}...`));
           const val = await validateProviderKey(provArg, keyArg);
           if (val.valid) {
             saveProviderKey(provArg, keyArg);
-            console.log(
+            printToContent(
               chalk.green(
-                `\u2714 Successfully verified and connected ${provArg.toUpperCase()}! Its models are now unlocked in /models.
-`
+                `\u2714 Successfully verified and connected ${provArg.toUpperCase()}! Its models are now unlocked in /models.`
               )
             );
           } else {
-            console.error(chalk.red(`
-\u26A0\uFE0F Validation failed for ${provArg.toUpperCase()}: ${val.message}
-`));
+            printToContent(chalk.red(`\u26A0\uFE0F Validation failed for ${provArg.toUpperCase()}: ${val.message}`));
           }
           render();
           return;
@@ -824,16 +894,15 @@ Validating API key with ${provArg.toUpperCase()}...`));
         }
       }
       if (submitted.startsWith("/mcp")) {
-        clearPromptArea();
         const parts = submitted.split(" ").filter(Boolean);
         const sub = parts[1]?.toLowerCase();
         if (sub === "add") {
           const serverName = parts[2];
           const serverCmdOrUrl = parts.slice(3).join(" ");
           if (!serverName || !serverCmdOrUrl) {
-            console.log(
+            printToContent(
               chalk.yellow(
-                "\nUsage: /mcp add <server-name> <command-or-url>\nExamples:\n  /mcp add filesystem npx -y @modelcontextprotocol/server-filesystem .\n  /mcp add remote https://example.com/mcp\n"
+                "Usage: /mcp add <server-name> <command-or-url>\nExamples:\n  /mcp add filesystem npx -y @modelcontextprotocol/server-filesystem .\n  /mcp add remote https://example.com/mcp"
               )
             );
             render();
@@ -842,10 +911,8 @@ Validating API key with ${provArg.toUpperCase()}...`));
           const isUrl = serverCmdOrUrl.startsWith("http://") || serverCmdOrUrl.startsWith("https://");
           const mcpConfig = isUrl ? { type: "remote", url: serverCmdOrUrl, enabled: true } : { type: "local", command: serverCmdOrUrl.split(" "), enabled: true };
           saveMcpServer(serverName, mcpConfig);
-          console.log(
-            chalk.green(`
-\u2713 Added MCP server "${serverName}" (${mcpConfig.type}). Configured in opencode.json.
-`)
+          printToContent(
+            chalk.green(`\u2713 Added MCP server "${serverName}" (${mcpConfig.type}). Configured in opencode.json.`)
           );
           render();
           return;
@@ -854,9 +921,9 @@ Validating API key with ${provArg.toUpperCase()}...`));
         const live = await fetchLiveMcpStatus(baseUrl);
         const names = Array.from(/* @__PURE__ */ new Set([...Object.keys(configured), ...Object.keys(live)]));
         if (names.length === 0) {
-          console.log(
+          printToContent(
             chalk.dim(
-              "\nNo Model Context Protocol (MCP) servers configured.\n\nTo add an MCP server, run:\n  /mcp add <name> <command-or-url>\nExample:\n  /mcp add filesystem npx -y @modelcontextprotocol/server-filesystem .\n"
+              "No Model Context Protocol (MCP) servers configured.\n\nTo add an MCP server, run:\n  /mcp add <name> <command-or-url>\nExample:\n  /mcp add filesystem npx -y @modelcontextprotocol/server-filesystem ."
             )
           );
         } else {
@@ -869,15 +936,14 @@ Validating API key with ${provArg.toUpperCase()}...`));
             return `  \u2022 ${n} (${type}): ${badge}
     ${chalk.dim(target)}`;
           }).join("\n");
-          console.log(chalk.bold("\nModel Context Protocol (MCP) Servers:"));
-          console.log(lines);
-          console.log(chalk.dim("\nAdd new servers with: /mcp add <name> <command>\n"));
+          printToContent(
+            chalk.bold("Model Context Protocol (MCP) Servers:\n") + lines + chalk.dim("\n\nAdd new servers with: /mcp add <name> <command>")
+          );
         }
         render();
         return;
       }
       if (submitted === "/agent" || submitted.startsWith("/agent ") || submitted === "/mode" || submitted.startsWith("/mode ")) {
-        clearPromptArea();
         if (submitted.includes(" ")) {
           const target = submitted.split(" ")[1].toLowerCase().trim();
           if (target === "plan" || target === "build") {
@@ -888,43 +954,34 @@ Validating API key with ${provArg.toUpperCase()}...`));
         } else {
           currentAgent = currentAgent === "build" ? "plan" : "build";
         }
-        console.log(chalk.cyan(`
-\u2713 Switched mode to: ${currentAgent.toUpperCase()}
-`));
+        printToContent(chalk.cyan(`\u2713 Switched mode to: ${currentAgent.toUpperCase()}`));
         render();
         return;
       }
       if (submitted === "/diff") {
-        clearPromptArea();
         try {
           const diffs = await client.getSessionDiff(session.id);
           if (!diffs || diffs.length === 0) {
-            console.log(chalk.dim("\nNo file modifications recorded in the current session.\n"));
+            printToContent(chalk.dim("No file modifications recorded in the current session."));
           } else {
             const diffSummary = diffs.map(
               (d) => `  \u2022 ${d.path || d.file || "file"} (+${d.additions || 0} -${d.deletions || 0})`
             ).join("\n");
-            console.log(chalk.bold(`
-Modified Files (${diffs.length}):`));
-            console.log(diffSummary + "\n");
+            printToContent(chalk.bold(`Modified Files (${diffs.length}):
+`) + diffSummary);
           }
         } catch (err) {
-          console.error(chalk.red(`
-Failed to retrieve diff: ${err.message}
-`));
+          printToContent(chalk.red(`Failed to retrieve diff: ${err.message}`));
         }
         render();
         return;
       }
       if (submitted === "/compact") {
-        clearPromptArea();
         try {
           await client.summarizeSession(session.id);
-          console.log(chalk.green("\n\u2713 Session context memory compacted and summarized successfully.\n"));
+          printToContent(chalk.green("\u2713 Session context memory compacted and summarized successfully."));
         } catch (err) {
-          console.error(chalk.red(`
-Compact failed: ${err.message}
-`));
+          printToContent(chalk.red(`Compact failed: ${err.message}`));
         }
         render();
         return;
@@ -933,13 +990,10 @@ Compact failed: ${err.message}
         const parts = submitted.split(" ");
         const targetArg = parts.slice(1).join(" ").trim();
         if (targetArg) {
-          clearPromptArea();
           const resolvedId = getBackendModelId(targetArg);
           currentBackendModel = resolvedId;
           const friendly = getFriendlyModelName(resolvedId);
-          console.log(chalk.green(`
-\u2713 Switched model to: ${friendly} (${resolvedId})
-`));
+          printToContent(chalk.green(`\u2713 Switched model to: ${friendly} (${resolvedId})`));
           render();
           return;
         } else {
@@ -951,35 +1005,34 @@ Compact failed: ${err.message}
         }
       }
       if (submitted === "/help") {
-        clearPromptArea();
-        console.log(chalk.bold("\nAvailable Commands:"));
-        for (const c of COMMANDS) {
-          console.log(`  ${chalk.hex(OCEAN_BLUE).bold(c.name.padEnd(12))} ${chalk.dim(c.desc)}`);
-        }
-        console.log("");
+        const helpLines = [
+          chalk.bold("Available Commands:"),
+          ...COMMANDS.map((c) => `  ${chalk.hex(OCEAN_BLUE).bold(c.name.padEnd(12))} ${chalk.dim(c.desc)}`)
+        ].join("\n");
+        printToContent(helpLines);
         render();
         return;
       }
       if (submitted === "/info") {
-        clearPromptArea();
-        console.log(
-          `
-Session Details:
+        printToContent(
+          `Session Details:
   Model:     ${getFriendlyModelName(currentBackendModel)}
   Agent:     ${currentAgent.toUpperCase()}
   Directory: ${session.directory}
-  Session:   ${session.id}
-`
+  Session:   ${session.id}`
         );
         render();
         return;
       }
       const friendlyName = getFriendlyModelName(currentBackendModel);
-      clearPromptArea();
+      process.stdout.write(`\x1B[${contentRow};1H`);
       renderUserMessageCard(submitted, friendlyName);
+      const promptLines = submitted.split("\n").length;
+      contentRow = Math.min(currentScrollBottom || 20, contentRow + promptLines);
       isProcessing = true;
       userMsgId = null;
       lastSubmittedPrompt = submitted;
+      paintBar();
       resetActivityTimeout();
       renderer.start(friendlyName);
       client.promptSession(session.id, submitted, {
@@ -990,10 +1043,8 @@ Session Details:
         if (activityTimeoutTimer) clearTimeout(activityTimeoutTimer);
         isProcessing = false;
         renderer.finish(currentAgent === "build" ? "Build" : "Plan");
-        console.error(chalk.red(`
-\u26A0\uFE0F Prompt Error: ${err.message}
-`));
-        render();
+        printToContent(chalk.red(`\u26A0\uFE0F Prompt Error: ${err.message}`));
+        paintBar();
       });
       return;
     }
@@ -1012,20 +1063,13 @@ Session Details:
   };
   process.stdin.on("keypress", onKeypress);
   if (process.stdout.isTTY) {
-    process.stdout.on("resize", () => {
-      const rows = process.stdout.rows || 24;
-      applyScrollRegion(rows);
-      render();
-    });
-  }
-  if (process.stdout.isTTY) {
-    const rows = process.stdout.rows || 24;
-    process.stdout.write("\x1B[2J");
-    process.stdout.write("\x1B[H");
+    process.stdout.write("\x1B[2J\x1B[3J\x1B[H");
+    const { scrollBottom } = getBarMetrics(3);
+    applyScrollRegion(scrollBottom);
+    process.stdout.write("\x1B[1;1H");
     renderTopBar(getFriendlyModelName(currentBackendModel));
-    currentBarRows = BAR_ROWS;
-    applyScrollRegion(rows);
-    paintBar(buildBarLines());
+    contentRow = 8;
+    paintBar();
   }
 }
 
@@ -1090,7 +1134,7 @@ async function sessionCommand() {
       const date = new Date(s.time?.created || Date.now()).toLocaleDateString();
       const tokens = (s.tokens?.input || 0) + (s.tokens?.output || 0);
       console.log(`${indent}${chalk3.cyan(s.id.slice(0, 16))}  ${chalk3.bold.white(s.title || "Untitled")}`);
-      console.log(`${indent}  ${chalk3.dim(date)} \uFFFD ${chalk3.dim(`${tokens} tokens`)} \uFFFD ${chalk3.dim(s.directory)}`);
+      console.log(`${indent}  ${chalk3.dim(date)} \xB7 ${chalk3.dim(`${tokens} tokens`)} \xB7 ${chalk3.dim(s.directory)}`);
       console.log("");
     }
   } catch (err) {
@@ -1139,7 +1183,19 @@ program.name("oceancode").description("Ocean CLI: Next-generation AI coding assi
 ${getBigLogo()}
 `);
 program.option("-m, --model <model>", "Model to use (default: opencode/muse-spark-1.3-contributor-free [1M Context])").action(async (options) => {
-  await interactiveChatCommand({ model: options.model });
+  try {
+    await interactiveChatCommand({ model: options.model });
+  } catch (err) {
+    if (process.stdout.isTTY) {
+      const rows = process.stdout.rows || 24;
+      process.stdout.write(`\x1B[1;${rows}r\x1B[?25h
+`);
+    }
+    console.error(chalk5.red(`
+An error occurred: ${err?.message || err}
+`));
+    process.exit(1);
+  }
 });
 program.command("run [message...]").description("Run a prompt or instruction directly").option("-m, --model <model>", "Model to use (default: opencode/muse-spark-1.3-contributor-free)").option("-a, --agent <agent>", "Agent mode (default: build)").option("--auto", "Auto-approve tool permissions").action(async (messages, options, cmd) => {
   const opts = cmd?.optsWithGlobals ? cmd.optsWithGlobals() : options;

package/dist/{run-R7NU5EID.js → run-WPMSAWQ3.js}

@@ -1,6 +1,6 @@
 import {
   runCommand
-} from "./chunk-EB736JHH.js";
+} from "./chunk-U5PZQWEB.js";
 export {
   runCommand
 };

package/package.json

@@ -1,28 +1,28 @@
 {
   "name": "oceancode",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Next-generation CLI coding assistant powered by OpenCode server",
   "main": "dist/index.js",
   "bin": {
-    "oceancode": "./dist/index.js",
-    "ocean": "./dist/index.js"
+    "oceancode": "dist/index.js",
+    "ocean": "dist/index.js"
   },
-  "type": "module",
-  "files": [
-    "dist",
-    "scripts/postinstall.mjs",
-    "README.md",
-    "LICENSE"
-  ],
-  "engines": {
-    "node": ">=18"
-  },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsx src/index.ts",
-    "start": "node dist/index.js",
-    "postinstall": "node ./scripts/postinstall.mjs",
-    "prepublishOnly": "npm run build"
+  "type": "module",
+  "files": [
+    "dist",
+    "scripts/postinstall.mjs",
+    "README.md",
+    "LICENSE"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsx src/index.ts",
+    "start": "node dist/index.js",
+    "postinstall": "node ./scripts/postinstall.mjs",
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "ai",
@@ -33,13 +33,13 @@
   ],
   "author": "",
   "license": "MIT",
-  "dependencies": {
-    "@inquirer/prompts": "^7.3.2",
-    "chalk": "^5.4.1",
-    "commander": "^13.1.0",
-    "dotenv": "^16.4.7",
-    "opencode-ai": "^1.18.29",
-    "ora": "^8.2.0"
+  "dependencies": {
+    "@inquirer/prompts": "^7.3.2",
+    "chalk": "^5.4.1",
+    "commander": "^13.1.0",
+    "dotenv": "^16.4.7",
+    "opencode-ai": "^1.18.29",
+    "ora": "^8.2.0"
   },
   "devDependencies": {
     "@types/node": "^22.13.5",
@@ -47,4 +47,4 @@
     "tsx": "^4.19.3",
     "typescript": "^5.7.3"
   }
-}
+}