pikiloom 0.4.36 → 0.4.37

package/dist/agent/drivers/codex.js

@@ -773,6 +773,23 @@ function createCodexStreamState(opts) {
         generatingImages: 0,
     };
 }
+// Codex on a ChatGPT-account login rejects non-OpenAI models with a raw upstream JSON blob
+// (e.g. {"detail":"The 'deepseek-v4-pro' model is not supported when using Codex with a
+// ChatGPT account."}). When a third-party model is correctly bound to a Provider profile the
+// injector routes around this; this only fires when no binding exists, so turn the opaque
+// upstream error into an actionable instruction instead of leaking JSON to the chat bubble.
+export function humanizeCodexError(raw) {
+    if (!raw)
+        return null;
+    const match = raw.match(/The '([^']+)' model is not supported when using Codex with a ChatGPT account/i);
+    if (match) {
+        const model = match[1];
+        return `Codex 正在使用 ChatGPT 账号登录，无法运行第三方模型「${model}」。`
+            + `请在「智能体配置」页接入该模型的供应商（填入 Base URL 与 API Key），添加对应模型档案并绑定到 Codex，`
+            + `或改用 Codex 原生模型（如 gpt-5.5）。`;
+    }
+    return raw;
+}
 function codexErrorResult(error, start, sessionId, model, thinkingEffort) {
     return {
         ok: false, message: error, thinking: null,
@@ -1119,7 +1136,7 @@ export async function doCodexStream(opts) {
         if (threadResp.error) {
             const errMsg = threadResp.error.message || 'thread/start failed';
             agentWarn(`[codex-rpc] thread error: ${errMsg}`);
-            return codexErrorResult(errMsg, start, opts.sessionId, opts.model, opts.thinkingEffort);
+            return codexErrorResult(humanizeCodexError(errMsg) ?? errMsg, start, opts.sessionId, opts.model, opts.thinkingEffort);
         }
         const threadResult = threadResp.result;
         s.sessionId = threadResult.thread?.id ?? s.sessionId;
@@ -1210,7 +1227,7 @@ export async function doCodexStream(opts) {
             unsubscribeRequests();
             const errMsg = turnResp.error.message || 'turn/start failed';
             agentWarn(`[codex-rpc] turn/start error: ${errMsg}`);
-            return codexErrorResult(errMsg, start, s.sessionId, s.model, s.thinkingEffort);
+            return codexErrorResult(humanizeCodexError(errMsg) ?? errMsg, start, s.sessionId, s.model, s.thinkingEffort);
         }
         s.turnId = turnResp.result?.turn?.id ?? null;
         publishTurnControl();
@@ -1226,7 +1243,7 @@ export async function doCodexStream(opts) {
             tryEmitCodexImageBlock(s, callId);
         }
         const ok = s.turnStatus === 'completed' && !timedOut && !interrupted;
-        const error = s.turnError
+        const error = humanizeCodexError(s.turnError)
             || (interrupted ? 'Interrupted by user.' : null)
             || (timedOut ? `Timed out after ${opts.timeout}s waiting for turn completion.` : null)
             || (!ok ? `Turn ${s.turnStatus || 'unknown'}.` : null);

package/dist/agent/index.js

@@ -7,7 +7,7 @@ export { attachAgentImage, attachInlineImage, materializeImage, rewriteAttachmen
 export { deliverArtifact, readDeliveredArtifacts, deliveredArtifactBlocks, tailDeliveredBlocks, latestDeliveredTaskId, mimeForArtifact, } from './artifacts.js';
 export { Q, agentLog, agentWarn, agentError, dedupeStrings, numberOrNull, normalizeStreamPreviewPlan, parseTodoWriteAsPlan, normalizeActivityLine, pushRecentActivity, detectClaudeApiError, isRetryableClaudeApiError, detectClaudeModelError, claudeModelErrorMessage, firstNonEmptyLine, shortValue, normalizeErrorMessage, joinErrorMessages, appendSystemPrompt, mimeForExt, computeContext, buildStreamPreviewMeta, summarizeClaudeToolUse, summarizeClaudeToolResult, previewToolCallInput, previewToolCallResult, roundPercent, toIsoFromEpochSeconds, normalizeUsageStatus, labelFromWindowMinutes, usageWindowFromRateLimit, parseJsonTail, modelFamily, normalizeClaudeModelId, emptyUsage, readTailLines, stripInjectedPrompts, sanitizeSessionUserPreviewText, SESSION_PREVIEW_IMAGE_PLACEHOLDER_RE, CLAUDE_AT_MENTION_IMAGE_RE, extractClaudeAtMentionImagePaths, stripClaudeAtMentionImages, isPendingSessionId, emitSessionIdUpdate, sessionListDisplayTitle, } from './utils.js';
 export { updateSessionMeta, promoteSessionId, recordFork, resolveCanonicalSessionId, getSessionPromotions, listPikiloomSessions, findPikiloomSession, getSessionStoredConfig, ensureManagedSession, findManagedThreadSession, stageSessionFiles, mergeManagedAndNativeSessions, managedRecordToSessionInfo, getSessions, getSessionTail, getSessionMessages, applyTurnWindow, applyTurnFilter, classifySession, deriveUserStatus, exportSession, importSession, deleteAgentSession, isProcessAlive, isRunningSessionStale, reconcileOrphanedRunningSessions, } from './session.js';
-export { detectAgentBin, listAgents, resolveDefaultAgent, run, doStream, listModels, resolveAgentModels, getUsage, getAgentBoundModelId, setAgentBoundModelId, } from './stream.js';
+export { detectAgentBin, listAgents, resolveDefaultAgent, run, doStream, recoverProfileIdForModel, listModels, resolveAgentModels, getUsage, getAgentBoundModelId, setAgentBoundModelId, } from './stream.js';
 export { registerDriver, getDriver, getDriverCapabilities, allDrivers, allDriverIds, hasDriver, shutdownAllDrivers, } from './driver.js';
 export { getProjectSkillPaths, initializeProjectSkills, listSkills, getGlobalSkillsRoot, collapseSkillPrompt, } from './skills.js';
 export { readGoal, writeGoal, clearGoal, setGoal, pauseGoal, resumeGoal, completeGoal, accountTurn, bumpContinuationCount, shouldContinueAfterTurn, renderContinuationPrompt, renderBudgetLimitPrompt, sessionGoalPath, DEFAULT_MAX_CONTINUATIONS, } from './goal.js';
@@ -19,6 +19,6 @@ export { getMcpToken, saveMcpToken, deleteMcpToken, hasValidMcpToken, startAutho
 export { installSkill, removeSkill, checkSkillUpdates, getGlobalSkillsDir, recordSkillInstall, getSkillLedgerEntry, forgetSkillInstall, normalizeSkillSourceKey, } from './skill-installer.js';
 export { getRecommendedClis, getRecommendedCli, detectCli, getCachedCliStatus, invalidateCliStatus, currentPlatform, getCliCatalog, refreshCliStatus, startCliAuthSession, getAuthSession, cancelAuthSession, applyCliToken, logoutCli, startCliInstallSession, } from './cli/index.js';
 export { doClaudeStream } from './drivers/claude.js';
-export { doCodexStream, buildCodexTurnInput, shutdownCodexServer, getCodexUsageLive } from './drivers/codex.js';
+export { doCodexStream, buildCodexTurnInput, shutdownCodexServer, getCodexUsageLive, humanizeCodexError } from './drivers/codex.js';
 export { doGeminiStream } from './drivers/gemini.js';
 export { doHermesStream } from './drivers/hermes.js';

package/dist/agent/stream.js

@@ -388,6 +388,35 @@ function finalizeStreamResult(result, workdir, prompt, session, workflowEnabled,
     saveSessionRecord(workdir, session.record);
     return { ...result, sessionId: session.sessionId, workspacePath: session.workspacePath };
 }
+function requestedModelForAgent(opts) {
+    switch (opts.agent) {
+        case 'claude': return (opts.claudeModel || opts.model || '').trim();
+        case 'codex': return (opts.codexModel || opts.model || '').trim();
+        case 'gemini': return (opts.geminiModel || opts.model || '').trim();
+        case 'hermes': return (opts.hermesModel || opts.model || '').trim();
+    }
+    return (opts.model || '').trim();
+}
+// When a session carries a third-party model id but its profile binding was lost
+// (stale/deleted profileId, or a model selected without a binding), resolveAgentInjection
+// returns null and the agent silently falls back to its native account — e.g. Codex on a
+// ChatGPT login rejects "deepseek-v4-pro". If exactly one configured profile (for a provider
+// kind this agent accepts) declares that model id, the intent is unambiguous: recover it.
+export function recoverProfileIdForModel(agent, modelId) {
+    const model = modelId.trim();
+    if (!model)
+        return null;
+    const accepted = new Set(getAcceptedProviderKinds(agent));
+    if (accepted.size === 0)
+        return null;
+    const matches = listProfiles().filter(profile => {
+        if (profile.modelId !== model)
+            return false;
+        const provider = getProvider(profile.providerId);
+        return !!provider && accepted.has(provider.kind);
+    });
+    return matches.length === 1 ? matches[0].id : null;
+}
 export async function doStream(opts) {
     let session;
     let prepared;
@@ -446,7 +475,18 @@ export async function doStream(opts) {
         agentWarn(`[mcp] bridge start failed: ${e.message} — proceeding without MCP`);
     }
     try {
-        const injection = await resolveAgentInjection(prepared.agent, prepared.profileId);
+        let injection = await resolveAgentInjection(prepared.agent, prepared.profileId);
+        if (!injection) {
+            const requestedModel = requestedModelForAgent(prepared);
+            const recoveredProfileId = recoverProfileIdForModel(prepared.agent, requestedModel);
+            if (recoveredProfileId) {
+                injection = await resolveAgentInjection(prepared.agent, recoveredProfileId);
+                if (injection) {
+                    prepared.profileId = recoveredProfileId;
+                    agentLog(`[byok] recovered lost provider binding: agent=${prepared.agent} model=${requestedModel} → profile=${recoveredProfileId}`);
+                }
+            }
+        }
         if (injection) {
             prepared.extraEnv = { ...(prepared.extraEnv || {}), ...injection.env };
             if (injection.modelOverride) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pikiloom",
-  "version": "0.4.36",
+  "version": "0.4.37",
   "description": "Put the world's smartest AI agents in your pocket. Command local Claude & Gemini via IM. | 让最好用的 IM 变成你电脑上的顶级 Agent 控制台",
   "type": "module",
   "bin": {