@cjhyy/code-shell-core 0.6.0-rc.7 → 0.6.0-rc.9

package/dist/tool-system/mcp-stdio-diagnostics.js

@@ -0,0 +1,93 @@
+import { constants } from "node:fs";
+import { access } from "node:fs/promises";
+import { delimiter, isAbsolute, join } from "node:path";
+const COMMON_POSIX_BIN_DIRS = [
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    "/home/linuxbrew/.linuxbrew/bin",
+    "/usr/bin",
+    "/bin",
+];
+function unique(entries) {
+    const seen = new Set();
+    const out = [];
+    for (const entry of entries) {
+        const trimmed = entry.trim();
+        if (!trimmed || seen.has(trimmed))
+            continue;
+        seen.add(trimmed);
+        out.push(trimmed);
+    }
+    return out;
+}
+function commonExecutableDirs(env = process.env) {
+    const home = env.HOME?.trim();
+    return unique([
+        ...COMMON_POSIX_BIN_DIRS,
+        ...(home
+            ? [join(home, ".bun", "bin"), join(home, ".local", "bin"), join(home, ".npm-global", "bin")]
+            : []),
+    ]);
+}
+export function isBareCommand(command) {
+    const trimmed = command.trim();
+    return !!trimmed && !trimmed.includes("/") && !trimmed.includes("\\") && !isAbsolute(trimmed);
+}
+export function isMissingCommandError(error) {
+    const err = error;
+    const message = typeof err.message === "string" ? err.message : String(error);
+    return err.code === "ENOENT" || /\bENOENT\b/i.test(message) || /command not found/i.test(message);
+}
+async function isExecutable(filePath) {
+    try {
+        await access(filePath, constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export async function probeCommonExecutableLocations(command, env = process.env) {
+    if (!isBareCommand(command) || process.platform === "win32")
+        return [];
+    const found = [];
+    for (const dir of commonExecutableDirs(env)) {
+        const candidate = join(dir, command);
+        if (await isExecutable(candidate))
+            found.push(candidate);
+    }
+    return found;
+}
+function installGuidance(command) {
+    if (command === "node" || command === "npx")
+        return "Please install Node.js and restart CodeShell.";
+    if (command === "bun" || command === "bunx")
+        return "Please install Bun and restart CodeShell.";
+    return `Please install "${command}" and restart CodeShell.`;
+}
+export function classifyMcpStdioMissingCommand(command, foundPaths) {
+    const trimmed = command.trim();
+    if (foundPaths.length > 0) {
+        return [
+            `MCP stdio command "${trimmed}" failed to start: detected ${trimmed} at ${foundPaths[0]},`,
+            "but that directory was not available on PATH.",
+            "Login-shell PATH injection may have failed; restart CodeShell or configure this MCP command as an absolute path.",
+        ].join(" ");
+    }
+    return [
+        `MCP stdio command "${trimmed}" failed to start: ${trimmed} was not found on PATH or in common install locations.`,
+        installGuidance(trimmed),
+    ].join(" ");
+}
+export async function diagnoseMcpStdioMissingCommand(command, error, env = process.env) {
+    if (!isBareCommand(command) || !isMissingCommandError(error))
+        return null;
+    const foundPaths = await probeCommonExecutableLocations(command, env);
+    return {
+        message: classifyMcpStdioMissingCommand(command, foundPaths),
+        foundPaths,
+    };
+}
+export function previewPath(env = process.env) {
+    return (env.PATH ?? "").split(delimiter).filter(Boolean).join(delimiter);
+}

package/dist/types.d.ts

@@ -145,7 +145,19 @@ export interface SessionState {
     startedAt: number;
     model: string;
     provider: string;
+    /**
+     * Legacy/model-scoped usage summary. Some flows reset this accounting window
+     * (for example model switches), so it must not drive whole-session metrics.
+     */
     tokenUsage: TokenUsage;
+    /**
+     * Monotonic prompt-cache counters for the whole session. These only increase
+     * from session start and are separate from the resettable tokenUsage window.
+     * Optional on legacy state.json files; SessionManager normalizes them on load.
+     */
+    cumulativePromptTokens?: number;
+    cumulativeCacheReadTokens?: number;
+    cumulativeCacheCreationTokens?: number;
     turnCount: number;
     /**
      * Conversation-turn counter where ONE user message = one turn (incremented in
@@ -391,7 +403,7 @@ export type StreamEvent = {
     summary: string;
 } | {
     type: "context_compact";
-    strategy: "micro" | "summary" | "window" | "snip" | "emergency";
+    strategy: "micro" | "summary" | "window" | "snip" | "emergency" | "compacted";
     before: number;
     after: number;
     agentId?: string;
@@ -407,6 +419,24 @@ export type StreamEvent = {
      */
     cacheReadTokens?: number;
     cacheCreationTokens?: number;
+    /**
+     * Prompt-cache metrics for the current turn only. These are reset at the
+     * start of each turn-loop iteration and sum every LLM response in that
+     * turn, including max-token continuations.
+     */
+    singleTurnPromptTokens?: number;
+    singleTurnCacheReadTokens?: number;
+    singleTurnCacheCreationTokens?: number;
+    singleTurnCacheHitRate?: number;
+    /**
+     * Whole-session monotonic prompt-cache counters/rate. Unlike the legacy
+     * session* fields below, these are not derived from the resettable
+     * tokenUsage accounting window.
+     */
+    cumulativePromptTokens?: number;
+    cumulativeCacheReadTokens?: number;
+    cumulativeCacheCreationTokens?: number;
+    cumulativeCacheHitRate?: number;
     /**
      * SESSION-CUMULATIVE cache counts (sum across every LLM response this
      * session, across runs and turns), emitted from the engine's turn

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-core",
-  "version": "0.6.0-rc.7",
+  "version": "0.6.0-rc.9",
   "description": "Core engine for code-shell — agent orchestration, tool execution, hooks, protocol. UI-agnostic.",
   "type": "module",
   "main": "./dist/index.js",