shennian 0.2.88 → 0.2.90

package/dist/src/agents/codex-utils.js

@@ -1,200 +1,7 @@
-// @arch docs/architecture/cli/agent-adapters.md
-// @test src/__tests__/codex-adapter.test.ts
-export function makeThreadTitle(text) {
-    const firstLine = normalizeTitleText(text).split('\n').find((line) => line.trim()) ?? 'Shennian';
-    const title = firstLine.trim().slice(0, 80);
-    return title || 'Shennian';
-}
-export const CODEX_APP_SERVER_CLIENT_INFO = {
-    name: 'codex-tui',
-    title: 'Codex TUI',
-    version: '0.0.0',
-};
-const CODEX_COLLAB_AGENT_TOOL_NAMES = new Set([
-    'spawnAgent',
-    'sendInput',
-    'resumeAgent',
-    'wait',
-    'closeAgent',
-    'waitAgent',
-]);
-export function isCodexCollabAgentToolName(name) {
-    return CODEX_COLLAB_AGENT_TOOL_NAMES.has(name);
-}
-export function isCodexCollabAgentItem(item) {
-    if (item.type === 'collabAgentToolCall')
-        return true;
-    if (item.type === 'collabAgentMonitor')
-        return true;
-    const tool = typeof item.tool === 'string' ? item.tool : '';
-    if (tool && isCodexCollabAgentToolName(tool))
-        return true;
-    return typeof item.senderThreadId === 'string' && Array.isArray(item.receiverThreadIds);
-}
-export function isCodexLegacyCollabAgentItem(item) {
-    if (item.type === 'collab_agent_tool_call' || item.type === 'collabAgentToolCall')
-        return true;
-    if (item.type === 'collab_agent_monitor' || item.type === 'collabAgentMonitor')
-        return true;
-    return !!item.tool && isCodexCollabAgentToolName(item.tool);
-}
-export function normalizeTitleText(text) {
-    return text
-        .replace(/!\[[^\]]*]\([^)]+\)/g, '')
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-export function normalizeCodexModelId(modelId) {
-    const trimmed = modelId?.trim();
-    if (!trimmed)
-        return undefined;
-    return trimmed.toLowerCase() === 'openai' ? undefined : trimmed;
-}
-export function normalizeCodexReasoningEffort(reasoningEffort) {
-    const trimmed = reasoningEffort?.trim();
-    return trimmed || undefined;
-}
-export function isMissingCodexRolloutError(error) {
-    const message = error instanceof Error ? error.message : String(error ?? '');
-    return /\bno rollout found for thread id\b/i.test(message);
-}
-export function isCodexUnsupportedEffortError(error) {
-    const message = error instanceof Error ? error.message : String(error ?? '');
-    return (/\bunknown field\b.*\beffort\b/i.test(message) ||
-        /\binvalid.*\beffort\b/i.test(message) ||
-        /\bunsupported.*\beffort\b/i.test(message) ||
-        /\breasoning effort\b/i.test(message));
-}
-export function extractAppServerErrorMessage(params) {
-    if (typeof params.message === 'string' && params.message.trim())
-        return params.message.trim();
-    const error = params.error;
-    if (typeof error === 'string' && error.trim())
-        return error.trim();
-    if (typeof error === 'object' && error !== null) {
-        const message = error.message;
-        if (typeof message === 'string' && message.trim())
-            return message.trim();
-    }
-    return 'codex app-server error';
-}
-export function isTransientCodexErrorMessage(message) {
-    return /\bReconnecting\.\.\.\s*\d+\/\d+/i.test(message);
-}
-export function formatTransientCodexStatus(message) {
-    const match = message.match(/\bReconnecting\.\.\.\s*(\d+\/\d+)/i);
-    if (!match)
-        return '';
-    return `Codex API 暂时不可用，正在重试 ${match[1]}...`;
-}
-export function formatCodexErrorMessage(message) {
-    const statusMatch = message.match(/unexpected status\s+(\d+)\s+([^:,]+)(?::\s*([^,]+))?(?:,\s*url:\s*([^,\s]+))?(?:,\s*request id:\s*([^\s,]+))?/i);
-    if (!statusMatch)
-        return message;
-    const [, status, statusText, detail, url, requestId] = statusMatch;
-    const parts = [
-        `Codex API 返回 ${status} ${statusText.trim()}`,
-        detail?.trim() ? `：${detail.trim()}` : '',
-        url ? `\n上游地址：${url}` : '',
-        requestId ? `\nrequest id：${requestId}` : '',
-    ];
-    return parts.join('');
-}
-const GIT_DIRECTIVE_LINE_RE = /^\s*::git-[a-z-]+\{[^\n]*\}\s*$/gm;
-export function stripGitDirectiveArtifacts(text) {
-    if (!text)
-        return '';
-    const normalized = text.replace(/\r\n/g, '\n');
-    const hadDirective = /(^|\n)\s*::git-[a-z-]+\{[^\n]*\}\s*(?=\n|$)/.test(normalized);
-    if (!hadDirective)
-        return normalized;
-    const stripped = normalized.replace(GIT_DIRECTIVE_LINE_RE, '');
-    if (!stripped.trim())
-        return '';
-    return stripped.replace(/[ \t]+\n/g, '\n').replace(/\n+$/g, '');
-}
-export function safeStringify(value) {
-    if (value == null)
-        return '';
-    if (typeof value === 'string')
-        return value;
-    try {
-        return JSON.stringify(value);
-    }
-    catch {
-        return String(value);
-    }
-}
-export function normalizeCodexStderr(stderr) {
-    const normalized = stderr
-        .split(/\r?\n/)
-        .map((line) => line.trim())
-        .filter(Boolean)
-        .filter((line) => !isIgnorableCodexStderrLine(line))
-        .join('\n');
-    if (looksLikeMissingNodeOnWindows(normalized)) {
-        return 'Codex 启动失败：系统找不到 node。请重新安装 Node.js，或把 Node.js 安装目录（通常是 C:\\Program Files\\nodejs）加入 Windows PATH 后重启神念。';
-    }
-    return normalized;
-}
-export function looksLikeMissingNodeOnWindows(text) {
-    if (!text)
-        return false;
-    return (/["']?node["']?/i.test(text) &&
-        (/not recognized as an internal or external command/i.test(text) ||
-            text.includes('不是内部或外部命令') ||
-            text.includes('不是可运行的程序') ||
-            text.includes('��������') ||
-            text.includes('����')));
-}
-export function normalizeTerminalText(text) {
-    const escape = String.fromCharCode(27);
-    const bell = String.fromCharCode(7);
-    const csiPattern = new RegExp(`${escape}\\[[0-?]*[ -/]*[@-~]`, 'g');
-    const oscPattern = new RegExp(`${escape}\\][^${bell}]*(?:${bell}|${escape}\\\\)`, 'g');
-    return text
-        .replace(csiPattern, ' ')
-        .replace(oscPattern, ' ')
-        .split('')
-        .map((char) => {
-        const code = char.charCodeAt(0);
-        return (code <= 8 || code === 11 || code === 12 || (code >= 14 && code <= 31) || code === 127) ? ' ' : char;
-    })
-        .join('')
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-export function looksLikeCodexInteractiveAuthPrompt(text) {
-    if (!text)
-        return false;
-    const normalized = text.toLowerCase();
-    return (normalized.includes('welcome to codex') ||
-        normalized.includes('sign in with chatgpt') ||
-        normalized.includes('provide your own api key') ||
-        normalized.includes('press enter to continue'));
-}
-export function isIgnorableCodexStderrLine(line) {
-    return [
-        /WARNING: proceeding, even though we could not update PATH:/i,
-        /Reading additional input from stdin\.\.\./i,
-        /failed to record rollout items: failed to queue rollout items: channel closed/i,
-    ].some((pattern) => pattern.test(line));
-}
-export function looksLikeFatalCodexStderr(stderr) {
-    if (!stderr)
-        return false;
-    return [
-        /\bunauthorized\b/i,
-        /\bforbidden\b/i,
-        /\bpermission denied\b/i,
-        /\brate limit\b/i,
-        /\binsufficient quota\b/i,
-        /\bapi key\b/i,
-        /\bauth/i,
-        /\bnetwork\b/i,
-        /\btimeout\b/i,
-        /\bnot found\b/i,
-        /\berror\b/i,
-        /\bfailed\b/i,
-    ].some((pattern) => pattern.test(stderr));
-}
+function g(e){return(c(e).split(`
+`).find(o=>o.trim())??"Shennian").trim().slice(0,80)||"Shennian"}const m={name:"codex-tui",title:"Codex TUI",version:"0.0.0"},u=new Set(["spawnAgent","sendInput","resumeAgent","wait","closeAgent","waitAgent"]);function a(e){return u.has(e)}function b(e){if(e.type==="collabAgentToolCall"||e.type==="collabAgentMonitor")return!0;const t=typeof e.tool=="string"?e.tool:"";return t&&a(t)?!0:typeof e.senderThreadId=="string"&&Array.isArray(e.receiverThreadIds)}function x(e){return e.type==="collab_agent_tool_call"||e.type==="collabAgentToolCall"||e.type==="collab_agent_monitor"||e.type==="collabAgentMonitor"?!0:!!e.tool&&a(e.tool)}function c(e){return e.replace(/!\[[^\]]*]\([^)]+\)/g,"").replace(/\s+/g," ").trim()}function C(e){const t=e?.trim();if(t)return t.toLowerCase()==="openai"?void 0:t}function A(e){return e?.trim()||void 0}function h(e){const t=e instanceof Error?e.message:String(e??"");return/\bno rollout found for thread id\b/i.test(t)}function y(e){const t=e instanceof Error?e.message:String(e??"");return/\bunknown field\b.*\beffort\b/i.test(t)||/\binvalid.*\beffort\b/i.test(t)||/\bunsupported.*\beffort\b/i.test(t)||/\breasoning effort\b/i.test(t)}function E(e){if(typeof e.message=="string"&&e.message.trim())return e.message.trim();const t=e.error;if(typeof t=="string"&&t.trim())return t.trim();if(typeof t=="object"&&t!==null){const r=t.message;if(typeof r=="string"&&r.trim())return r.trim()}return"codex app-server error"}function T(e){return/\bReconnecting\.\.\.\s*\d+\/\d+/i.test(e)}function I(e){const t=e.match(/\bReconnecting\.\.\.\s*(\d+\/\d+)/i);return t?`Codex API \u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u6B63\u5728\u91CD\u8BD5 ${t[1]}...`:""}function S(e){const t=e.match(/unexpected status\s+(\d+)\s+([^:,]+)(?::\s*([^,]+))?(?:,\s*url:\s*([^,\s]+))?(?:,\s*request id:\s*([^\s,]+))?/i);if(!t)return e;const[,r,o,s,i,n]=t;return[`Codex API \u8FD4\u56DE ${r} ${o.trim()}`,s?.trim()?`\uFF1A${s.trim()}`:"",i?`
+\u4E0A\u6E38\u5730\u5740\uFF1A${i}`:"",n?`
+request id\uFF1A${n}`:""].join("")}const l=/^\s*::git-[a-z-]+\{[^\n]*\}\s*$/gm;function w(e){if(!e)return"";const t=e.replace(/\r\n/g,`
+`);if(!/(^|\n)\s*::git-[a-z-]+\{[^\n]*\}\s*(?=\n|$)/.test(t))return t;const o=t.replace(l,"");return o.trim()?o.replace(/[ \t]+\n/g,`
+`).replace(/\n+$/g,""):""}function _(e){if(e==null)return"";if(typeof e=="string")return e;try{return JSON.stringify(e)}catch{return String(e)}}function L(e){const t=e.split(/\r?\n/).map(r=>r.trim()).filter(Boolean).filter(r=>!f(r)).join(`
+`);return d(t)?"Codex \u542F\u52A8\u5931\u8D25\uFF1A\u7CFB\u7EDF\u627E\u4E0D\u5230 node\u3002\u8BF7\u91CD\u65B0\u5B89\u88C5 Node.js\uFF0C\u6216\u628A Node.js \u5B89\u88C5\u76EE\u5F55\uFF08\u901A\u5E38\u662F C:\\Program Files\\nodejs\uFF09\u52A0\u5165 Windows PATH \u540E\u91CD\u542F\u795E\u5FF5\u3002":t}function d(e){return e?/["']?node["']?/i.test(e)&&(/not recognized as an internal or external command/i.test(e)||e.includes("\u4E0D\u662F\u5185\u90E8\u6216\u5916\u90E8\u547D\u4EE4")||e.includes("\u4E0D\u662F\u53EF\u8FD0\u884C\u7684\u7A0B\u5E8F")||e.includes("\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD")||e.includes("\uFFFD\uFFFD\uFFFD\uFFFD")):!1}function $(e){const o=new RegExp("\x1B\\[[0-?]*[ -/]*[@-~]","g"),s=new RegExp("\x1B\\][^\x07]*(?:\x07|\x1B\\\\)","g");return e.replace(o," ").replace(s," ").split("").map(i=>{const n=i.charCodeAt(0);return n<=8||n===11||n===12||n>=14&&n<=31||n===127?" ":i}).join("").replace(/\s+/g," ").trim()}function z(e){if(!e)return!1;const t=e.toLowerCase();return t.includes("welcome to codex")||t.includes("sign in with chatgpt")||t.includes("provide your own api key")||t.includes("press enter to continue")}function f(e){return[/WARNING: proceeding, even though we could not update PATH:/i,/Reading additional input from stdin\.\.\./i,/failed to record rollout items: failed to queue rollout items: channel closed/i].some(t=>t.test(e))}function N(e){return e?[/\bunauthorized\b/i,/\bforbidden\b/i,/\bpermission denied\b/i,/\brate limit\b/i,/\binsufficient quota\b/i,/\bapi key\b/i,/\bauth/i,/\bnetwork\b/i,/\btimeout\b/i,/\bnot found\b/i,/\berror\b/i,/\bfailed\b/i].some(t=>t.test(e)):!1}export{m as CODEX_APP_SERVER_CLIENT_INFO,E as extractAppServerErrorMessage,S as formatCodexErrorMessage,I as formatTransientCodexStatus,b as isCodexCollabAgentItem,a as isCodexCollabAgentToolName,x as isCodexLegacyCollabAgentItem,y as isCodexUnsupportedEffortError,f as isIgnorableCodexStderrLine,h as isMissingCodexRolloutError,T as isTransientCodexErrorMessage,z as looksLikeCodexInteractiveAuthPrompt,N as looksLikeFatalCodexStderr,d as looksLikeMissingNodeOnWindows,g as makeThreadTitle,C as normalizeCodexModelId,A as normalizeCodexReasoningEffort,L as normalizeCodexStderr,$ as normalizeTerminalText,c as normalizeTitleText,_ as safeStringify,w as stripGitDirectiveArtifacts};

package/dist/src/agents/codex.d.ts

@@ -1,5 +1,6 @@
 import { AgentAdapter } from './adapter.js';
 import type { ChatAttachmentMeta, ExternalChannelSessionStatus } from '@shennian/wire';
+import type { SessionRunPhase } from '@shennian/wire';
 export { isCodexUnsupportedEffortError, isMissingCodexRolloutError, normalizeCodexModelId, normalizeCodexReasoningEffort, } from './codex-utils.js';
 export declare class CodexAdapter extends AgentAdapter {
     private readonly options;
@@ -40,6 +41,12 @@ export declare class CodexAdapter extends AgentAdapter {
     resume(agentSessionId: string): Promise<void>;
     setTitle(agentSessionId: string, title: string, workDir?: string): Promise<void>;
     stop(): Promise<void>;
+    getStatus(): Promise<{
+        active: boolean;
+        runId?: string | null;
+        runPhase?: SessionRunPhase | null;
+        canStop?: boolean;
+    }>;
     private spawnCodex;
     private spawnAppServer;
     private ensureAppServer;
@@ -49,6 +56,7 @@ export declare class CodexAdapter extends AgentAdapter {
     private interruptActiveTurn;
     private sendRpc;
     private handleAppServerMessage;
+    private mapThreadStatusToRunPhase;
     private handleAppServerNonJsonStdout;
     private failAppServerStartup;
     private handleAppServerCompletedItem;