@cjhyy/code-shell-core 0.7.0-beta.1 → 0.7.0

package/dist/tool-system/mcp-manager.js

@@ -8,6 +8,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { logger } from "../logging/logger.js";
 import { getCredentialAccess } from "../credentials/access.js";
+import { buildOAuthRefreshRequest, oauthCredentialStatus, parseOAuthCredentialSecret, } from "../credentials/oauth.js";
 import { ENV_ALLOWLIST } from "../runtime/spawn-common.js";
 import { mkdir, readdir, unlink, writeFile } from "node:fs/promises";
 import { join } from "node:path";
@@ -73,14 +74,14 @@ export function buildStdioEnv(serverName, config) {
  * base; env-sourced secrets (`bearerTokenEnvVar`, `envHeaders`) layer on top
  * and win on conflict. Pure + exported for unit testing.
  */
-export function buildHttpHeaders(serverName, config, resolveCredential) {
+export function buildHttpHeaders(serverName, config, resolveCredential, options = {}) {
     const headers = { ...(config.headers ?? {}) };
     if (config.credentialRef) {
-        const secret = resolveCredential?.(config.credentialRef);
-        if (secret === undefined || secret === "") {
+        const credential = normalizeResolvedMcpCredential(resolveCredential?.(config.credentialRef));
+        if (!credential || credential.secret === "") {
             throw new Error(`MCP server "${serverName}": credential "${config.credentialRef}" not found or empty`);
         }
-        headers["Authorization"] = `Bearer ${secret}`;
+        headers["Authorization"] = `Bearer ${bearerTokenFromMcpCredential(serverName, config.credentialRef, credential, options)}`;
     }
     else if (config.bearerTokenEnvVar) {
         headers["Authorization"] = `Bearer ${readRequiredEnv(serverName, "bearerTokenEnvVar", config.bearerTokenEnvVar)}`;
@@ -90,19 +91,67 @@ export function buildHttpHeaders(serverName, config, resolveCredential) {
     }
     return headers;
 }
-export async function buildHttpHeadersWithCredentialAccess(serverName, config, access = getCredentialAccess()) {
+function normalizeResolvedMcpCredential(value) {
+    if (typeof value === "string")
+        return { secret: value };
+    if (!value)
+        return undefined;
+    return value;
+}
+export function bearerTokenFromMcpCredential(serverName, credentialId, credential, options = {}) {
+    if (credential.type === undefined)
+        return credential.secret;
+    if (credential.type !== "oauth") {
+        if (credential.type !== "token" && credential.type !== "link") {
+            throw new Error(`MCP server "${serverName}": credential "${credentialId}" type "${credential.type}" cannot be used as a bearer token`);
+        }
+        try {
+            const parsed = JSON.parse(credential.secret);
+            if (parsed !== null && typeof parsed === "object") {
+                throw new Error(`MCP server "${serverName}": credential "${credentialId}" resolved to a structured secret that does not match token metadata; refusing bearer injection`);
+            }
+        }
+        catch (err) {
+            if (err instanceof SyntaxError)
+                return credential.secret;
+            throw err;
+        }
+        return credential.secret;
+    }
+    const secret = parseOAuthCredentialSecret(credential.secret);
+    const status = oauthCredentialStatus(secret, {
+        now: options.now,
+        skewMs: options.oauthRefreshSkewMs,
+    });
+    if (status.state === "expired") {
+        const refresh = buildOAuthRefreshRequest(credentialId, secret);
+        const refreshHint = refresh
+            ? "refresh data is present, but automatic OAuth refresh is reserved and not wired yet"
+            : "missing refreshToken or tokenEndpoint for automatic refresh";
+        throw new Error(`MCP server "${serverName}": oauth credential "${credentialId}" access token expired; ${refreshHint}`);
+    }
+    return secret.accessToken;
+}
+export async function buildHttpHeadersWithCredentialAccess(serverName, config, access = getCredentialAccess(), options = {}) {
     if (!config.credentialRef)
-        return buildHttpHeaders(serverName, config);
+        return buildHttpHeaders(serverName, config, undefined, options);
     if (!access.resolveValue) {
         throw new Error(`MCP server "${serverName}": credential "${config.credentialRef}" not found or empty`);
     }
+    const meta = access.resolveMeta?.(undefined, config.credentialRef, "full");
+    if (!meta) {
+        throw new Error(`MCP server "${serverName}": credential "${config.credentialRef}" metadata is unavailable; refusing bearer injection`);
+    }
+    if (meta.type !== "token" && meta.type !== "link" && meta.type !== "oauth") {
+        throw new Error(`MCP server "${serverName}": credential "${config.credentialRef}" type "${meta.type}" cannot be used as a bearer token`);
+    }
     const secret = await access.resolveValue({
         cwd: undefined,
         id: config.credentialRef,
         scope: "full",
         purpose: "mcp",
     });
-    return buildHttpHeaders(serverName, config, (id) => id === config.credentialRef ? secret : undefined);
+    return buildHttpHeaders(serverName, config, (id) => id === config.credentialRef ? { secret, type: meta?.type, label: meta?.label } : undefined, options);
 }
 /**
  * Infer the transport when the config doesn't name one: a url-only entry is

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 /**
  * Core type definitions for the code-shell orchestration framework.
  */
-import type { GoalConfig } from "./engine/goal.js";
+import type { GoalConfig, GoalTerminal } from "./engine/goal.js";
 export interface ContentBlock {
     type: "text" | "tool_use" | "tool_result" | "image" | "reasoning";
     text?: string;
@@ -133,7 +133,7 @@ export interface RegisteredTool {
      */
     timeoutMs?: number;
 }
-export type TranscriptEventType = "message" | "tool_use" | "tool_result" | "summary" | "content_replace" | "file_history" | "plan_operation" | "session_meta" | "subagent" | "turn_boundary" | "goal_progress" | "turn_stopped" | "error";
+export type TranscriptEventType = "message" | "tool_use" | "tool_result" | "summary" | "content_replace" | "file_history" | "plan_operation" | "session_meta" | "subagent" | "external_file_changes" | "turn_boundary" | "goal_progress" | "turn_stopped" | "error";
 export interface TranscriptEvent {
     id: string;
     type: TranscriptEventType;
@@ -242,6 +242,12 @@ export interface SessionState {
      * baselines reset (matching CC). See engine.run goal-resolution.
      */
     activeGoal?: GoalConfig;
+    /**
+     * Last force-terminated goal instance. Kept separately from activeGoal so an
+     * old whole-state writer cannot make that same exhausted goal armable again.
+     * Optional for backward compatibility with pre-tombstone state.json files.
+     */
+    goalTerminal?: GoalTerminal;
 }
 export interface TokenUsage {
     promptTokens: number;
@@ -506,7 +512,7 @@ export type StreamEvent = {
     agentId: string;
     name?: string;
     description: string;
-    status: "completed" | "failed";
+    status: "completed" | "failed" | "cancelled";
     /**
      * What kind of background work this was. Lets UIs localize the
      * completion toast (e.g. a shell shows "命令完成" not the raw English
@@ -518,8 +524,16 @@ export type StreamEvent = {
     command?: string;
     /** Final assistant text (status === "completed" only). */
     finalText?: string;
-    /** Error message (status === "failed" only). */
+    /** Error message (status === "failed" or "cancelled" only). */
     error?: string;
+    /** External Claude/Codex session id, when workKind === "cc". */
+    ccSessionId?: string;
+    /** Files attributed to an external DriveAgent transcript. */
+    changedFiles?: string[];
+    /** Working directory used to canonicalize relative/absolute path aliases. */
+    cwd?: string;
+    /** Client id of the real user turn that launched this background work. */
+    originClientMessageId?: string;
     /** When the bg agent finished (Date.now() value). */
     enqueuedAt: number;
 };
@@ -652,9 +666,10 @@ export interface MCPServerConfig {
      */
     envHeaders?: Record<string, string>;
     /**
-     * (HTTP) id of a stored credential (CredentialStore) to use as the Bearer
-     * token. Resolved at connect time via a resolver passed to buildHttpHeaders;
-     * the secret is never stored in the MCP config. Wins over bearerTokenEnvVar.
+     * (HTTP) id of a stored credential (token/link/oauth) to use as Bearer auth.
+     * OAuth credentials inject their current access token. Resolved at connect
+     * time via CredentialStore; the secret is never stored in MCP config. Wins
+     * over bearerTokenEnvVar.
      */
     credentialRef?: string;
     /**
@@ -677,6 +692,7 @@ export interface MCPServerConfig {
 export interface MCPServerOverride {
     env?: Record<string, string>;
     envVars?: string[];
+    /** (HTTP) id of a stored token/link/oauth credential used as Bearer auth. */
     credentialRef?: string;
     bearerTokenEnvVar?: string;
     envHeaders?: Record<string, string>;

package/package.json

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