* docs: thread-bound subagents plan * docs: add exact thread-bound subagent implementation touchpoints * Docs: prioritize auto thread-bound subagent flow * Docs: add ACP harness thread-binding extensions * Discord: add thread-bound session routing and auto-bind spawn flow * Subagents: add focus commands and ACP/session binding lifecycle hooks * Tests: cover thread bindings, focus commands, and ACP unbind hooks * Docs: add plugin-hook appendix for thread-bound subagents * Plugins: add subagent lifecycle hook events * Core: emit subagent lifecycle hooks and decouple Discord bindings * Discord: handle subagent bind lifecycle via plugin hooks * Subagents: unify completion finalizer and split registry modules * Add subagent lifecycle events module * Hooks: fix subagent ended context key * Discord: share thread bindings across ESM and Jiti * Subagents: add persistent sessions_spawn mode for thread-bound sessions * Subagents: clarify thread intro and persistent completion copy * test(subagents): stabilize sessions_spawn lifecycle cleanup assertions * Discord: add thread-bound session TTL with auto-unfocus * Subagents: fail session spawns when thread bind fails * Subagents: cover thread session failure cleanup paths * Session: add thread binding TTL config and /session ttl controls * Tests: align discord reaction expectations * Agent: persist sessionFile for keyed subagent sessions * Discord: normalize imports after conflict resolution * Sessions: centralize sessionFile resolve/persist helper * Discord: harden thread-bound subagent session routing * Rebase: resolve upstream/main conflicts * Subagents: move thread binding into hooks and split bindings modules * Docs: add channel-agnostic subagent routing hook plan * Agents: decouple subagent routing from Discord * Discord: refactor thread-bound subagent flows * Subagents: prevent duplicate end hooks and orphaned failed sessions * Refactor: split subagent command and provider phases * Subagents: honor hook delivery target overrides * Discord: add thread binding kill switches and refresh plan doc * Discord: fix thread bind channel resolution * Routing: centralize account id normalization * Discord: clean up thread bindings on startup failures * Discord: add startup cleanup regression tests * Docs: add long-term thread-bound subagent architecture * Docs: split session binding plan and dedupe thread-bound doc * Subagents: add channel-agnostic session binding routing * Subagents: stabilize announce completion routing tests * Subagents: cover multi-bound completion routing * Subagents: suppress lifecycle hooks on failed thread bind * tests: fix discord provider mock typing regressions * docs/protocol: sync slash command aliases and delete param models * fix: add changelog entry for Discord thread-bound subagents (#21805) (thanks @onutc) --------- Co-authored-by: Shadow <hi@shadowing.dev>
670 lines
22 KiB
TypeScript
670 lines
22 KiB
TypeScript
import path from "node:path";
|
|
import {
|
|
listAgentIds,
|
|
resolveAgentDir,
|
|
resolveEffectiveModelFallbacks,
|
|
resolveAgentModelPrimary,
|
|
resolveAgentSkillsFilter,
|
|
resolveAgentWorkspaceDir,
|
|
} from "../agents/agent-scope.js";
|
|
import { ensureAuthProfileStore } from "../agents/auth-profiles.js";
|
|
import { clearSessionAuthProfileOverride } from "../agents/auth-profiles/session-override.js";
|
|
import { runCliAgent } from "../agents/cli-runner.js";
|
|
import { getCliSessionId } from "../agents/cli-session.js";
|
|
import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../agents/defaults.js";
|
|
import { AGENT_LANE_SUBAGENT } from "../agents/lanes.js";
|
|
import { loadModelCatalog } from "../agents/model-catalog.js";
|
|
import { runWithModelFallback } from "../agents/model-fallback.js";
|
|
import {
|
|
buildAllowedModelSet,
|
|
isCliProvider,
|
|
modelKey,
|
|
normalizeModelRef,
|
|
resolveConfiguredModelRef,
|
|
resolveThinkingDefault,
|
|
} from "../agents/model-selection.js";
|
|
import { runEmbeddedPiAgent } from "../agents/pi-embedded.js";
|
|
import { buildWorkspaceSkillSnapshot } from "../agents/skills.js";
|
|
import { getSkillsSnapshotVersion } from "../agents/skills/refresh.js";
|
|
import { resolveAgentTimeoutMs } from "../agents/timeout.js";
|
|
import { ensureAgentWorkspace } from "../agents/workspace.js";
|
|
import {
|
|
formatThinkingLevels,
|
|
formatXHighModelHint,
|
|
normalizeThinkLevel,
|
|
normalizeVerboseLevel,
|
|
supportsXHighThinking,
|
|
type ThinkLevel,
|
|
type VerboseLevel,
|
|
} from "../auto-reply/thinking.js";
|
|
import { formatCliCommand } from "../cli/command-format.js";
|
|
import { type CliDeps, createDefaultDeps } from "../cli/deps.js";
|
|
import { loadConfig } from "../config/config.js";
|
|
import {
|
|
parseSessionThreadInfo,
|
|
resolveAndPersistSessionFile,
|
|
resolveAgentIdFromSessionKey,
|
|
resolveSessionFilePath,
|
|
resolveSessionTranscriptPath,
|
|
type SessionEntry,
|
|
updateSessionStore,
|
|
} from "../config/sessions.js";
|
|
import {
|
|
clearAgentRunContext,
|
|
emitAgentEvent,
|
|
registerAgentRunContext,
|
|
} from "../infra/agent-events.js";
|
|
import { getRemoteSkillEligibility } from "../infra/skills-remote.js";
|
|
import { normalizeAgentId } from "../routing/session-key.js";
|
|
import { defaultRuntime, type RuntimeEnv } from "../runtime.js";
|
|
import { applyVerboseOverride } from "../sessions/level-overrides.js";
|
|
import { applyModelOverrideToSessionEntry } from "../sessions/model-overrides.js";
|
|
import { resolveSendPolicy } from "../sessions/send-policy.js";
|
|
import { resolveMessageChannel } from "../utils/message-channel.js";
|
|
import { deliverAgentCommandResult } from "./agent/delivery.js";
|
|
import { resolveAgentRunContext } from "./agent/run-context.js";
|
|
import { updateSessionStoreAfterAgentRun } from "./agent/session-store.js";
|
|
import { resolveSession } from "./agent/session.js";
|
|
import type { AgentCommandOpts } from "./agent/types.js";
|
|
|
|
type PersistSessionEntryParams = {
|
|
sessionStore: Record<string, SessionEntry>;
|
|
sessionKey: string;
|
|
storePath: string;
|
|
entry: SessionEntry;
|
|
};
|
|
|
|
async function persistSessionEntry(params: PersistSessionEntryParams): Promise<void> {
|
|
params.sessionStore[params.sessionKey] = params.entry;
|
|
await updateSessionStore(params.storePath, (store) => {
|
|
store[params.sessionKey] = params.entry;
|
|
});
|
|
}
|
|
|
|
function resolveFallbackRetryPrompt(params: { body: string; isFallbackRetry: boolean }): string {
|
|
if (!params.isFallbackRetry) {
|
|
return params.body;
|
|
}
|
|
return "Continue where you left off. The previous model attempt failed or timed out.";
|
|
}
|
|
|
|
function runAgentAttempt(params: {
|
|
providerOverride: string;
|
|
modelOverride: string;
|
|
cfg: ReturnType<typeof loadConfig>;
|
|
sessionEntry: SessionEntry | undefined;
|
|
sessionId: string;
|
|
sessionKey: string | undefined;
|
|
sessionAgentId: string;
|
|
sessionFile: string;
|
|
workspaceDir: string;
|
|
body: string;
|
|
isFallbackRetry: boolean;
|
|
resolvedThinkLevel: ThinkLevel;
|
|
timeoutMs: number;
|
|
runId: string;
|
|
opts: AgentCommandOpts;
|
|
runContext: ReturnType<typeof resolveAgentRunContext>;
|
|
spawnedBy: string | undefined;
|
|
messageChannel: ReturnType<typeof resolveMessageChannel>;
|
|
skillsSnapshot: ReturnType<typeof buildWorkspaceSkillSnapshot> | undefined;
|
|
resolvedVerboseLevel: VerboseLevel | undefined;
|
|
agentDir: string;
|
|
onAgentEvent: (evt: { stream: string; data?: Record<string, unknown> }) => void;
|
|
primaryProvider: string;
|
|
}) {
|
|
const effectivePrompt = resolveFallbackRetryPrompt({
|
|
body: params.body,
|
|
isFallbackRetry: params.isFallbackRetry,
|
|
});
|
|
if (isCliProvider(params.providerOverride, params.cfg)) {
|
|
const cliSessionId = getCliSessionId(params.sessionEntry, params.providerOverride);
|
|
return runCliAgent({
|
|
sessionId: params.sessionId,
|
|
sessionKey: params.sessionKey,
|
|
agentId: params.sessionAgentId,
|
|
sessionFile: params.sessionFile,
|
|
workspaceDir: params.workspaceDir,
|
|
config: params.cfg,
|
|
prompt: effectivePrompt,
|
|
provider: params.providerOverride,
|
|
model: params.modelOverride,
|
|
thinkLevel: params.resolvedThinkLevel,
|
|
timeoutMs: params.timeoutMs,
|
|
runId: params.runId,
|
|
extraSystemPrompt: params.opts.extraSystemPrompt,
|
|
cliSessionId,
|
|
images: params.isFallbackRetry ? undefined : params.opts.images,
|
|
streamParams: params.opts.streamParams,
|
|
});
|
|
}
|
|
|
|
const authProfileId =
|
|
params.providerOverride === params.primaryProvider
|
|
? params.sessionEntry?.authProfileOverride
|
|
: undefined;
|
|
return runEmbeddedPiAgent({
|
|
sessionId: params.sessionId,
|
|
sessionKey: params.sessionKey,
|
|
agentId: params.sessionAgentId,
|
|
messageChannel: params.messageChannel,
|
|
agentAccountId: params.runContext.accountId,
|
|
messageTo: params.opts.replyTo ?? params.opts.to,
|
|
messageThreadId: params.opts.threadId,
|
|
groupId: params.runContext.groupId,
|
|
groupChannel: params.runContext.groupChannel,
|
|
groupSpace: params.runContext.groupSpace,
|
|
spawnedBy: params.spawnedBy,
|
|
currentChannelId: params.runContext.currentChannelId,
|
|
currentThreadTs: params.runContext.currentThreadTs,
|
|
replyToMode: params.runContext.replyToMode,
|
|
hasRepliedRef: params.runContext.hasRepliedRef,
|
|
senderIsOwner: true,
|
|
sessionFile: params.sessionFile,
|
|
workspaceDir: params.workspaceDir,
|
|
config: params.cfg,
|
|
skillsSnapshot: params.skillsSnapshot,
|
|
prompt: effectivePrompt,
|
|
images: params.isFallbackRetry ? undefined : params.opts.images,
|
|
clientTools: params.opts.clientTools,
|
|
provider: params.providerOverride,
|
|
model: params.modelOverride,
|
|
authProfileId,
|
|
authProfileIdSource: authProfileId ? params.sessionEntry?.authProfileOverrideSource : undefined,
|
|
thinkLevel: params.resolvedThinkLevel,
|
|
verboseLevel: params.resolvedVerboseLevel,
|
|
timeoutMs: params.timeoutMs,
|
|
runId: params.runId,
|
|
lane: params.opts.lane,
|
|
abortSignal: params.opts.abortSignal,
|
|
extraSystemPrompt: params.opts.extraSystemPrompt,
|
|
inputProvenance: params.opts.inputProvenance,
|
|
streamParams: params.opts.streamParams,
|
|
agentDir: params.agentDir,
|
|
onAgentEvent: params.onAgentEvent,
|
|
});
|
|
}
|
|
|
|
export async function agentCommand(
|
|
opts: AgentCommandOpts,
|
|
runtime: RuntimeEnv = defaultRuntime,
|
|
deps: CliDeps = createDefaultDeps(),
|
|
) {
|
|
const body = (opts.message ?? "").trim();
|
|
if (!body) {
|
|
throw new Error("Message (--message) is required");
|
|
}
|
|
if (!opts.to && !opts.sessionId && !opts.sessionKey && !opts.agentId) {
|
|
throw new Error("Pass --to <E.164>, --session-id, or --agent to choose a session");
|
|
}
|
|
|
|
const cfg = loadConfig();
|
|
const agentIdOverrideRaw = opts.agentId?.trim();
|
|
const agentIdOverride = agentIdOverrideRaw ? normalizeAgentId(agentIdOverrideRaw) : undefined;
|
|
if (agentIdOverride) {
|
|
const knownAgents = listAgentIds(cfg);
|
|
if (!knownAgents.includes(agentIdOverride)) {
|
|
throw new Error(
|
|
`Unknown agent id "${agentIdOverrideRaw}". Use "${formatCliCommand("openclaw agents list")}" to see configured agents.`,
|
|
);
|
|
}
|
|
}
|
|
if (agentIdOverride && opts.sessionKey) {
|
|
const sessionAgentId = resolveAgentIdFromSessionKey(opts.sessionKey);
|
|
if (sessionAgentId !== agentIdOverride) {
|
|
throw new Error(
|
|
`Agent id "${agentIdOverrideRaw}" does not match session key agent "${sessionAgentId}".`,
|
|
);
|
|
}
|
|
}
|
|
const agentCfg = cfg.agents?.defaults;
|
|
const sessionAgentId = agentIdOverride ?? resolveAgentIdFromSessionKey(opts.sessionKey?.trim());
|
|
const workspaceDirRaw = resolveAgentWorkspaceDir(cfg, sessionAgentId);
|
|
const agentDir = resolveAgentDir(cfg, sessionAgentId);
|
|
const workspace = await ensureAgentWorkspace({
|
|
dir: workspaceDirRaw,
|
|
ensureBootstrapFiles: !agentCfg?.skipBootstrap,
|
|
});
|
|
const workspaceDir = workspace.dir;
|
|
const configuredModel = resolveConfiguredModelRef({
|
|
cfg,
|
|
defaultProvider: DEFAULT_PROVIDER,
|
|
defaultModel: DEFAULT_MODEL,
|
|
});
|
|
const thinkingLevelsHint = formatThinkingLevels(configuredModel.provider, configuredModel.model);
|
|
|
|
const thinkOverride = normalizeThinkLevel(opts.thinking);
|
|
const thinkOnce = normalizeThinkLevel(opts.thinkingOnce);
|
|
if (opts.thinking && !thinkOverride) {
|
|
throw new Error(`Invalid thinking level. Use one of: ${thinkingLevelsHint}.`);
|
|
}
|
|
if (opts.thinkingOnce && !thinkOnce) {
|
|
throw new Error(`Invalid one-shot thinking level. Use one of: ${thinkingLevelsHint}.`);
|
|
}
|
|
|
|
const verboseOverride = normalizeVerboseLevel(opts.verbose);
|
|
if (opts.verbose && !verboseOverride) {
|
|
throw new Error('Invalid verbose level. Use "on", "full", or "off".');
|
|
}
|
|
|
|
const laneRaw = typeof opts.lane === "string" ? opts.lane.trim() : "";
|
|
const isSubagentLane = laneRaw === String(AGENT_LANE_SUBAGENT);
|
|
const timeoutSecondsRaw =
|
|
opts.timeout !== undefined
|
|
? Number.parseInt(String(opts.timeout), 10)
|
|
: isSubagentLane
|
|
? 0
|
|
: undefined;
|
|
if (
|
|
timeoutSecondsRaw !== undefined &&
|
|
(Number.isNaN(timeoutSecondsRaw) || timeoutSecondsRaw < 0)
|
|
) {
|
|
throw new Error("--timeout must be a non-negative integer (seconds; 0 means no timeout)");
|
|
}
|
|
const timeoutMs = resolveAgentTimeoutMs({
|
|
cfg,
|
|
overrideSeconds: timeoutSecondsRaw,
|
|
});
|
|
|
|
const sessionResolution = resolveSession({
|
|
cfg,
|
|
to: opts.to,
|
|
sessionId: opts.sessionId,
|
|
sessionKey: opts.sessionKey,
|
|
agentId: agentIdOverride,
|
|
});
|
|
|
|
const {
|
|
sessionId,
|
|
sessionKey,
|
|
sessionEntry: resolvedSessionEntry,
|
|
sessionStore,
|
|
storePath,
|
|
isNewSession,
|
|
persistedThinking,
|
|
persistedVerbose,
|
|
} = sessionResolution;
|
|
let sessionEntry = resolvedSessionEntry;
|
|
const runId = opts.runId?.trim() || sessionId;
|
|
|
|
try {
|
|
if (opts.deliver === true) {
|
|
const sendPolicy = resolveSendPolicy({
|
|
cfg,
|
|
entry: sessionEntry,
|
|
sessionKey,
|
|
channel: sessionEntry?.channel,
|
|
chatType: sessionEntry?.chatType,
|
|
});
|
|
if (sendPolicy === "deny") {
|
|
throw new Error("send blocked by session policy");
|
|
}
|
|
}
|
|
|
|
let resolvedThinkLevel =
|
|
thinkOnce ??
|
|
thinkOverride ??
|
|
persistedThinking ??
|
|
(agentCfg?.thinkingDefault as ThinkLevel | undefined);
|
|
const resolvedVerboseLevel =
|
|
verboseOverride ?? persistedVerbose ?? (agentCfg?.verboseDefault as VerboseLevel | undefined);
|
|
|
|
if (sessionKey) {
|
|
registerAgentRunContext(runId, {
|
|
sessionKey,
|
|
verboseLevel: resolvedVerboseLevel,
|
|
});
|
|
}
|
|
|
|
const needsSkillsSnapshot = isNewSession || !sessionEntry?.skillsSnapshot;
|
|
const skillsSnapshotVersion = getSkillsSnapshotVersion(workspaceDir);
|
|
const skillFilter = resolveAgentSkillsFilter(cfg, sessionAgentId);
|
|
const skillsSnapshot = needsSkillsSnapshot
|
|
? buildWorkspaceSkillSnapshot(workspaceDir, {
|
|
config: cfg,
|
|
eligibility: { remote: getRemoteSkillEligibility() },
|
|
snapshotVersion: skillsSnapshotVersion,
|
|
skillFilter,
|
|
})
|
|
: sessionEntry?.skillsSnapshot;
|
|
|
|
if (skillsSnapshot && sessionStore && sessionKey && needsSkillsSnapshot) {
|
|
const current = sessionEntry ?? {
|
|
sessionId,
|
|
updatedAt: Date.now(),
|
|
};
|
|
const next: SessionEntry = {
|
|
...current,
|
|
sessionId,
|
|
updatedAt: Date.now(),
|
|
skillsSnapshot,
|
|
};
|
|
await persistSessionEntry({
|
|
sessionStore,
|
|
sessionKey,
|
|
storePath,
|
|
entry: next,
|
|
});
|
|
sessionEntry = next;
|
|
}
|
|
|
|
// Persist explicit /command overrides to the session store when we have a key.
|
|
if (sessionStore && sessionKey) {
|
|
const entry = sessionStore[sessionKey] ??
|
|
sessionEntry ?? { sessionId, updatedAt: Date.now() };
|
|
const next: SessionEntry = { ...entry, sessionId, updatedAt: Date.now() };
|
|
if (thinkOverride) {
|
|
next.thinkingLevel = thinkOverride;
|
|
}
|
|
applyVerboseOverride(next, verboseOverride);
|
|
await persistSessionEntry({
|
|
sessionStore,
|
|
sessionKey,
|
|
storePath,
|
|
entry: next,
|
|
});
|
|
sessionEntry = next;
|
|
}
|
|
|
|
const agentModelPrimary = resolveAgentModelPrimary(cfg, sessionAgentId);
|
|
const cfgForModelSelection = agentModelPrimary
|
|
? {
|
|
...cfg,
|
|
agents: {
|
|
...cfg.agents,
|
|
defaults: {
|
|
...cfg.agents?.defaults,
|
|
model: {
|
|
...(typeof cfg.agents?.defaults?.model === "object"
|
|
? cfg.agents.defaults.model
|
|
: undefined),
|
|
primary: agentModelPrimary,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
: cfg;
|
|
|
|
const configuredDefaultRef = resolveConfiguredModelRef({
|
|
cfg: cfgForModelSelection,
|
|
defaultProvider: DEFAULT_PROVIDER,
|
|
defaultModel: DEFAULT_MODEL,
|
|
});
|
|
const { provider: defaultProvider, model: defaultModel } = normalizeModelRef(
|
|
configuredDefaultRef.provider,
|
|
configuredDefaultRef.model,
|
|
);
|
|
let provider = defaultProvider;
|
|
let model = defaultModel;
|
|
const hasAllowlist = agentCfg?.models && Object.keys(agentCfg.models).length > 0;
|
|
const hasStoredOverride = Boolean(
|
|
sessionEntry?.modelOverride || sessionEntry?.providerOverride,
|
|
);
|
|
const needsModelCatalog = hasAllowlist || hasStoredOverride;
|
|
let allowedModelKeys = new Set<string>();
|
|
let allowedModelCatalog: Awaited<ReturnType<typeof loadModelCatalog>> = [];
|
|
let modelCatalog: Awaited<ReturnType<typeof loadModelCatalog>> | null = null;
|
|
|
|
if (needsModelCatalog) {
|
|
modelCatalog = await loadModelCatalog({ config: cfg });
|
|
const allowed = buildAllowedModelSet({
|
|
cfg,
|
|
catalog: modelCatalog,
|
|
defaultProvider,
|
|
defaultModel,
|
|
});
|
|
allowedModelKeys = allowed.allowedKeys;
|
|
allowedModelCatalog = allowed.allowedCatalog;
|
|
}
|
|
|
|
if (sessionEntry && sessionStore && sessionKey && hasStoredOverride) {
|
|
const entry = sessionEntry;
|
|
const overrideProvider = sessionEntry.providerOverride?.trim() || defaultProvider;
|
|
const overrideModel = sessionEntry.modelOverride?.trim();
|
|
if (overrideModel) {
|
|
const normalizedOverride = normalizeModelRef(overrideProvider, overrideModel);
|
|
const key = modelKey(normalizedOverride.provider, normalizedOverride.model);
|
|
if (
|
|
!isCliProvider(normalizedOverride.provider, cfg) &&
|
|
allowedModelKeys.size > 0 &&
|
|
!allowedModelKeys.has(key)
|
|
) {
|
|
const { updated } = applyModelOverrideToSessionEntry({
|
|
entry,
|
|
selection: { provider: defaultProvider, model: defaultModel, isDefault: true },
|
|
});
|
|
if (updated) {
|
|
await persistSessionEntry({
|
|
sessionStore,
|
|
sessionKey,
|
|
storePath,
|
|
entry,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
const storedProviderOverride = sessionEntry?.providerOverride?.trim();
|
|
const storedModelOverride = sessionEntry?.modelOverride?.trim();
|
|
if (storedModelOverride) {
|
|
const candidateProvider = storedProviderOverride || defaultProvider;
|
|
const normalizedStored = normalizeModelRef(candidateProvider, storedModelOverride);
|
|
const key = modelKey(normalizedStored.provider, normalizedStored.model);
|
|
if (
|
|
isCliProvider(normalizedStored.provider, cfg) ||
|
|
allowedModelKeys.size === 0 ||
|
|
allowedModelKeys.has(key)
|
|
) {
|
|
provider = normalizedStored.provider;
|
|
model = normalizedStored.model;
|
|
}
|
|
}
|
|
if (sessionEntry) {
|
|
const authProfileId = sessionEntry.authProfileOverride;
|
|
if (authProfileId) {
|
|
const entry = sessionEntry;
|
|
const store = ensureAuthProfileStore();
|
|
const profile = store.profiles[authProfileId];
|
|
if (!profile || profile.provider !== provider) {
|
|
if (sessionStore && sessionKey) {
|
|
await clearSessionAuthProfileOverride({
|
|
sessionEntry: entry,
|
|
sessionStore,
|
|
sessionKey,
|
|
storePath,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!resolvedThinkLevel) {
|
|
let catalogForThinking = modelCatalog ?? allowedModelCatalog;
|
|
if (!catalogForThinking || catalogForThinking.length === 0) {
|
|
modelCatalog = await loadModelCatalog({ config: cfg });
|
|
catalogForThinking = modelCatalog;
|
|
}
|
|
resolvedThinkLevel = resolveThinkingDefault({
|
|
cfg,
|
|
provider,
|
|
model,
|
|
catalog: catalogForThinking,
|
|
});
|
|
}
|
|
if (resolvedThinkLevel === "xhigh" && !supportsXHighThinking(provider, model)) {
|
|
const explicitThink = Boolean(thinkOnce || thinkOverride);
|
|
if (explicitThink) {
|
|
throw new Error(`Thinking level "xhigh" is only supported for ${formatXHighModelHint()}.`);
|
|
}
|
|
resolvedThinkLevel = "high";
|
|
if (sessionEntry && sessionStore && sessionKey && sessionEntry.thinkingLevel === "xhigh") {
|
|
const entry = sessionEntry;
|
|
entry.thinkingLevel = "high";
|
|
entry.updatedAt = Date.now();
|
|
await persistSessionEntry({
|
|
sessionStore,
|
|
sessionKey,
|
|
storePath,
|
|
entry,
|
|
});
|
|
}
|
|
}
|
|
let sessionFile = resolveSessionFilePath(sessionId, sessionEntry, {
|
|
agentId: sessionAgentId,
|
|
});
|
|
if (sessionStore && sessionKey) {
|
|
const threadIdFromSessionKey = parseSessionThreadInfo(sessionKey).threadId;
|
|
const fallbackSessionFile = !sessionEntry?.sessionFile
|
|
? resolveSessionTranscriptPath(
|
|
sessionId,
|
|
sessionAgentId,
|
|
opts.threadId ?? threadIdFromSessionKey,
|
|
)
|
|
: undefined;
|
|
const resolvedSessionFile = await resolveAndPersistSessionFile({
|
|
sessionId,
|
|
sessionKey,
|
|
sessionStore,
|
|
storePath,
|
|
sessionEntry,
|
|
agentId: sessionAgentId,
|
|
sessionsDir: path.dirname(storePath),
|
|
fallbackSessionFile,
|
|
});
|
|
sessionFile = resolvedSessionFile.sessionFile;
|
|
sessionEntry = resolvedSessionFile.sessionEntry;
|
|
}
|
|
|
|
const startedAt = Date.now();
|
|
let lifecycleEnded = false;
|
|
|
|
let result: Awaited<ReturnType<typeof runEmbeddedPiAgent>>;
|
|
let fallbackProvider = provider;
|
|
let fallbackModel = model;
|
|
try {
|
|
const runContext = resolveAgentRunContext(opts);
|
|
const messageChannel = resolveMessageChannel(
|
|
runContext.messageChannel,
|
|
opts.replyChannel ?? opts.channel,
|
|
);
|
|
const spawnedBy = opts.spawnedBy ?? sessionEntry?.spawnedBy;
|
|
// Keep fallback candidate resolution centralized so session model overrides,
|
|
// per-agent overrides, and default fallbacks stay consistent across callers.
|
|
const effectiveFallbacksOverride = resolveEffectiveModelFallbacks({
|
|
cfg,
|
|
agentId: sessionAgentId,
|
|
hasSessionModelOverride: Boolean(storedModelOverride),
|
|
});
|
|
|
|
// Track model fallback attempts so retries on an existing session don't
|
|
// re-inject the original prompt as a duplicate user message.
|
|
let fallbackAttemptIndex = 0;
|
|
const fallbackResult = await runWithModelFallback({
|
|
cfg,
|
|
provider,
|
|
model,
|
|
agentDir,
|
|
fallbacksOverride: effectiveFallbacksOverride,
|
|
run: (providerOverride, modelOverride) => {
|
|
const isFallbackRetry = fallbackAttemptIndex > 0;
|
|
fallbackAttemptIndex += 1;
|
|
return runAgentAttempt({
|
|
providerOverride,
|
|
modelOverride,
|
|
cfg,
|
|
sessionEntry,
|
|
sessionId,
|
|
sessionKey,
|
|
sessionAgentId,
|
|
sessionFile,
|
|
workspaceDir,
|
|
body,
|
|
isFallbackRetry,
|
|
resolvedThinkLevel,
|
|
timeoutMs,
|
|
runId,
|
|
opts,
|
|
runContext,
|
|
spawnedBy,
|
|
messageChannel,
|
|
skillsSnapshot,
|
|
resolvedVerboseLevel,
|
|
agentDir,
|
|
primaryProvider: provider,
|
|
onAgentEvent: (evt) => {
|
|
// Track lifecycle end for fallback emission below.
|
|
if (
|
|
evt.stream === "lifecycle" &&
|
|
typeof evt.data?.phase === "string" &&
|
|
(evt.data.phase === "end" || evt.data.phase === "error")
|
|
) {
|
|
lifecycleEnded = true;
|
|
}
|
|
},
|
|
});
|
|
},
|
|
});
|
|
result = fallbackResult.result;
|
|
fallbackProvider = fallbackResult.provider;
|
|
fallbackModel = fallbackResult.model;
|
|
if (!lifecycleEnded) {
|
|
emitAgentEvent({
|
|
runId,
|
|
stream: "lifecycle",
|
|
data: {
|
|
phase: "end",
|
|
startedAt,
|
|
endedAt: Date.now(),
|
|
aborted: result.meta.aborted ?? false,
|
|
},
|
|
});
|
|
}
|
|
} catch (err) {
|
|
if (!lifecycleEnded) {
|
|
emitAgentEvent({
|
|
runId,
|
|
stream: "lifecycle",
|
|
data: {
|
|
phase: "error",
|
|
startedAt,
|
|
endedAt: Date.now(),
|
|
error: String(err),
|
|
},
|
|
});
|
|
}
|
|
throw err;
|
|
}
|
|
|
|
// Update token+model fields in the session store.
|
|
if (sessionStore && sessionKey) {
|
|
await updateSessionStoreAfterAgentRun({
|
|
cfg,
|
|
contextTokensOverride: agentCfg?.contextTokens,
|
|
sessionId,
|
|
sessionKey,
|
|
storePath,
|
|
sessionStore,
|
|
defaultProvider: provider,
|
|
defaultModel: model,
|
|
fallbackProvider,
|
|
fallbackModel,
|
|
result,
|
|
});
|
|
}
|
|
|
|
const payloads = result.payloads ?? [];
|
|
return await deliverAgentCommandResult({
|
|
cfg,
|
|
deps,
|
|
runtime,
|
|
opts,
|
|
sessionEntry,
|
|
result,
|
|
payloads,
|
|
});
|
|
} finally {
|
|
clearAgentRunContext(runId);
|
|
}
|
|
}
|