deepseek-cli-mode 1.0.1 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 1.1.0 — Claude-Code-style terminal UI
+
+- New welcome panel: rounded box with version, model, cwd, and first-run hints.
+- Prompt is now `> `; each turn ends with a dim status line (`model · tokens · seconds`).
+- Tool activity renders as `⏺ Tool(args)` followed by a `⎿ result` summary line.
+- Animated `✻ Thinking… (Ns · ctrl+c to interrupt)` spinner while the model works.
+- Permission prompts use the numbered `Do you want to allow …? 1. Yes / 2. No` dialog.
+- Todo list uses `☒`/`☐` checkboxes and prints only changed items after the first render.
+- New `/status` command (session, model, cwd, mode, token pressure); `/session` kept.
+- Security: all new rendering paths pass model/repository text through the existing
+  control-character sanitizer; no new process, network, or filesystem surfaces were added.
+
+## 1.0.2 — runtime discovery fixes
+
+- `resolveDshBin()` now also looks for `@deepseek-ai/dsh` next to this package (same `node_modules`) and in the
+  `node_modules` of every directory on `PATH`. This fixes "cannot find @deepseek-ai/dsh" when dsh is installed under a
+  custom npm prefix (including Windows drive-relative prefixes such as `E:\root\.npm-global`).
+- The not-found message now explains the Windows drive-relative `prefix=/root/.npm-global` pitfall and points at
+  `npm root -g`.
+
 ## 1.0.1 — security fixes
 
 Fixes from an independent security audit (Cloudflare `security-audit` skill, quick profile).

package/README.md

