@cjhyy/code-shell 0.1.6 → 0.2.0

package/dist/types.d.ts

@@ -169,6 +169,7 @@ export interface TaskInfo {
 export type StreamEvent = {
     type: "session_started";
     sessionId: string;
+    promptTokens: number;
 } | {
     type: "stream_request_start";
     turnNumber: number;
@@ -176,6 +177,7 @@ export type StreamEvent = {
 } | {
     type: "text_delta";
     text: string;
+    tokens?: number;
     agentId?: string;
 } | {
     type: "tool_use_start";
@@ -247,6 +249,19 @@ export interface LLMConfig {
     timeout?: number;
     retryMaxAttempts?: number;
     enableStreaming?: boolean;
+    /**
+     * Default thinking-mode for DeepSeek V4. Per-call `options.thinking`
+     * (e.g. summarize sub-calls) overrides this. Ignored on other providers.
+     */
+    thinking?: "enabled" | "disabled";
+    /**
+     * The provider's `kind` (deepseek/openai/zai/openrouter/...). Used by
+     * the capability layer to look up per-(kind, model) request-shape rules
+     * (token-limit field, rejected sampling params, thinking shape, etc.).
+     * Distinct from `provider` above, which is the protocol family
+     * ("openai" or "anthropic") that picks which client class to use.
+     */
+    providerKind?: string;
 }
 export interface LLMResponse {
     text: string;
@@ -258,6 +273,8 @@ export interface LLMResponse {
 export interface LLMStreamChunk {
     type: "text" | "tool_use_start" | "tool_use_delta" | "tool_use_end" | "stop";
     text?: string;
+    /** Token count for this text delta, when provider can compute it. */
+    tokens?: number;
     toolCall?: Partial<ToolCall>;
     stopReason?: string;
 }

package/dist/ui/components/SessionPicker.d.ts

@@ -1,6 +1,8 @@
 export interface SessionPickerEntry {
     sessionId: string;
     startedAt: number;
+    /** Last activity time — used to sort and display the row. */
+    lastActiveAt?: number;
     turnCount: number;
     preview?: string;
     cwd?: string;

package/dist/ui/components/SpinnerWithVerb.d.ts

@@ -5,9 +5,14 @@ import { type MutableRefObject } from "react";
 export type SpinnerMode = "responding" | "tool-use" | "thinking";
 interface SpinnerWithVerbProps {
     mode: SpinnerMode;
-    streamingCharsRef?: MutableRefObject<number>;
+    /**
+     * Per-turn streamed token count — used purely as a "still alive" signal so
+     * the user sees activity. NOT a measure of context size; that's in the
+     * StatusLine ctx bar.
+     */
+    streamingTokensRef?: MutableRefObject<number>;
     runStartRef?: MutableRefObject<number>;
     thinkingContent?: string;
 }
-export declare function SpinnerWithVerb({ mode, streamingCharsRef, runStartRef, thinkingContent, }: SpinnerWithVerbProps): import("react/jsx-runtime").JSX.Element;
+export declare function SpinnerWithVerb({ mode, streamingTokensRef, runStartRef, thinkingContent, }: SpinnerWithVerbProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/ui/components/StatusLine.d.ts

@@ -12,13 +12,17 @@ interface StatusLineProps {
     tokens: number;
     cost: number;
     sessionId?: string;
-    /** Last known prompt tokens from completed turn. Live streaming is added on top. */
+    /**
+     * Authoritative live context size. The engine emits `usage_update` at every
+     * message-array mutation (post-tool-result, post-compact, post-LLM), so this
+     * tracks the real prompt token count without UI-side accumulation.
+     */
     baseContextTokens?: number;
     maxContextTokens?: number;
     gitBranch?: string;
     isRunning?: boolean;
-    streamingCharsRef?: MutableRefObject<number>;
+    streamingTokensRef?: MutableRefObject<number>;
     runStartRef?: MutableRefObject<number>;
 }
-export declare function StatusLine({ model, effort, tokens, cost, sessionId, baseContextTokens, maxContextTokens, gitBranch, isRunning, streamingCharsRef, runStartRef, }: StatusLineProps): import("react/jsx-runtime").JSX.Element;
+export declare function StatusLine({ model, effort, tokens, cost, sessionId, baseContextTokens, maxContextTokens, gitBranch, isRunning, streamingTokensRef, runStartRef, }: StatusLineProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/updater-OCNU2K2Z.js

@@ -0,0 +1 @@
+export{f as __internal,a as checkForUpdate,c as getAutoUpdateDisabledReason,e as getCurrentVersion,b as getUpdateAvailable,d as scheduleAutoInstallOnExit}from'./chunk-TKJA6W36.js';import'./chunk-3QP5BQ3L.js';

package/package.json

@@ -1,31 +1,27 @@
 {
   "name": "@cjhyy/code-shell",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "Code Shell — general-purpose agent orchestration framework with a terminal coding preset",
   "type": "module",
-  "main": "./dist/index.cjs",
+  "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": "./dist/index.js"
     },
     "./run": {
       "types": "./dist/run/index.d.ts",
-      "import": "./dist/run/index.js",
-      "require": "./dist/run/index.cjs"
+      "import": "./dist/run/index.js"
     },
     "./arena": {
       "types": "./dist/arena/index.d.ts",
-      "import": "./dist/arena/index.js",
-      "require": "./dist/arena/index.cjs"
+      "import": "./dist/arena/index.js"
     },
     "./product": {
       "types": "./dist/product/index.d.ts",
-      "import": "./dist/product/index.js",
-      "require": "./dist/product/index.cjs"
+      "import": "./dist/product/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -95,6 +91,7 @@
     "emoji-regex": "^10.6.0",
     "get-east-asian-width": "^1.5.0",
     "glob": "^11.0.0",
+    "gpt-tokenizer": "^3.4.0",
     "indent-string": "^5.0.0",
     "lodash-es": "^4.17.23",
     "marked": "^17.0.5",

package/dist/anthropic-IBTI4WL2.cjs

@@ -1,10 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-var _chunkYIQBXAYUcjs = require('./chunk-YIQBXAYU.cjs');
-require('./chunk-7EG3V4JY.cjs');
-require('./chunk-2YW4FPFG.cjs');
-require('./chunk-IK4EWJBP.cjs');
-require('./chunk-KS3RYAYL.cjs');
-
-
-exports.AnthropicClient = _chunkYIQBXAYUcjs.AnthropicClient;

package/dist/anthropic-PRZZKHEZ.js

@@ -1,10 +0,0 @@
-import {
-  AnthropicClient
-} from "./chunk-ZBPSQCPU.js";
-import "./chunk-6S4BJ65N.js";
-import "./chunk-SFXHZSRF.js";
-import "./chunk-BXCY2FSE.js";
-import "./chunk-MD32R22I.js";
-export {
-  AnthropicClient
-};

package/dist/arena/index.cjs

@@ -1,104 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-
-
-
-
-
-var _chunkDDB6QOKJcjs = require('../chunk-DDB6QOKJ.cjs');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _chunkWZJV6DJCcjs = require('../chunk-WZJV6DJC.cjs');
-require('../chunk-YKIAELDZ.cjs');
-require('../chunk-2YW4FPFG.cjs');
-require('../chunk-IK4EWJBP.cjs');
-require('../chunk-KS3RYAYL.cjs');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-exports.Arena = _chunkWZJV6DJCcjs.Arena; exports.ArenaLedger = _chunkWZJV6DJCcjs.ArenaLedger; exports.DiscussionStrategy = _chunkWZJV6DJCcjs.DiscussionStrategy; exports.IterativeArena = _chunkDDB6QOKJcjs.IterativeArena; exports.LENS_NAMES = _chunkWZJV6DJCcjs.LENS_NAMES; exports.MODEL_PRESETS = _chunkWZJV6DJCcjs.MODEL_PRESETS; exports.PlanningStrategy = _chunkWZJV6DJCcjs.PlanningStrategy; exports.ReviewStrategy = _chunkWZJV6DJCcjs.ReviewStrategy; exports.applyReviewResult = _chunkWZJV6DJCcjs.applyReviewResult; exports.buildConsensus = _chunkWZJV6DJCcjs.buildConsensus; exports.buildDigest = _chunkWZJV6DJCcjs.buildDigest; exports.buildLensPrompt = _chunkWZJV6DJCcjs.buildLensPrompt; exports.collectEvidence = _chunkWZJV6DJCcjs.collectEvidence; exports.createProgressRenderer = _chunkWZJV6DJCcjs.createProgressRenderer; exports.defaultIterateConvergence = _chunkDDB6QOKJcjs.defaultConvergence; exports.formatArenaResult = _chunkWZJV6DJCcjs.formatArenaResult; exports.formatArenaResultForSession = _chunkWZJV6DJCcjs.formatArenaResultForSession; exports.formatDigest = _chunkWZJV6DJCcjs.formatDigest; exports.getIterateFormat = _chunkDDB6QOKJcjs.getFormat; exports.getLens = _chunkWZJV6DJCcjs.getLens; exports.getMaxOutputTokens = _chunkWZJV6DJCcjs.getMaxOutputTokens; exports.getStrategy = _chunkWZJV6DJCcjs.getStrategy; exports.getStrategyForPlan = _chunkWZJV6DJCcjs.getStrategyForPlan; exports.hasTools = _chunkWZJV6DJCcjs.hasTools; exports.isStrategyV2 = _chunkWZJV6DJCcjs.isStrategyV2; exports.isTerminal = _chunkWZJV6DJCcjs.isTerminal; exports.iterateCodeFormat = _chunkDDB6QOKJcjs.codeFormat; exports.iterateDiffRatio = _chunkDDB6QOKJcjs.diffRatio; exports.iterateDocumentFormat = _chunkDDB6QOKJcjs.documentFormat; exports.markUnderReview = _chunkWZJV6DJCcjs.markUnderReview; exports.markUnresolved = _chunkWZJV6DJCcjs.markUnresolved; exports.planArena = _chunkWZJV6DJCcjs.planArena; exports.printArenaResult = _chunkWZJV6DJCcjs.printArenaResult; exports.registerClaims = _chunkWZJV6DJCcjs.registerClaims; exports.renderProgress = _chunkWZJV6DJCcjs.renderProgress; exports.resolveClaimStatus = _chunkWZJV6DJCcjs.resolveClaimStatus; exports.resolveLenses = _chunkWZJV6DJCcjs.resolveLenses; exports.runAdjudication = _chunkWZJV6DJCcjs.runAdjudication; exports.runCrossReview = _chunkWZJV6DJCcjs.runCrossReview; exports.runDebateRounds = _chunkWZJV6DJCcjs.runDebateRounds; exports.runParticipantResearch = _chunkWZJV6DJCcjs.runParticipantResearch; exports.runParticipantResearchWithDossiers = _chunkWZJV6DJCcjs.runParticipantResearchWithDossiers; exports.runVerificationReview = _chunkWZJV6DJCcjs.runVerificationReview; exports.selectClaimsForReview = _chunkWZJV6DJCcjs.selectClaimsForReview; exports.selectTools = _chunkWZJV6DJCcjs.selectTools; exports.transitionClaim = _chunkWZJV6DJCcjs.transitionClaim; exports.validTransitions = _chunkWZJV6DJCcjs.validTransitions;

package/dist/arena-2LTLIXOL.js

@@ -1,261 +0,0 @@
-import {
-  ModelPool
-} from "./chunk-BSW22MPA.js";
-import "./chunk-3OA5G4TM.js";
-import {
-  SettingsManager
-} from "./chunk-3SBSUOWZ.js";
-import {
-  Arena,
-  MODEL_PRESETS,
-  createProgressRenderer,
-  formatArenaResultForSession,
-  getMaxOutputTokens,
-  printArenaResult,
-  renderProgress
-} from "./chunk-BZ5TNE7L.js";
-import "./chunk-3QO25N6E.js";
-import "./chunk-SFXHZSRF.js";
-import "./chunk-BXCY2FSE.js";
-import {
-  init_esm_shims
-} from "./chunk-MD32R22I.js";
-
-// src/cli/commands/arena.ts
-init_esm_shims();
-import chalk from "chalk";
-async function runArenaReview(arg, engineConfig, opts) {
-  const { models: modelsFlag, mode: explicitMode, base, head, topic } = parseFlags(arg);
-  const out = opts?.output ?? ((text) => console.log(text));
-  if (!topic) {
-    out(formatUsage());
-    return void 0;
-  }
-  const participants = resolveParticipants(engineConfig, modelsFlag);
-  if (participants.length < 2) {
-    out(formatModelHelp(engineConfig));
-    return void 0;
-  }
-  const modeLabel = explicitMode ? explicitMode.charAt(0).toUpperCase() + explicitMode.slice(1) : "Auto";
-  out(chalk.bold(`\u2550\u2550\u2550 Arena ${modeLabel} \u2550\u2550\u2550`));
-  out(chalk.dim(`Topic:  ${topic}`));
-  out(chalk.dim(`Models: ${participants.map((p) => p.name).join(" vs ")}`));
-  const progressRenderer = opts?.output ? createProgressRenderer(opts.output) : renderProgress;
-  const arena = new Arena({
-    participants,
-    mode: explicitMode,
-    enableContextTools: true,
-    onProgress: progressRenderer
-  });
-  try {
-    const result = await arena.run(topic, {
-      mode: explicitMode,
-      base,
-      head
-    });
-    const resultSink = opts?.outputMessage ?? opts?.output;
-    if (resultSink) {
-      resultSink(formatArenaResultForSession(result));
-    } else {
-      printArenaResult(result);
-    }
-    return result;
-  } catch (err) {
-    out(chalk.red(`Arena failed: ${err.message}`));
-    return void 0;
-  }
-}
-function buildModelPool(engineConfig) {
-  const pool = new ModelPool();
-  try {
-    const settings = new SettingsManager(process.cwd()).get();
-    if (settings.models?.length) {
-      for (const m of settings.models) {
-        pool.register({
-          key: m.key,
-          label: m.label,
-          provider: m.provider ?? "",
-          model: m.model,
-          baseUrl: m.baseUrl ?? engineConfig.llm.baseUrl,
-          apiKey: m.apiKey ?? engineConfig.llm.apiKey,
-          maxOutputTokens: m.maxOutputTokens
-        });
-      }
-    }
-  } catch {
-  }
-  return pool;
-}
-function resolveOneParticipant(entry, pool, engineConfig) {
-  if (typeof entry === "string") {
-    const m = pool.get(entry);
-    if (!m) return void 0;
-    return {
-      name: m.label ?? modelDisplayName(m.model),
-      llm: {
-        provider: m.provider,
-        model: m.model,
-        apiKey: m.apiKey ?? engineConfig.llm.apiKey,
-        baseUrl: m.baseUrl ?? engineConfig.llm.baseUrl,
-        temperature: 0.3,
-        maxTokens: m.maxOutputTokens ?? getMaxOutputTokens(m.model),
-        enableStreaming: false
-      }
-    };
-  }
-  return {
-    name: entry.name,
-    llm: {
-      provider: entry.provider ?? engineConfig.llm.provider,
-      model: entry.model,
-      apiKey: entry.apiKey ?? engineConfig.llm.apiKey,
-      baseUrl: entry.baseUrl ?? engineConfig.llm.baseUrl,
-      temperature: 0.3,
-      maxTokens: getMaxOutputTokens(entry.model),
-      enableStreaming: false
-    }
-  };
-}
-function resolveParticipants(engineConfig, modelsFlag) {
-  const pool = buildModelPool(engineConfig);
-  if (modelsFlag) {
-    const names = modelsFlag.split(",").map((n) => n.trim().toLowerCase());
-    return names.map((name) => {
-      const fromPool = pool.get(name);
-      if (fromPool) {
-        return {
-          name: fromPool.label ?? modelDisplayName(fromPool.model),
-          llm: {
-            provider: fromPool.provider,
-            model: fromPool.model,
-            apiKey: fromPool.apiKey ?? engineConfig.llm.apiKey,
-            baseUrl: fromPool.baseUrl ?? engineConfig.llm.baseUrl,
-            temperature: 0.3,
-            maxTokens: fromPool.maxOutputTokens ?? getMaxOutputTokens(fromPool.model),
-            enableStreaming: false
-          }
-        };
-      }
-      const preset = MODEL_PRESETS[name];
-      if (preset) {
-        return {
-          name: modelDisplayName(preset.model),
-          llm: {
-            provider: preset.provider,
-            model: preset.model,
-            apiKey: engineConfig.llm.apiKey,
-            baseUrl: engineConfig.llm.baseUrl,
-            temperature: 0.3,
-            maxTokens: preset.maxOutputTokens,
-            enableStreaming: false
-          }
-        };
-      }
-      return {
-        name: modelDisplayName(name),
-        llm: { ...engineConfig.llm, model: name, enableStreaming: false }
-      };
-    });
-  }
-  const settings = new SettingsManager(process.cwd()).get();
-  if (settings.arena?.participants?.length >= 2) {
-    const resolved = settings.arena.participants.map((p) => resolveOneParticipant(p, pool, engineConfig)).filter((p) => p !== void 0);
-    if (resolved.length >= 2) return resolved;
-  }
-  const participants = [
-    {
-      name: modelDisplayName(engineConfig.llm.model),
-      llm: {
-        ...engineConfig.llm,
-        maxTokens: getMaxOutputTokens(engineConfig.llm.model),
-        enableStreaming: false
-      }
-    }
-  ];
-  if (engineConfig.llm.baseUrl?.includes("openrouter")) {
-    const current = engineConfig.llm.model;
-    const opponent = current.includes("claude") ? "openai/gpt-5.4" : "anthropic/claude-opus-4.6";
-    participants.push({
-      name: modelDisplayName(opponent),
-      llm: {
-        ...engineConfig.llm,
-        model: opponent,
-        maxTokens: getMaxOutputTokens(opponent),
-        enableStreaming: false
-      }
-    });
-  }
-  return participants;
-}
-var VALID_MODES = ["review", "discussion", "planning"];
-function parseFlags(arg) {
-  let models;
-  let mode;
-  let base;
-  let head;
-  const remaining = [];
-  const tokens = arg.split(/\s+/);
-  for (let i = 0; i < tokens.length; i++) {
-    if (tokens[i] === "--models" && tokens[i + 1]) {
-      models = tokens[++i];
-    } else if (tokens[i] === "--mode" && tokens[i + 1]) {
-      const val = tokens[++i].toLowerCase();
-      if (VALID_MODES.includes(val)) {
-        mode = val;
-      } else {
-        console.log(chalk.yellow(`  Unknown mode "${val}", valid: ${VALID_MODES.join(", ")}`));
-      }
-    } else if (tokens[i] === "--base" && tokens[i + 1]) {
-      base = tokens[++i];
-    } else if (tokens[i] === "--head" && tokens[i + 1]) {
-      head = tokens[++i];
-    } else {
-      remaining.push(tokens[i]);
-    }
-  }
-  return { models, mode, base, head, topic: remaining.join(" ").trim() };
-}
-function formatUsage() {
-  return [
-    chalk.bold("Arena \u2014 Multi-model collaborative analysis"),
-    "",
-    chalk.dim("Usage:"),
-    "  /arena review the authentication module",
-    "  /arena --models claude,gpt4o is the error handling correct?",
-    "  /arena --mode planning design the new auth system",
-    "  /arena --mode discussion should we use REST or GraphQL",
-    "  /arena --base main review changes since main",
-    '  code-shell arena "review my latest changes"',
-    "",
-    `${chalk.dim("Modes:")} review (default), discussion, planning`,
-    chalk.dim("Mode is auto-detected from the topic if --mode is not specified."),
-    "",
-    chalk.dim("Flags:"),
-    "  --base <ref>   Base branch/ref for comparison",
-    "  --head <ref>   Head branch/ref (default: HEAD)",
-    "",
-    `${chalk.dim("Available model presets:")} ${Object.keys(MODEL_PRESETS).join(", ")}`
-  ].join("\n");
-}
-function formatModelHelp(engineConfig) {
-  return [
-    chalk.red("Arena needs at least 2 models."),
-    "",
-    "Use --models to specify:",
-    "  /arena --models claude,gpt4o review the code",
-    "",
-    "Or configure in ~/.code-shell/settings.json:",
-    '  "arena": { "participants": [',
-    '    { "name": "Claude", "model": "anthropic/claude-sonnet-4-20250514" },',
-    '    { "name": "GPT-4o", "model": "openai/gpt-4o" }',
-    "  ]}"
-  ].join("\n");
-}
-function modelDisplayName(model) {
-  const last = model.split("/").pop() ?? model;
-  return last.replace(/-\d.*$/, "").split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
-}
-export {
-  formatArenaResultForSession,
-  runArenaReview
-};