@@ -12,6 +12,31 @@ interactive **CLI** that boots the *same* Harness runtime (`dsh-base` + `dsh-hea
 session persistence, approvals) and keeps **one live Agent for the whole session**, so multi-turn context, tool state,
 and the model's request prefix stay warm between messages.
 
+The terminal UI follows the Claude Code layout:
+
+```
+╭──────────────────────────────────────────────────────╮
+│ ✻ DeepSeek CLI 1.1.0                                 │
+│                                                      │
+│   /help for help · /status for your current setup    │
+│   model: deepseek-official/deepseek-chat             │
+│   cwd:   C:\work\my-project                          │
+╰──────────────────────────────────────────────────────╯
+
+> explain what changed and run the tests
+
+⏺ glob(**/*.ts)
+  ⎿  src/app.ts src/auth.ts tests/auth.spec.ts
+✻ Thinking… (2s · ctrl+c to interrupt)
+
+⏺ pwsh(npm test)
+  ⎿  Tests: 42 passed, 42 total
+
+The auth change is safe; all tests pass.
+
+  ✻ deepseek-official/deepseek-chat · 8.4k tokens · 12.1s
+```
+
 ```
 ❯ explain what changed in this repo and run the tests
 
@@ -125,6 +150,7 @@ deepseek "review @src/app.ts and tell me what is risky"
 | `/export [file]` | write this run's transcript as markdown |
 | `/thinking` | print the last turn's reasoning (collapsed by default) |
 | `/session` | print the current session id (for `--resume`) |
+| `/status` | session, model, cwd, mode, and token pressure |
 | `/clear` | clear the screen |
 | `/quit`, `/exit` | leave (Ctrl+C at an empty prompt also exits) |
 

package/bin/deepseek.js

@@ -12,7 +12,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { dirname, delimiter, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const here = dirname(fileURLToPath(import.meta.url));
@@ -81,6 +81,9 @@ Requires a local install of @deepseek-ai/dsh (npm i -g @deepseek-ai/dsh).`);
 function resolveDshBin() {
   const candidates = [
     process.env.DSH_CLI_DSH_BIN,
+    // Sibling install: dsh next to this package in the same node_modules.
+    // This is the normal layout when both were installed with one npm prefix.
+    join(root, "..", "@deepseek-ai", "dsh", "lib", "bin.js"),
     // Same global prefix as this node binary (npm default layout).
     join(dirname(process.execPath), "node_modules", "@deepseek-ai", "dsh", "lib", "bin.js"),
     // Common global prefixes.
@@ -96,6 +99,14 @@ function resolveDshBin() {
     candidates.push(join(process.cwd(), "node_modules", "@deepseek-ai", "dsh", "lib", "bin.js"));
   }
   for (const candidate of candidates) if (existsSync(candidate)) return candidate;
+  // npm's own bin directories are on PATH; check their sibling node_modules.
+  // This covers custom prefixes (and Windows drive-relative prefixes) that the
+  // fixed candidates above cannot know about.
+  for (const dir of String(process.env.PATH ?? "").split(delimiter)) {
+    if (dir === "") continue;
+    const candidate = join(dir, "node_modules", "@deepseek-ai", "dsh", "lib", "bin.js");
+    if (existsSync(candidate)) return candidate;
+  }
   // Resolve only from this package's own module graph (never from cwd).
   try {
     return requireFromHere.resolve("@deepseek-ai/dsh/lib/bin.js");
@@ -204,8 +215,10 @@ const dshBin = resolveDshBin();
 if (dshBin === undefined) {
   console.error(
     "deepseek: cannot find @deepseek-ai/dsh.\n" +
-      "  Install it once:  npm i -g @deepseek-ai/dsh\n" +
-      "  Or point DSH_CLI_DSH_BIN at .../@deepseek-ai/dsh/lib/bin.js"
+      "  Install it once in the same npm prefix as this CLI:  npm i -g @deepseek-ai/dsh\n" +
+      "  Or point DSH_CLI_DSH_BIN at .../@deepseek-ai/dsh/lib/bin.js\n" +
+      "  If it is installed but not found, check `npm root -g` (a POSIX-style npm prefix such as\n" +
+      "  /root/.npm-global resolves per drive on Windows; use C:\\... instead)."
   );
   process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepseek-cli-mode",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Terminal (CLI) mode for DeepSeek Harness — an interactive, Claude Code-style coding agent for your shell.",
   "type": "module",
   "main": "index.js",

package/runner/runner.js

@@ -210,6 +210,9 @@ function createRenderer({ write, capture }) {
     get lastTodos() {
       return lastTodos;
     },
+    get turnUsage() {
+      return { ...turnUsage };
+    },
     resetTurn() {
       streamedThisTurn = false;
       reasoning = "";
@@ -246,15 +249,24 @@ function createRenderer({ write, capture }) {
         case "tool/call": {
           if (data.name === "todo_write") break; // the checklist below is the presentation
           endLine();
-          const icon = TOOL_ICONS[data.name] ?? "⏺";
           const preview = previewToolCall(data.name, data.arguments);
-          write(paint(ansi.dim, paint(ansi.italic, `  ${icon} ${data.name}${preview ? " " + preview : ""}`)) + "\n");
+          write(
+            paint(ansi.cyan, "⏺ ") +
+              paint(ansi.bold, sanitize(data.name)) +
+              paint(ansi.dim, `(${preview})`) +
+              "\n"
+          );
           break;
         }
         case "tool/result": {
-          if (data.error) {
-            write(paint(ansi.dim, paint(ansi.italic, `  ✗ ${sanitize(data.error.name)}: ${sanitize(data.error.code)}`)) + "\n");
+          let summary;
+          if (data.error) summary = `Error: ${sanitize(data.error.name)}${data.error.code ? ` (${sanitize(data.error.code)})` : ""}`;
+          else {
+            const content = data.message?.content ?? [];
+            const text = content.filter((b) => b.type === "text").map((b) => b.text).join(" ").replace(/\s+/g, " ").trim();
+            summary = text === "" ? "Done" : truncate(text, 76);
           }
+          write(paint(ansi.dim, `  ⎿  ${sanitize(summary)}`) + "\n");
           break;
         }
         case "assistant/message": {
@@ -280,15 +292,15 @@ function createRenderer({ write, capture }) {
           endLine();
           flushText();
           const done = todos.filter((todo) => todo.status === "completed").length;
-          write(paint(ansi.dim, `  ☑ todos ${done}/${todos.length}`) + "\n");
+          write(paint(ansi.dim, `  ☒ todos ${done}/${todos.length}`) + "\n");
           // Print the whole list once; later writes show only the items that moved.
           const shown = firstRender ? todos : todos.filter((todo) => previous.get(todo.content) !== todo.status);
           for (const todo of shown) {
             const mark =
               todo.status === "completed"
-                ? paint(ansi.green, "✓")
+                ? paint(ansi.green, "☒")
                 : todo.status === "in_progress"
-                  ? paint(ansi.yellow, "▸")
+                  ? paint(ansi.yellow, "☐")
                   : paint(ansi.dim, "☐");
             const content = todo.status === "completed" ? paint(ansi.dim, sanitize(todo.content)) : sanitize(todo.content);
             write(`    ${mark} ${content}\n`);
@@ -442,32 +454,43 @@ function printSessionList(sessions, write = out) {
     write(paint(ansi.dim, "  no sessions in this directory yet\n"));
     return;
   }
-  write(`  Recent sessions in ${process.cwd()}:\n`);
+  write(`  Recent sessions in ${sanitize(process.cwd())}:\n`);
   sessions.slice(0, 10).forEach((session, index) => {
     const running = session.openTurn ? paint(ansi.yellow, "  ▶ running") : "";
-    write(`   ${paint(ansi.cyan, String(index + 1))}) ${paint(ansi.dim, session.id)}  (${paint(ansi.dim, timeAgo(session.mtime))})${running}\n`);
+    write(`   ${paint(ansi.cyan, String(index + 1))}) ${paint(ansi.dim, sanitize(session.id))}  (${paint(ansi.dim, timeAgo(session.mtime))})${running}\n`);
   });
 }
 
 // ---------------------------------------------------------------------------
-// Help / banner
+// Help / welcome
 // ---------------------------------------------------------------------------
+/** Draw a rounded box, truncating content to the terminal width. */
+function box(lines, minWidth = 56) {
+  const cols = Math.max(40, Math.min(process.stdout.columns || 88, 100));
+  const width = Math.min(cols - 2, Math.max(minWidth, ...lines.map((line) => line.length + 4)));
+  const inner = width - 4;
+  const outLines = [];
+  outLines.push(paint(ansi.dim, "╭" + "─".repeat(width - 2) + "╮"));
+  for (const line of lines) {
+    let text = line;
+    if (text.length > inner) text = text.slice(0, inner - 1) + "…";
+    outLines.push(paint(ansi.dim, "│ ") + text.padEnd(inner) + paint(ansi.dim, " │"));
+  }
+  outLines.push(paint(ansi.dim, "╰" + "─".repeat(width - 2) + "╯"));
+  for (const line of outLines) out(line + "\n");
+}
+
 function printBanner(model) {
-  const art = [
-    "        ooo",
-    '       " """',
-    '      "   "',
-    '   ___:____      "  "|',
-    " ,'        \\.     \\//",
-    " |  O        \\___/  |",
-    "~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~",
-  ];
+  const modelLine = sanitize(`${model.provider}/${model.model}${model.reasoningEffort ? ` · ${model.reasoningEffort}` : ""}`);
   out("\n");
-  for (const line of art) out(paint(ansi.blue, line) + "\n");
-  out(`${paint(ansi.bold, "deepseek")} ${paint(ansi.dim, VERSION)} — DeepSeek Harness in your terminal\n`);
-  out(paint(ansi.dim, `model: ${model.provider}/${model.model}${model.reasoningEffort ? ` · ${model.reasoningEffort}` : ""}`) + "\n");
-  out(paint(ansi.dim, `cwd: ${process.cwd()}`) + "\n");
-  out(paint(ansi.dim, "type /help for commands, Ctrl+C to interrupt or exit") + "\n\n");
+  box([
+    `${paint(ansi.cyan, "✻")} ${paint(ansi.bold, "DeepSeek CLI")} ${paint(ansi.dim, VERSION)}`,
+    "",
+    paint(ansi.dim, "  /help for help · /status for your current setup"),
+    paint(ansi.dim, `  model: ${modelLine}`),
+    paint(ansi.dim, `  cwd:   ${sanitize(process.cwd())}`),
+  ]);
+  out(paint(ansi.dim, "  Type a task, or /help. Ctrl+C interrupts; twice exits.") + "\n\n");
 }
 
 function printHelp(write = out) {
@@ -498,6 +521,7 @@ Interactive commands:
   /export [file]     write this run's transcript as markdown
   /thinking          show the last turn's reasoning
   /session           print the current session id (for --resume)
+  /status            session, model, cwd, token pressure
   /clear             clear the screen
   /quit, /exit       leave (also Ctrl+C at an empty prompt)
 
@@ -576,6 +600,7 @@ async function run(ctx, options, exit) {
   const planMode = ctx.get("planMode");
   const permissionPresets = ctx.get("permissionPresets");
   const attachments = ctx.get("attachments");
+  const tokenMeter = ctx.get("tokenMeter");
 
   if (options.list) {
     printSessionList(listSessions());
@@ -783,24 +808,63 @@ async function run(ctx, options, exit) {
   // ---- agent lifecycle ----------------------------------------------------
   const makeAgentOptions = () => ({ ...selectionRef.current });
 
+  // ---- Claude-style activity indicator ------------------------------------
+  let spinnerTimer = null;
+  let spinnerIndex = 0;
+  let spinnerActive = false;
+  const SPINNER = ["✻", "✳", "✶", "✳"];
+
+  function startSpinner(label = "Thinking") {
+    if (!tty || options.mode === "oneshot" || spinnerActive) return;
+    spinnerActive = true;
+    spinnerIndex = 0;
+    const started = Date.now();
+    out("\x1b[?25l");
+    const tick = () => {
+      const glyph = SPINNER[spinnerIndex++ % SPINNER.length];
+      const seconds = Math.floor((Date.now() - started) / 1000);
+      out(`\r\x1b[2K${paint(ansi.dim, `${glyph} ${label}… (${seconds}s · ctrl+c to interrupt)`)}`);
+    };
+    tick();
+    spinnerTimer = setInterval(tick, 120);
+  }
+
+  function stopSpinner() {
+    if (!spinnerActive) return;
+    spinnerActive = false;
+    if (spinnerTimer !== null) {
+      clearInterval(spinnerTimer);
+      spinnerTimer = null;
+    }
+    out("\r\x1b[2K\x1b[?25h");
+  }
+
   const wire = (agent) => {
     agent.ctx.on("session/event", (session, event) => {
-      if (session === agent.session) renderer.event(event);
+      if (session === agent.session) {
+        stopSpinner();
+        renderer.event(event);
+      }
     });
     agent.ctx.on("agent/assistant-stream", (payload) => {
-      if (payload.agent === agent) renderer.frame(payload.frame);
+      if (payload.agent === agent) {
+        stopSpinner();
+        renderer.frame(payload.frame);
+      }
     });
     agent.ctx.on("user-questions/request", async (request) => answerQuestions(request));
     agent.ctx.on("approval/request", async (request) => {
-      const toolName = request.toolName ?? "tool";
+      const toolName = sanitize(request.toolName ?? "tool");
       if (autoYes) return "allowed-once";
-      if (request.reason) {
-        out(paint(ansi.dim, paint(ansi.italic, `  ⚠ ${toolName} needs approval: ${request.reason}`)) + "\n");
-      }
+      stopSpinner();
       if (!interactive || !process.stdin.isTTY) return "rejected";
-      const answer = await ask(paint(ansi.yellow, `  ⚠ Allow ${paint(ansi.cyan, toolName)}? `) + paint(ansi.dim, "[y/N] "));
-      if (answer === null) return "rejected";
-      return /^y(es)?$/i.test(answer.trim()) ? "allowed-once" : "rejected";
+      out("\n");
+      if (request.reason) out(paint(ansi.dim, `  ${sanitize(request.reason)}`) + "\n");
+      out(`  ${paint(ansi.bold, "Do you want to allow")} ${paint(ansi.cyan, toolName)}${paint(ansi.bold, "?")}\n`);
+      out(`    ${paint(ansi.cyan, "1")}. Yes\n    ${paint(ansi.cyan, "2")}. No\n`);
+      const answer = (await ask(paint(ansi.green, "  ❯ "))) ?? "";
+      const choice = answer.trim().toLowerCase();
+      return choice === "1" || choice === "y" || choice === "yes" ? "allowed-once" : "rejected";
     });
   };
 
@@ -836,17 +900,26 @@ async function run(ctx, options, exit) {
     busy = true;
     cancelSent = false;
     renderer.resetTurn();
+    const startedAt = Date.now();
     setPaused(true);
+    startSpinner("Thinking");
     try {
       agent.followup(createUserMessage({ content, source: { kind: "user" } }));
       await agent.whenIdle();
       await persistence.flush();
     } finally {
+      stopSpinner();
       busy = false;
       setPaused(false);
       if (renderer.lastAssistantText && renderer.lastAssistantText !== previousAnswer) {
         transcript.push({ role: "assistant", text: renderer.lastAssistantText });
       }
+      if (interactive && tty) {
+        const usage = renderer.turnUsage;
+        const seconds = ((Date.now() - startedAt) / 1000).toFixed(1);
+        const tokens = usage.input + usage.output;
+        out(paint(ansi.dim, `  ✻ ${sanitize(modelDesc())}${tokens > 0 ? ` · ${formatTokens(tokens)} tokens` : ""} · ${seconds}s`) + "\n\n");
+      }
     }
   };
 
@@ -1057,7 +1130,7 @@ async function run(ctx, options, exit) {
   try {
     agent = resumeTarget ? await startAgent(undefined, resumeTarget) : await startAgent(SessionId(`session-${randomUUID()}`), undefined);
   } catch (error) {
-    err(`deepseek: cannot start a session: ${error instanceof Error ? error.message : String(error)}\n`);
+    err(`deepseek: cannot start a session: ${sanitize(describeError(error))}\n`);
     await shutdown(1);
     return;
   }
@@ -1070,14 +1143,14 @@ async function run(ctx, options, exit) {
 
   printBanner(selectionRef.current);
   if (resumeTarget) {
-    out(paint(ansi.green, `▶ resumed `) + paint(ansi.dim, resumeTarget) + "\n");
+    out(paint(ansi.green, `▶ resumed `) + paint(ansi.dim, sanitize(resumeTarget)) + "\n");
     out(paint(ansi.dim, "  (history is in the session log; continue the conversation below)") + "\n\n");
   } else {
-    out(paint(ansi.dim, `session: ${agent.session.id}  (resume with: deepseek --resume ${agent.session.id})`) + "\n\n");
+    out(paint(ansi.dim, `session: ${sanitize(agent.session.id)}  (resume with: deepseek --resume ${sanitize(agent.session.id)})`) + "\n\n");
   }
 
   while (!quitting) {
-    const line = await ask(paint(ansi.green, "❯ "));
+    const line = await ask(paint(ansi.bold, "> "));
     if (line === null) break;
     const text = line.trim();
     if (text === "") continue;
@@ -1098,9 +1171,9 @@ async function run(ctx, options, exit) {
           out(paint(ansi.dim, "  ↻ new session\n"));
           try {
             agent = await startAgent(SessionId(`session-${randomUUID()}`), undefined);
-            out(paint(ansi.dim, `  session: ${agent.session.id}\n`));
+            out(paint(ansi.dim, `  session: ${sanitize(agent.session.id)}\n`));
           } catch (error) {
-            out(paint(ansi.red, `  ✘ ${error instanceof Error ? error.message : String(error)}\n`));
+            out(paint(ansi.red, `  ✘ ${sanitize(describeError(error))}\n`));
           }
           continue;
         }
@@ -1116,13 +1189,27 @@ async function run(ctx, options, exit) {
             out(paint(ansi.dim, `  ↻ resuming ${argument}\n`));
             agent = await startAgent(undefined, argument);
           } catch (error) {
-            out(paint(ansi.red, `  ✘ ${error instanceof Error ? error.message : String(error)}\n`));
+            out(paint(ansi.red, `  ✘ ${sanitize(describeError(error))}\n`));
           }
           continue;
         }
         case "/session":
-          out(paint(ansi.dim, `  ${agent.session.id}\n`));
+          out(paint(ansi.dim, `  ${sanitize(agent.session.id)}\n`));
           continue;
+        case "/status": {
+          out(paint(ansi.bold, "  Status") + "\n");
+          out(`  session: ${sanitize(agent.session.id)}\n`);
+          out(`  model:   ${sanitize(modelDesc())}\n`);
+          out(`  cwd:     ${sanitize(process.cwd())}\n`);
+          out(`  mode:    ${interactive ? "interactive" : "one-shot"}${autoYes ? " · auto-approve" : ""}\n`);
+          try {
+            if (tokenMeter !== undefined) {
+              const measurement = tokenMeter.measure(agent.session);
+              out(`  tokens:  ${measurement.totalTokens} (surface ${measurement.surfaceTokens})\n`);
+            }
+          } catch {}
+          continue;
+        }
         case "/model": {
           if (argument === "") {
             out(paint(ansi.dim, `  model: ${modelDesc()}\n`));
@@ -1134,7 +1221,7 @@ async function run(ctx, options, exit) {
             selectionRef.current = next;
             out(paint(ansi.green, `  ✓ model set: ${next.provider}/${next.model} (next message)\n`));
           } catch (error) {
-            out(paint(ansi.red, `  ✘ ${error instanceof Error ? error.message : String(error)}\n`));
+            out(paint(ansi.red, `  ✘ ${sanitize(describeError(error))}\n`));
           }
           continue;
         }
@@ -1149,7 +1236,7 @@ async function run(ctx, options, exit) {
             selectionRef.current = next;
             out(paint(ansi.green, `  ✓ reasoning set: ${argument} (next message)\n`));
           } catch (error) {
-            out(paint(ansi.red, `  ✘ ${error instanceof Error ? error.message : String(error)}\n`));
+            out(paint(ansi.red, `  ✘ ${sanitize(describeError(error))}\n`));
           }
           continue;
         }
@@ -1281,7 +1368,7 @@ async function run(ctx, options, exit) {
       }
     }
 
-    out("\n" + paint(ansi.green, "❯ ") + sanitize(text) + "\n\n");
+    out("\n" + paint(ansi.bold, "> ") + sanitize(text) + "\n\n");
     await runTurn(agent, text);
   }
 
@@ -1310,7 +1397,7 @@ export function apply(ctx) {
   }
   run(ctx, options, exit).catch((error) => {
     const detail = process.env.DSH_CLI_DEBUG === "1" && error instanceof Error ? `\n${error.stack}` : "";
-    process.stderr.write(`deepseek: ${error instanceof Error ? error.message : String(error)}${detail}\n`);
+    process.stderr.write(`deepseek: ${sanitize(describeError(error))}${detail}\n`);
     try {
       exit(1);
     } catch {}