feat: agent and CLI control plane for sessions, worktrees, and scheduled tasks (#2408)
Add a shared OpenChamber control service with two thin adapters — a native `openchamber` tool injected into managed OpenCode, and new CLI commands — so users can manage parallel sessions, worktrees, and scheduled tasks conversationally through agents or from the terminal. Control plane: - New openchamber-control service owning a fixed action contract: projects.list, models.list, session list/create/send/fork/status/messages, and schedule list/create/run/delete/toggle. Session and worktree deletion and project registration are deliberately not exposed. - New openchamber-sessions module owning create/worktree/prompt orchestration, Goal Mode dispatch, wait semantics (initial idle never counts as completion; timeout and cancellation are failures), and explicit partial-failure results. - Scheduled-task logic extracted into a service shared by routes, CLI, and the agent tool. Agent tool: - Managed OpenCode gets a materialized plugin registering one typed tool with a loopback-only callback, per-child ephemeral bearer (timing-safe, never persisted or logged), and abort propagation into the service. - The ~1.5k-token schema applies progressive disclosure: short descriptions, server-side validation returning actionable usage errors, and intent guardrails — created sessions/tasks are user-facing work (not age self-delegation); worktree/goal/agent/variant/wait are omit-by-default; dispatches produce no completion notification, and later result r to session.messages, which now returns the authoritative sessionStatus. - session.create without a user-named model picks from favorites/re send/fork omit the selection and the service reuses the target session's last user-message model, agent, and variant before falling back t - An "Agent control tool" setting (default on, Save + Reload to apply) disables plugin injection entirely. CLI: - New `openchamber session`, `schedule`, `projects`, and `models` commands with automatic instance targeting, --wait/--timeout/--last-assist worktree flags, and Goal Mode, preserving interactive, non-TTY, --quiet, and --json contracts. The control HTTP timeout derives from the w instead of the 4-second default. UI: - New built-in "Schedule a Task" starter (/schedule-task) running a dialogue that defines a task and offers to create it via the tool after explicit confirmation; Craft a Goal and Feature Planning gain the handoff offer, and guided starters reserve the question tool for concrete option choices. Localized in all 10 locales, migrated into custom starter lists, hidden on VS Code. - Sidebar shows CLI/agent-created sessions live via the control eve - openchamber tool calls render with per-action titles and metadata.
This commit is contained in:
Bohdan Triapitsyn
committed by
GitHub
GitHub
parent
484fe8bc18
commit
e908db637b
@@ -0,0 +1,714 @@
|
||||
import express from 'express';
|
||||
import { createOpencodeClient } from '@opencode-ai/sdk/v2';
|
||||
import { createWorktree } from '../git/index.js';
|
||||
import { expandSnippets } from '../opencode/snippets.js';
|
||||
import { parseScheduledCommandPrompt } from '../scheduled-tasks/runtime.js';
|
||||
import { buildGoalIntroText, createSessionGoal } from '../session-goal/create.js';
|
||||
import { OpenChamberControlError, asControlError } from '../openchamber-control/error.js';
|
||||
|
||||
const asNonEmptyString = (value) => {
|
||||
if (typeof value !== 'string') return null;
|
||||
const trimmed = value.trim();
|
||||
return trimmed.length > 0 ? trimmed : null;
|
||||
};
|
||||
|
||||
const splitModel = (value) => {
|
||||
const model = asNonEmptyString(value);
|
||||
if (!model) return null;
|
||||
const slashIndex = model.indexOf('/');
|
||||
if (slashIndex <= 0 || slashIndex === model.length - 1) return null;
|
||||
return {
|
||||
providerID: model.slice(0, slashIndex),
|
||||
modelID: model.slice(slashIndex + 1),
|
||||
};
|
||||
};
|
||||
|
||||
const resolveRequestedModel = (payload) => {
|
||||
const model = splitModel(payload?.model);
|
||||
if (model) return model;
|
||||
|
||||
const providerID = asNonEmptyString(payload?.providerID);
|
||||
const modelID = asNonEmptyString(payload?.modelID);
|
||||
return providerID && modelID ? { providerID, modelID } : null;
|
||||
};
|
||||
|
||||
const FALLBACK_PROVIDER_ID = 'opencode';
|
||||
const FALLBACK_MODEL_ID = 'big-pickle';
|
||||
const MIN_GOAL_TOKEN_BUDGET = 1_000;
|
||||
const MAX_GOAL_TOKEN_BUDGET = 100_000_000;
|
||||
|
||||
const resolveGoalInput = (payload, prompt) => {
|
||||
const enabled = payload?.goal === true;
|
||||
if (payload?.goalTokenBudget !== undefined && !enabled) {
|
||||
return { ok: false, error: 'goalTokenBudget requires goal' };
|
||||
}
|
||||
if (enabled && !prompt) {
|
||||
return { ok: false, error: 'prompt is required when goal is enabled' };
|
||||
}
|
||||
if (payload?.goalTokenBudget === undefined) {
|
||||
return { ok: true, enabled, tokenBudget: null };
|
||||
}
|
||||
const tokenBudget = payload.goalTokenBudget;
|
||||
if (!Number.isSafeInteger(tokenBudget)
|
||||
|| tokenBudget < MIN_GOAL_TOKEN_BUDGET
|
||||
|| tokenBudget > MAX_GOAL_TOKEN_BUDGET) {
|
||||
return { ok: false, error: `goalTokenBudget must be an integer from ${MIN_GOAL_TOKEN_BUDGET} to ${MAX_GOAL_TOKEN_BUDGET}` };
|
||||
}
|
||||
return { ok: true, enabled, tokenBudget };
|
||||
};
|
||||
|
||||
const isPrimaryAgentMode = (mode) => !mode || mode === 'primary' || mode === 'all';
|
||||
|
||||
const providerModels = (provider) => {
|
||||
if (Array.isArray(provider?.models)) return provider.models;
|
||||
if (provider?.models && typeof provider.models === 'object') return Object.values(provider.models);
|
||||
return [];
|
||||
};
|
||||
|
||||
const hasProviderModel = (providers, providerID, modelID) => {
|
||||
return providers.some((provider) => provider?.id === providerID
|
||||
&& providerModels(provider).some((model) => model?.id === modelID));
|
||||
};
|
||||
|
||||
const resolveVariant = (providers, providerID, modelID, variant) => {
|
||||
const normalized = asNonEmptyString(variant);
|
||||
if (!normalized) return undefined;
|
||||
const provider = providers.find((entry) => entry?.id === providerID);
|
||||
const model = providerModels(provider).find((entry) => entry?.id === modelID);
|
||||
return model?.variants && Object.prototype.hasOwnProperty.call(model.variants, normalized)
|
||||
? normalized
|
||||
: undefined;
|
||||
};
|
||||
|
||||
const parseConfigModel = (value) => splitModel(value);
|
||||
|
||||
const buildDirectoryHeaders = (directory) => ({
|
||||
...(directory ? { 'x-opencode-directory': directory } : {}),
|
||||
});
|
||||
|
||||
const fetchJson = async (url, authHeaders, fallback, directory) => {
|
||||
const response = await fetch(url.toString(), {
|
||||
headers: { ...authHeaders, ...buildDirectoryHeaders(directory), accept: 'application/json' },
|
||||
});
|
||||
if (!response.ok) return fallback;
|
||||
return response.json().catch(() => fallback);
|
||||
};
|
||||
|
||||
const fetchSelectionInputs = async ({ buildOpenCodeUrl, authHeaders, directory, readSettingsFromDiskMigrated }) => {
|
||||
const settings = await readSettingsFromDiskMigrated();
|
||||
const providersUrl = new URL(buildOpenCodeUrl('/config/providers', ''));
|
||||
providersUrl.searchParams.set('directory', directory);
|
||||
const agentsUrl = new URL(buildOpenCodeUrl('/agent', ''));
|
||||
agentsUrl.searchParams.set('directory', directory);
|
||||
const configUrl = new URL(buildOpenCodeUrl('/config', ''));
|
||||
configUrl.searchParams.set('directory', directory);
|
||||
|
||||
const [providersBody, agentsBody, configBody] = await Promise.all([
|
||||
fetchJson(providersUrl, authHeaders, { providers: [] }, directory),
|
||||
fetchJson(agentsUrl, authHeaders, [], directory),
|
||||
fetchJson(configUrl, authHeaders, {}, directory),
|
||||
]);
|
||||
|
||||
return {
|
||||
settings,
|
||||
providers: Array.isArray(providersBody?.providers) ? providersBody.providers : [],
|
||||
agents: Array.isArray(agentsBody) ? agentsBody : [],
|
||||
opencodeDefaultAgent: asNonEmptyString(configBody?.default_agent) || asNonEmptyString(configBody?.defaultAgent),
|
||||
opencodeDefaultModel: asNonEmptyString(configBody?.model),
|
||||
};
|
||||
};
|
||||
|
||||
const resolveDefaultSelection = ({ agents, providers, settings, opencodeDefaultAgent, opencodeDefaultModel }) => {
|
||||
const primaryAgents = agents.filter((agent) => isPrimaryAgentMode(agent?.mode) && agent?.hidden !== true);
|
||||
let resolvedAgent = null;
|
||||
const settingsDefaultAgent = asNonEmptyString(settings?.defaultAgent);
|
||||
if (settingsDefaultAgent) {
|
||||
resolvedAgent = agents.find((agent) => agent?.name === settingsDefaultAgent) || null;
|
||||
}
|
||||
if (!resolvedAgent && opencodeDefaultAgent) {
|
||||
const candidate = agents.find((agent) => agent?.name === opencodeDefaultAgent) || null;
|
||||
if (candidate && isPrimaryAgentMode(candidate.mode) && candidate.hidden !== true) {
|
||||
resolvedAgent = candidate;
|
||||
}
|
||||
}
|
||||
if (!resolvedAgent) {
|
||||
resolvedAgent = primaryAgents.find((agent) => agent?.name === 'build') || primaryAgents[0] || agents[0] || null;
|
||||
}
|
||||
|
||||
let model = null;
|
||||
let variant;
|
||||
const settingsDefaultModel = parseConfigModel(settings?.defaultModel);
|
||||
if (settingsDefaultModel && hasProviderModel(providers, settingsDefaultModel.providerID, settingsDefaultModel.modelID)) {
|
||||
model = settingsDefaultModel;
|
||||
variant = resolveVariant(providers, model.providerID, model.modelID, settings?.defaultVariant);
|
||||
}
|
||||
|
||||
if (!model && resolvedAgent?.model?.providerID && resolvedAgent?.model?.modelID
|
||||
&& hasProviderModel(providers, resolvedAgent.model.providerID, resolvedAgent.model.modelID)) {
|
||||
model = { providerID: resolvedAgent.model.providerID, modelID: resolvedAgent.model.modelID };
|
||||
variant = resolveVariant(providers, model.providerID, model.modelID, resolvedAgent.variant);
|
||||
}
|
||||
|
||||
const opencodeModel = parseConfigModel(opencodeDefaultModel);
|
||||
if (!model && opencodeModel && hasProviderModel(providers, opencodeModel.providerID, opencodeModel.modelID)) {
|
||||
model = opencodeModel;
|
||||
}
|
||||
|
||||
if (!model && hasProviderModel(providers, FALLBACK_PROVIDER_ID, FALLBACK_MODEL_ID)) {
|
||||
model = { providerID: FALLBACK_PROVIDER_ID, modelID: FALLBACK_MODEL_ID };
|
||||
}
|
||||
|
||||
if (!model) {
|
||||
const provider = providers[0];
|
||||
const firstModel = providerModels(provider)[0];
|
||||
if (provider?.id && firstModel?.id) {
|
||||
model = { providerID: provider.id, modelID: firstModel.id };
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
agent: resolvedAgent?.name,
|
||||
model,
|
||||
variant,
|
||||
};
|
||||
};
|
||||
|
||||
const runPromptAsync = async ({ baseUrl, authHeaders, sessionID, directory, payload }) => {
|
||||
const promptUrl = new URL(`${baseUrl}/session/${encodeURIComponent(sessionID)}/prompt_async`);
|
||||
promptUrl.searchParams.set('directory', directory);
|
||||
const response = await fetch(promptUrl.toString(), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
...authHeaders,
|
||||
...buildDirectoryHeaders(directory),
|
||||
'content-type': 'application/json',
|
||||
accept: 'application/json',
|
||||
},
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const body = await response.text().catch(() => '');
|
||||
throw new Error(`prompt_async failed (${response.status})${body ? `: ${body}` : ''}`);
|
||||
}
|
||||
};
|
||||
|
||||
const createSession = async ({ baseUrl, authHeaders, directory, title }) => {
|
||||
const sessionUrl = new URL(`${baseUrl}/session`);
|
||||
sessionUrl.searchParams.set('directory', directory);
|
||||
const response = await fetch(sessionUrl.toString(), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
...authHeaders,
|
||||
...buildDirectoryHeaders(directory),
|
||||
'content-type': 'application/json',
|
||||
accept: 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ directory, ...(title ? { title } : {}) }),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const body = await response.text().catch(() => '');
|
||||
throw new Error(`session create failed (${response.status})${body ? `: ${body}` : ''}`);
|
||||
}
|
||||
|
||||
const body = await response.json().catch(() => null);
|
||||
const sessionID = body?.id || body?.data?.id;
|
||||
if (!sessionID) {
|
||||
throw new Error('failed to create session');
|
||||
}
|
||||
return sessionID;
|
||||
};
|
||||
|
||||
const forkSession = async ({ client, sessionID, directory, messageID }) => {
|
||||
const response = await client.session.fork({
|
||||
sessionID,
|
||||
directory,
|
||||
...(messageID ? { messageID } : {}),
|
||||
});
|
||||
const session = response?.data;
|
||||
if (!session?.id) {
|
||||
throw new Error('failed to fork session');
|
||||
}
|
||||
return session;
|
||||
};
|
||||
|
||||
const latestCompletedAssistantMessageID = async ({ client, sessionID, directory }) => {
|
||||
let response;
|
||||
try {
|
||||
response = await client.session.messages({ sessionID, directory, limit: 100 });
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
const messages = Array.isArray(response?.data) ? response.data : [];
|
||||
let latest = null;
|
||||
for (const message of messages) {
|
||||
const info = message?.info;
|
||||
if (info?.role !== 'assistant' || !Number.isFinite(info?.time?.completed)) continue;
|
||||
if (!latest || (info.time.created || 0) >= (latest.time?.created || 0)) latest = info;
|
||||
}
|
||||
return asNonEmptyString(latest?.id);
|
||||
};
|
||||
|
||||
const resolveRequestedDirectory = async ({ payload, readSettingsFromDiskMigrated, sanitizeProjects, validateDirectoryPath }) => {
|
||||
const projectID = asNonEmptyString(payload?.projectId) || asNonEmptyString(payload?.projectID);
|
||||
if (projectID) {
|
||||
const settings = await readSettingsFromDiskMigrated();
|
||||
const projects = sanitizeProjects(settings?.projects || []);
|
||||
const project = projects.find((entry) => entry.id === projectID) || null;
|
||||
if (!project?.path) {
|
||||
return { ok: false, status: 404, error: 'Project not found' };
|
||||
}
|
||||
const validated = await validateDirectoryPath(project.path);
|
||||
return validated.ok
|
||||
? { ok: true, directory: validated.directory, projectId: projectID }
|
||||
: { ok: false, status: 400, error: validated.error || 'Invalid project directory' };
|
||||
}
|
||||
|
||||
const directory = asNonEmptyString(payload?.directory);
|
||||
const validated = await validateDirectoryPath(directory);
|
||||
return validated.ok
|
||||
? { ok: true, directory: validated.directory }
|
||||
: { ok: false, status: 400, error: validated.error || 'Invalid directory' };
|
||||
};
|
||||
|
||||
const resolveWorktreeInput = (payload) => {
|
||||
if (!payload?.worktree || typeof payload.worktree !== 'object') return null;
|
||||
const name = asNonEmptyString(payload.worktree.name);
|
||||
if (!name) return null;
|
||||
const branchName = asNonEmptyString(payload.worktree.branchName);
|
||||
const startRef = asNonEmptyString(payload.worktree.startRef);
|
||||
return {
|
||||
mode: 'new',
|
||||
name,
|
||||
...(branchName ? { branchName } : {}),
|
||||
...(startRef ? { startRef } : {}),
|
||||
...(typeof payload.setUpstream === 'boolean' ? { setUpstream: payload.setUpstream } : {}),
|
||||
};
|
||||
};
|
||||
|
||||
export const createOpenChamberSessionService = (dependencies) => {
|
||||
const {
|
||||
readSettingsFromDiskMigrated,
|
||||
sanitizeProjects,
|
||||
validateDirectoryPath,
|
||||
buildOpenCodeUrl,
|
||||
getOpenCodeAuthHeaders,
|
||||
waitForOpenCodeReady,
|
||||
emitSessionCreatedEvent,
|
||||
createSessionGoal: createSessionGoalOverride,
|
||||
} = dependencies;
|
||||
|
||||
// Last user message of an existing session, as a selection to reuse. Returns
|
||||
// null when the session has no user message carrying a model.
|
||||
const fetchLastUserSelection = async ({ client, sessionID, directory }) => {
|
||||
try {
|
||||
const response = await client.session.messages({ sessionID, directory, limit: 20 });
|
||||
const records = Array.isArray(response?.data) ? response.data : [];
|
||||
for (let index = records.length - 1; index >= 0; index -= 1) {
|
||||
const info = records[index]?.info;
|
||||
if (info?.role !== 'user') continue;
|
||||
const providerID = asNonEmptyString(info.model?.providerID);
|
||||
const modelID = asNonEmptyString(info.model?.modelID);
|
||||
if (!providerID || !modelID) continue;
|
||||
return {
|
||||
model: { providerID, modelID },
|
||||
agent: asNonEmptyString(info.agent),
|
||||
variant: asNonEmptyString(info.model?.variant),
|
||||
};
|
||||
}
|
||||
} catch {
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const dispatchPrompt = async ({
|
||||
client,
|
||||
baseUrl,
|
||||
authHeaders,
|
||||
sessionID,
|
||||
directory,
|
||||
prompt,
|
||||
goalInput,
|
||||
requestedModel,
|
||||
requestedAgent,
|
||||
requestedVariant,
|
||||
reuseSessionSelection = false,
|
||||
}) => {
|
||||
let model = requestedModel;
|
||||
let agent = requestedAgent;
|
||||
let variant = requestedVariant;
|
||||
if (reuseSessionSelection && (!model || !agent)) {
|
||||
const previous = await fetchLastUserSelection({ client, sessionID, directory });
|
||||
if (previous) {
|
||||
if (!model && previous.model) {
|
||||
model = previous.model;
|
||||
if (variant == null) variant = previous.variant ?? undefined;
|
||||
}
|
||||
if (!agent && previous.agent) agent = previous.agent;
|
||||
}
|
||||
}
|
||||
if (!model || !agent) {
|
||||
const inputs = await fetchSelectionInputs({
|
||||
buildOpenCodeUrl,
|
||||
authHeaders,
|
||||
directory,
|
||||
readSettingsFromDiskMigrated,
|
||||
});
|
||||
const defaults = resolveDefaultSelection(inputs);
|
||||
if (!model) {
|
||||
model = defaults.model;
|
||||
if (variant == null) variant = defaults.variant;
|
||||
}
|
||||
agent = agent || defaults.agent;
|
||||
}
|
||||
if (!model) {
|
||||
const error = new Error('No model is configured or available for the requested directory');
|
||||
error.statusCode = 400;
|
||||
throw error;
|
||||
}
|
||||
|
||||
const expandedPrompt = expandSnippets(prompt, directory);
|
||||
if (goalInput.enabled) {
|
||||
await (createSessionGoalOverride || createSessionGoal)({
|
||||
baseUrl,
|
||||
authHeaders,
|
||||
sessionID,
|
||||
directory,
|
||||
objective: expandedPrompt,
|
||||
tokenBudget: goalInput.tokenBudget,
|
||||
providerID: model.providerID,
|
||||
modelID: model.modelID,
|
||||
onWarning: (message, error) => console.warn(`[OpenChamberSessions] ${message}:`, error?.message || error),
|
||||
});
|
||||
}
|
||||
|
||||
const markGoalPartial = (error) => {
|
||||
if (goalInput.enabled && error && typeof error === 'object') error.goalConfigured = true;
|
||||
return error;
|
||||
};
|
||||
|
||||
let dispatchedAsCommand = false;
|
||||
const parsedCommand = parseScheduledCommandPrompt(prompt);
|
||||
if (parsedCommand) {
|
||||
let commandExists = false;
|
||||
try {
|
||||
const response = await client.command.list({ directory });
|
||||
const commands = Array.isArray(response?.data) ? response.data : [];
|
||||
commandExists = commands.some((command) => command?.name === parsedCommand.command);
|
||||
} catch {
|
||||
}
|
||||
if (commandExists) {
|
||||
try {
|
||||
await client.session.command({
|
||||
sessionID,
|
||||
directory,
|
||||
command: parsedCommand.command,
|
||||
arguments: parsedCommand.arguments,
|
||||
...(agent ? { agent } : {}),
|
||||
model: `${model.providerID}/${model.modelID}`,
|
||||
...(variant ? { variant } : {}),
|
||||
});
|
||||
} catch (error) {
|
||||
throw markGoalPartial(error);
|
||||
}
|
||||
dispatchedAsCommand = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!dispatchedAsCommand) {
|
||||
try {
|
||||
await runPromptAsync({
|
||||
baseUrl,
|
||||
authHeaders,
|
||||
sessionID,
|
||||
directory,
|
||||
payload: {
|
||||
model,
|
||||
...(agent ? { agent } : {}),
|
||||
...(variant ? { variant } : {}),
|
||||
parts: [
|
||||
{ type: 'text', text: expandedPrompt },
|
||||
...(goalInput.enabled
|
||||
? [{ type: 'text', text: buildGoalIntroText(goalInput.tokenBudget), synthetic: true }]
|
||||
: []),
|
||||
],
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
throw markGoalPartial(error);
|
||||
}
|
||||
}
|
||||
|
||||
return { model, agent, variant, promptDispatched: true, dispatchedAsCommand };
|
||||
};
|
||||
|
||||
const create = async (payload = {}) => {
|
||||
const title = asNonEmptyString(payload.title);
|
||||
const prompt = asNonEmptyString(payload.prompt);
|
||||
const goalInput = resolveGoalInput(payload, prompt);
|
||||
if (!goalInput.ok) {
|
||||
throw new OpenChamberControlError(goalInput.error, 400);
|
||||
}
|
||||
const model = resolveRequestedModel(payload);
|
||||
const agent = asNonEmptyString(payload.agent);
|
||||
const variant = asNonEmptyString(payload.variant);
|
||||
|
||||
const resolvedDirectory = await resolveRequestedDirectory({
|
||||
payload,
|
||||
readSettingsFromDiskMigrated,
|
||||
sanitizeProjects,
|
||||
validateDirectoryPath,
|
||||
});
|
||||
if (!resolvedDirectory.ok) {
|
||||
throw new OpenChamberControlError(resolvedDirectory.error, resolvedDirectory.status || 400);
|
||||
}
|
||||
|
||||
const worktreeInput = resolveWorktreeInput(payload);
|
||||
let worktree = null;
|
||||
let sessionDirectory = resolvedDirectory.directory;
|
||||
if (payload?.worktree && !worktreeInput) {
|
||||
throw new OpenChamberControlError('worktree.name is required when worktree is provided', 400);
|
||||
}
|
||||
if (worktreeInput) {
|
||||
worktree = await createWorktree(resolvedDirectory.directory, worktreeInput);
|
||||
sessionDirectory = worktree.path;
|
||||
}
|
||||
|
||||
if (typeof waitForOpenCodeReady === 'function') await waitForOpenCodeReady(10_000, 250);
|
||||
|
||||
const baseUrl = buildOpenCodeUrl('/', '').replace(/\/$/, '');
|
||||
const authHeaders = getOpenCodeAuthHeaders();
|
||||
const client = createOpencodeClient({ baseUrl, headers: authHeaders });
|
||||
const sessionID = await createSession({
|
||||
client,
|
||||
baseUrl,
|
||||
authHeaders,
|
||||
directory: sessionDirectory,
|
||||
...(title ? { title } : {}),
|
||||
});
|
||||
|
||||
let dispatch = { model, agent, variant, promptDispatched: false, dispatchedAsCommand: false };
|
||||
if (prompt) {
|
||||
dispatch = await dispatchPrompt({
|
||||
client,
|
||||
baseUrl,
|
||||
authHeaders,
|
||||
sessionID,
|
||||
directory: sessionDirectory,
|
||||
prompt,
|
||||
goalInput,
|
||||
requestedModel: model,
|
||||
requestedAgent: agent,
|
||||
requestedVariant: variant,
|
||||
});
|
||||
}
|
||||
|
||||
const result = {
|
||||
sessionId: sessionID,
|
||||
directory: sessionDirectory,
|
||||
...(resolvedDirectory.projectId ? { projectId: resolvedDirectory.projectId } : {}),
|
||||
...(title ? { title } : {}),
|
||||
...(worktree ? { worktree } : {}),
|
||||
...(prompt && dispatch.model ? { model: dispatch.model } : {}),
|
||||
...(prompt && dispatch.agent ? { agent: dispatch.agent } : {}),
|
||||
...(prompt && dispatch.variant ? { variant: dispatch.variant } : {}),
|
||||
promptDispatched: dispatch.promptDispatched,
|
||||
dispatchedAsCommand: dispatch.dispatchedAsCommand,
|
||||
...(goalInput.enabled ? { goalEnabled: true } : {}),
|
||||
...(goalInput.tokenBudget ? { goalTokenBudget: goalInput.tokenBudget } : {}),
|
||||
};
|
||||
|
||||
try {
|
||||
emitSessionCreatedEvent?.({
|
||||
sessionID,
|
||||
directory: sessionDirectory,
|
||||
...(resolvedDirectory.projectId ? { projectID: resolvedDirectory.projectId } : {}),
|
||||
...(title ? { title } : {}),
|
||||
...(worktree ? { worktree } : {}),
|
||||
...(prompt && dispatch.model ? { model: dispatch.model } : {}),
|
||||
...(prompt && dispatch.agent ? { agent: dispatch.agent } : {}),
|
||||
...(prompt && dispatch.variant ? { variant: dispatch.variant } : {}),
|
||||
promptDispatched: dispatch.promptDispatched,
|
||||
dispatchedAsCommand: dispatch.dispatchedAsCommand,
|
||||
...(goalInput.enabled ? { goalEnabled: true } : {}),
|
||||
...(goalInput.tokenBudget ? { goalTokenBudget: goalInput.tokenBudget } : {}),
|
||||
createdAt: Date.now(),
|
||||
});
|
||||
} catch {
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
|
||||
const runExisting = async (action, sourceSessionId, payload = {}) => {
|
||||
const sourceSessionID = asNonEmptyString(sourceSessionId);
|
||||
const prompt = asNonEmptyString(payload.prompt);
|
||||
if (!sourceSessionID) throw new OpenChamberControlError('sessionId is required', 400);
|
||||
if (!prompt) throw new OpenChamberControlError('prompt is required', 400);
|
||||
const goalInput = resolveGoalInput(payload, prompt);
|
||||
if (!goalInput.ok) throw new OpenChamberControlError(goalInput.error, 400);
|
||||
const requestedModel = resolveRequestedModel(payload);
|
||||
|
||||
let targetSessionID = sourceSessionID;
|
||||
let targetSession = null;
|
||||
let directory = null;
|
||||
try {
|
||||
const resolvedDirectory = await resolveRequestedDirectory({
|
||||
payload,
|
||||
readSettingsFromDiskMigrated,
|
||||
sanitizeProjects,
|
||||
validateDirectoryPath,
|
||||
});
|
||||
if (!resolvedDirectory.ok) {
|
||||
throw new OpenChamberControlError(resolvedDirectory.error, resolvedDirectory.status || 400);
|
||||
}
|
||||
directory = resolvedDirectory.directory;
|
||||
if (typeof waitForOpenCodeReady === 'function') await waitForOpenCodeReady(10_000, 250);
|
||||
|
||||
const baseUrl = buildOpenCodeUrl('/', '').replace(/\/$/, '');
|
||||
const authHeaders = getOpenCodeAuthHeaders();
|
||||
const client = createOpencodeClient({ baseUrl, headers: authHeaders });
|
||||
if (action === 'fork') {
|
||||
targetSession = await forkSession({
|
||||
client,
|
||||
sessionID: sourceSessionID,
|
||||
directory,
|
||||
messageID: asNonEmptyString(payload.messageId) || undefined,
|
||||
});
|
||||
targetSessionID = targetSession.id;
|
||||
}
|
||||
|
||||
const baselineAssistantMessageId = await latestCompletedAssistantMessageID({
|
||||
client,
|
||||
sessionID: targetSessionID,
|
||||
directory,
|
||||
});
|
||||
|
||||
const dispatch = await dispatchPrompt({
|
||||
client,
|
||||
baseUrl,
|
||||
authHeaders,
|
||||
sessionID: targetSessionID,
|
||||
directory,
|
||||
prompt,
|
||||
goalInput,
|
||||
requestedModel,
|
||||
requestedAgent: asNonEmptyString(payload.agent),
|
||||
requestedVariant: asNonEmptyString(payload.variant),
|
||||
reuseSessionSelection: true,
|
||||
});
|
||||
const result = {
|
||||
action,
|
||||
sessionId: targetSessionID,
|
||||
directory,
|
||||
...(action === 'fork' ? { sourceSessionId: sourceSessionID } : {}),
|
||||
...(targetSession?.title ? { title: targetSession.title } : {}),
|
||||
...(baselineAssistantMessageId ? { baselineAssistantMessageId } : {}),
|
||||
model: dispatch.model,
|
||||
...(dispatch.agent ? { agent: dispatch.agent } : {}),
|
||||
...(dispatch.variant ? { variant: dispatch.variant } : {}),
|
||||
promptDispatched: true,
|
||||
dispatchedAsCommand: dispatch.dispatchedAsCommand,
|
||||
...(goalInput.enabled ? { goalEnabled: true } : {}),
|
||||
...(goalInput.tokenBudget ? { goalTokenBudget: goalInput.tokenBudget } : {}),
|
||||
};
|
||||
|
||||
if (action === 'fork') {
|
||||
try {
|
||||
emitSessionCreatedEvent?.({
|
||||
sessionID: targetSessionID,
|
||||
directory,
|
||||
sourceSessionID,
|
||||
...(targetSession?.title ? { title: targetSession.title } : {}),
|
||||
model: dispatch.model,
|
||||
...(dispatch.agent ? { agent: dispatch.agent } : {}),
|
||||
...(dispatch.variant ? { variant: dispatch.variant } : {}),
|
||||
promptDispatched: true,
|
||||
dispatchedAsCommand: dispatch.dispatchedAsCommand,
|
||||
...(goalInput.enabled ? { goalEnabled: true } : {}),
|
||||
...(goalInput.tokenBudget ? { goalTokenBudget: goalInput.tokenBudget } : {}),
|
||||
createdAt: Date.now(),
|
||||
});
|
||||
} catch {
|
||||
}
|
||||
}
|
||||
return result;
|
||||
} catch (error) {
|
||||
const statusCode = Number(error?.statusCode) || 500;
|
||||
const forkCreated = action === 'fork' && targetSessionID !== sourceSessionID;
|
||||
const goalConfigured = error?.goalConfigured === true;
|
||||
throw new OpenChamberControlError(
|
||||
error instanceof Error ? error.message : `Failed to ${action} session`,
|
||||
statusCode,
|
||||
{
|
||||
...(forkCreated || goalConfigured
|
||||
? {
|
||||
partial: true,
|
||||
partialAction: forkCreated ? 'fork-created' : 'goal-configured',
|
||||
sessionId: targetSessionID,
|
||||
directory,
|
||||
}
|
||||
: {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
create,
|
||||
send: (sessionID, payload) => runExisting('send', sessionID, payload),
|
||||
fork: (sessionID, payload) => runExisting('fork', sessionID, payload),
|
||||
};
|
||||
};
|
||||
|
||||
const sendServiceError = (res, error, fallback) => {
|
||||
const controlError = asControlError(error, fallback);
|
||||
return res.status(controlError.statusCode).json({
|
||||
error: controlError.message,
|
||||
...(controlError.partial === true ? {
|
||||
partial: true,
|
||||
partialAction: controlError.partialAction,
|
||||
sessionId: controlError.sessionId,
|
||||
directory: controlError.directory,
|
||||
} : {}),
|
||||
});
|
||||
};
|
||||
|
||||
export const registerOpenChamberSessionRoutes = (app, dependencies) => {
|
||||
const service = dependencies.sessionService || createOpenChamberSessionService(dependencies);
|
||||
|
||||
app.post('/api/openchamber/sessions', express.json({ limit: '1mb' }), async (req, res) => {
|
||||
try {
|
||||
return res.json(await service.create(req.body && typeof req.body === 'object' ? req.body : {}));
|
||||
} catch (error) {
|
||||
console.error('[OpenChamberSessions] failed to create session:', error);
|
||||
return sendServiceError(res, error, 'Failed to create session');
|
||||
}
|
||||
});
|
||||
|
||||
app.post(
|
||||
'/api/openchamber/sessions/:sessionId/send',
|
||||
express.json({ limit: '1mb' }),
|
||||
async (req, res) => {
|
||||
try {
|
||||
return res.json(await service.send(req.params.sessionId, req.body));
|
||||
} catch (error) {
|
||||
console.error('[OpenChamberSessions] failed to send session:', error);
|
||||
return sendServiceError(res, error, 'Failed to send session');
|
||||
}
|
||||
},
|
||||
);
|
||||
app.post(
|
||||
'/api/openchamber/sessions/:sessionId/fork',
|
||||
express.json({ limit: '1mb' }),
|
||||
async (req, res) => {
|
||||
try {
|
||||
return res.json(await service.fork(req.params.sessionId, req.body));
|
||||
} catch (error) {
|
||||
console.error('[OpenChamberSessions] failed to fork session:', error);
|
||||
return sendServiceError(res, error, 'Failed to fork session');
|
||||
}
|
||||
},
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,574 @@
|
||||
import express from 'express';
|
||||
import request from 'supertest';
|
||||
import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
const createWorktreeMock = vi.fn(async () => ({
|
||||
head: 'abc123',
|
||||
name: 'side-task',
|
||||
branch: 'openchamber/side-task',
|
||||
path: '/repo/worktrees/side-task',
|
||||
}));
|
||||
const sessionCreateMock = vi.fn(async () => ({ data: { id: 'ses_123' } }));
|
||||
const sessionForkMock = vi.fn(async () => ({ data: { id: 'ses_fork', title: 'Forked session' } }));
|
||||
const sessionMessagesMock = vi.fn(async () => ({ data: [] }));
|
||||
const sessionCommandMock = vi.fn(async () => ({ data: {} }));
|
||||
const commandListMock = vi.fn(async () => ({ data: [] }));
|
||||
globalThis.__openchamberCreateWorktreeMock = createWorktreeMock;
|
||||
|
||||
let registerOpenChamberSessionRoutes;
|
||||
|
||||
vi.mock('@opencode-ai/sdk/v2', () => ({
|
||||
createOpencodeClient: () => ({
|
||||
session: {
|
||||
create: sessionCreateMock,
|
||||
fork: sessionForkMock,
|
||||
messages: sessionMessagesMock,
|
||||
command: sessionCommandMock,
|
||||
},
|
||||
command: {
|
||||
list: commandListMock,
|
||||
},
|
||||
}),
|
||||
}));
|
||||
|
||||
vi.mock('../git/index.js', () => ({
|
||||
createWorktree: (...args) => globalThis.__openchamberCreateWorktreeMock(...args),
|
||||
}));
|
||||
|
||||
const createApp = (overrides = {}, options = {}) => {
|
||||
const app = express();
|
||||
if (options.globalJson !== false) {
|
||||
app.use(express.json());
|
||||
}
|
||||
const calls = [];
|
||||
registerOpenChamberSessionRoutes(app, {
|
||||
readSettingsFromDiskMigrated: async () => ({ projects: [{ id: 'proj_1', path: '/repo/app' }] }),
|
||||
sanitizeProjects: (projects) => projects,
|
||||
validateDirectoryPath: async (directory) => ({ ok: true, directory }),
|
||||
buildOpenCodeUrl: (route) => `http://opencode.test${route}`,
|
||||
getOpenCodeAuthHeaders: () => ({ Authorization: 'Bearer test' }),
|
||||
waitForOpenCodeReady: vi.fn(async () => undefined),
|
||||
...overrides,
|
||||
});
|
||||
return { app, calls };
|
||||
};
|
||||
|
||||
describe('openchamber session routes', () => {
|
||||
beforeAll(async () => {
|
||||
({ registerOpenChamberSessionRoutes } = await import('./routes.js'));
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
createWorktreeMock.mockClear();
|
||||
sessionCreateMock.mockClear();
|
||||
sessionForkMock.mockClear();
|
||||
sessionMessagesMock.mockReset();
|
||||
sessionMessagesMock.mockResolvedValue({ data: [] });
|
||||
sessionCommandMock.mockReset();
|
||||
sessionCommandMock.mockResolvedValue({ data: {} });
|
||||
commandListMock.mockReset();
|
||||
commandListMock.mockResolvedValue({ data: [] });
|
||||
});
|
||||
|
||||
it('creates a session for a directory', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
globalThis.fetch = vi.fn(async () => ({ ok: true, json: async () => ({ id: 'ses_123' }) }));
|
||||
try {
|
||||
const { app } = createApp();
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app', title: 'Side task' })
|
||||
.expect(200);
|
||||
|
||||
expect(response.body.sessionId).toBeTruthy();
|
||||
expect(response.body.sessionId).toBe('ses_123');
|
||||
expect(response.body.directory).toBe('/repo/app');
|
||||
expect(response.body.promptDispatched).toBe(false);
|
||||
expect(globalThis.fetch).toHaveBeenCalledWith(
|
||||
'http://opencode.test/session?directory=%2Frepo%2Fapp',
|
||||
expect.objectContaining({
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ directory: '/repo/app', title: 'Side task' }),
|
||||
}),
|
||||
);
|
||||
expect(sessionCreateMock).not.toHaveBeenCalled();
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('parses JSON body without global middleware', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
globalThis.fetch = vi.fn(async () => ({ ok: true, json: async () => ({ id: 'ses_123' }) }));
|
||||
try {
|
||||
const { app } = createApp({}, { globalJson: false });
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app' })
|
||||
.expect(200);
|
||||
|
||||
expect(response.body.sessionId).toBe('ses_123');
|
||||
expect(response.body.directory).toBe('/repo/app');
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('emits a session-created event after creating a session', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const emitSessionCreatedEvent = vi.fn();
|
||||
globalThis.fetch = vi.fn(async () => ({ ok: true, json: async () => ({ id: 'ses_123' }) }));
|
||||
try {
|
||||
const { app } = createApp({ emitSessionCreatedEvent });
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app', title: 'Side task' })
|
||||
.expect(200);
|
||||
|
||||
expect(emitSessionCreatedEvent).toHaveBeenCalledWith(expect.objectContaining({
|
||||
sessionID: 'ses_123',
|
||||
directory: '/repo/app',
|
||||
title: 'Side task',
|
||||
promptDispatched: false,
|
||||
dispatchedAsCommand: false,
|
||||
}));
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('resolves default model and agent when prompt omits them', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn(async (url) => {
|
||||
const text = String(url);
|
||||
if (text.includes('/prompt_async')) {
|
||||
return { ok: true, text: async () => '' };
|
||||
}
|
||||
if (text.includes('/config/providers')) {
|
||||
return { ok: true, json: async () => ({ providers: [{ id: 'openai', models: { 'gpt-5.5': { id: 'gpt-5.5' } } }] }) };
|
||||
}
|
||||
if (text.includes('/agent')) {
|
||||
return { ok: true, json: async () => [{ name: 'build', mode: 'primary' }] };
|
||||
}
|
||||
if (text.includes('/config')) {
|
||||
return { ok: true, json: async () => ({}) };
|
||||
}
|
||||
return { ok: true, json: async () => ({ id: 'ses_123' }) };
|
||||
});
|
||||
globalThis.fetch = fetchMock;
|
||||
const { app } = createApp({
|
||||
readSettingsFromDiskMigrated: async () => ({
|
||||
defaultModel: 'openai/gpt-5.5',
|
||||
defaultAgent: 'build',
|
||||
projects: [{ id: 'proj_1', path: '/repo/app' }],
|
||||
}),
|
||||
});
|
||||
try {
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app', prompt: 'Run this' })
|
||||
.expect(200);
|
||||
|
||||
expect(response.body.model).toEqual({ providerID: 'openai', modelID: 'gpt-5.5' });
|
||||
expect(response.body.agent).toBe('build');
|
||||
expect(fetchMock).toHaveBeenCalledWith(
|
||||
'http://opencode.test/config/providers?directory=%2Frepo%2Fapp',
|
||||
expect.any(Object),
|
||||
);
|
||||
const promptCall = fetchMock.mock.calls.find(([url]) => String(url).includes('/prompt_async'));
|
||||
expect(JSON.parse(promptCall?.[1]?.body)).toMatchObject({
|
||||
model: { providerID: 'openai', modelID: 'gpt-5.5' },
|
||||
agent: 'build',
|
||||
});
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('dispatches an initial prompt when model is provided', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn(async (url) => {
|
||||
if (String(url).includes('/prompt_async')) {
|
||||
return { ok: true, text: async () => '' };
|
||||
}
|
||||
return { ok: true, json: async () => ({ id: 'ses_123' }) };
|
||||
});
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
const { app } = createApp();
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app', prompt: 'Run this', model: 'openai/gpt-5.5' })
|
||||
.expect(200);
|
||||
|
||||
expect(response.body.sessionId).toBe('ses_123');
|
||||
expect(response.body.promptDispatched).toBe(true);
|
||||
expect(fetchMock).toHaveBeenCalledWith(
|
||||
'http://opencode.test/session/ses_123/prompt_async?directory=%2Frepo%2Fapp',
|
||||
expect.objectContaining({ method: 'POST' }),
|
||||
);
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('creates goal metadata before dispatching the initial goal prompt', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn(async (url) => {
|
||||
if (String(url).includes('/prompt_async')) return { ok: true, text: async () => '' };
|
||||
return { ok: true, json: async () => ({ id: 'ses_123' }) };
|
||||
});
|
||||
const createSessionGoal = vi.fn(async () => undefined);
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
const { app } = createApp({ createSessionGoal });
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({
|
||||
directory: '/repo/app',
|
||||
prompt: 'Finish and verify the migration',
|
||||
model: 'openai/gpt-5.5',
|
||||
goal: true,
|
||||
goalTokenBudget: 200000,
|
||||
})
|
||||
.expect(200);
|
||||
|
||||
const promptCall = fetchMock.mock.calls.find(([url]) => String(url).includes('/prompt_async'));
|
||||
const promptPayload = JSON.parse(promptCall[1].body);
|
||||
expect(createSessionGoal).toHaveBeenCalledWith(expect.objectContaining({
|
||||
sessionID: 'ses_123',
|
||||
directory: '/repo/app',
|
||||
objective: 'Finish and verify the migration',
|
||||
tokenBudget: 200000,
|
||||
providerID: 'openai',
|
||||
modelID: 'gpt-5.5',
|
||||
}));
|
||||
expect(createSessionGoal.mock.invocationCallOrder[0]).toBeLessThan(fetchMock.mock.invocationCallOrder.at(-1));
|
||||
expect(promptPayload.parts).toEqual([
|
||||
{ type: 'text', text: 'Finish and verify the migration' },
|
||||
expect.objectContaining({ type: 'text', synthetic: true }),
|
||||
]);
|
||||
expect(response.body).toMatchObject({ goalEnabled: true, goalTokenBudget: 200000, promptDispatched: true });
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('rejects invalid goal requests before creating a session', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn();
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
const { app } = createApp();
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app', goal: true })
|
||||
.expect(400, { error: 'prompt is required when goal is enabled' });
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app', prompt: 'Run', goalTokenBudget: 200000 })
|
||||
.expect(400, { error: 'goalTokenBudget requires goal' });
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({ directory: '/repo/app', prompt: 'Run', goal: true, goalTokenBudget: 999 })
|
||||
.expect(400, { error: 'goalTokenBudget must be an integer from 1000 to 100000000' });
|
||||
expect(fetchMock).not.toHaveBeenCalled();
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('creates a worktree before creating a session', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
globalThis.fetch = vi.fn(async (url) => {
|
||||
if (String(url).includes('/prompt_async')) {
|
||||
return { ok: true, text: async () => '' };
|
||||
}
|
||||
return { ok: true, json: async () => ({ id: 'ses_123' }) };
|
||||
});
|
||||
try {
|
||||
const { app } = createApp();
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions')
|
||||
.send({
|
||||
directory: '/repo/app',
|
||||
worktree: { name: 'side-task', branchName: 'openchamber/side-task', startRef: 'main' },
|
||||
setUpstream: false,
|
||||
prompt: 'Run this',
|
||||
model: 'openai/gpt-5.5',
|
||||
})
|
||||
.expect(200);
|
||||
|
||||
expect(createWorktreeMock).toHaveBeenCalledWith('/repo/app', {
|
||||
mode: 'new',
|
||||
name: 'side-task',
|
||||
branchName: 'openchamber/side-task',
|
||||
startRef: 'main',
|
||||
setUpstream: false,
|
||||
});
|
||||
expect(response.body.directory).toBe('/repo/worktrees/side-task');
|
||||
expect(response.body.worktree.path).toBe('/repo/worktrees/side-task');
|
||||
expect(globalThis.fetch).toHaveBeenCalledWith(
|
||||
'http://opencode.test/session/ses_123/prompt_async?directory=%2Frepo%2Fworktrees%2Fside-task',
|
||||
expect.objectContaining({ method: 'POST' }),
|
||||
);
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('sends a goal prompt to an existing session after creating goal metadata', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn(async () => ({ ok: true, text: async () => '' }));
|
||||
const createSessionGoal = vi.fn(async () => undefined);
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
sessionMessagesMock.mockResolvedValue({
|
||||
data: [{ info: { id: 'msg_before', role: 'assistant', time: { created: 10, completed: 20 } } }],
|
||||
});
|
||||
const { app } = createApp({ createSessionGoal });
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/send')
|
||||
.send({
|
||||
directory: '/repo/app',
|
||||
prompt: 'Apply and verify the review feedback',
|
||||
model: 'openai/gpt-5.5',
|
||||
agent: 'build',
|
||||
variant: 'high',
|
||||
goal: true,
|
||||
goalTokenBudget: 200000,
|
||||
})
|
||||
.expect(200);
|
||||
|
||||
expect(response.body).toMatchObject({
|
||||
action: 'send',
|
||||
sessionId: 'ses_source',
|
||||
directory: '/repo/app',
|
||||
promptDispatched: true,
|
||||
goalEnabled: true,
|
||||
baselineAssistantMessageId: 'msg_before',
|
||||
});
|
||||
expect(createSessionGoal).toHaveBeenCalledWith(expect.objectContaining({
|
||||
sessionID: 'ses_source',
|
||||
directory: '/repo/app',
|
||||
objective: 'Apply and verify the review feedback',
|
||||
}));
|
||||
const promptCall = fetchMock.mock.calls.find(([url]) => String(url).includes('/prompt_async'));
|
||||
expect(promptCall?.[0]).toBe('http://opencode.test/session/ses_source/prompt_async?directory=%2Frepo%2Fapp');
|
||||
expect(createSessionGoal.mock.invocationCallOrder[0]).toBeLessThan(fetchMock.mock.invocationCallOrder.at(-1));
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('reuses the previous session selection when send omits model, agent, and variant', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn(async () => ({ ok: true, text: async () => '' }));
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
sessionMessagesMock.mockResolvedValue({
|
||||
data: [
|
||||
{
|
||||
info: {
|
||||
id: 'msg_user',
|
||||
role: 'user',
|
||||
agent: 'plan',
|
||||
model: { providerID: 'anthropic', modelID: 'claude-sonnet-5', variant: 'high' },
|
||||
time: { created: 5 },
|
||||
},
|
||||
},
|
||||
{ info: { id: 'msg_before', role: 'assistant', time: { created: 10, completed: 20 } } },
|
||||
],
|
||||
});
|
||||
const { app } = createApp();
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/send')
|
||||
.send({ directory: '/repo/app', prompt: 'Continue where you left off' })
|
||||
.expect(200);
|
||||
|
||||
expect(response.body).toMatchObject({
|
||||
action: 'send',
|
||||
sessionId: 'ses_source',
|
||||
model: { providerID: 'anthropic', modelID: 'claude-sonnet-5' },
|
||||
agent: 'plan',
|
||||
variant: 'high',
|
||||
promptDispatched: true,
|
||||
});
|
||||
const promptCall = fetchMock.mock.calls.find(([url]) => String(url).includes('/prompt_async'));
|
||||
const promptBody = JSON.parse(promptCall[1].body);
|
||||
expect(promptBody).toMatchObject({
|
||||
model: { providerID: 'anthropic', modelID: 'claude-sonnet-5' },
|
||||
agent: 'plan',
|
||||
variant: 'high',
|
||||
});
|
||||
// The default-selection inputs (config/providers/agents) must not be consulted.
|
||||
expect(fetchMock.mock.calls.every(([url]) => String(url).includes('/prompt_async'))).toBe(true);
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('forks from a message, dispatches the prompt, and emits the new session', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const emitSessionCreatedEvent = vi.fn();
|
||||
globalThis.fetch = vi.fn(async () => ({ ok: true, text: async () => '' }));
|
||||
try {
|
||||
const { app } = createApp({ emitSessionCreatedEvent });
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/fork')
|
||||
.send({
|
||||
directory: '/repo/app',
|
||||
messageId: 'msg_branch_point',
|
||||
prompt: 'Try the alternative implementation',
|
||||
model: 'openai/gpt-5.5',
|
||||
agent: 'build',
|
||||
variant: 'high',
|
||||
})
|
||||
.expect(200);
|
||||
|
||||
expect(sessionForkMock).toHaveBeenCalledWith({
|
||||
sessionID: 'ses_source',
|
||||
directory: '/repo/app',
|
||||
messageID: 'msg_branch_point',
|
||||
});
|
||||
expect(response.body).toMatchObject({
|
||||
action: 'fork',
|
||||
sourceSessionId: 'ses_source',
|
||||
sessionId: 'ses_fork',
|
||||
directory: '/repo/app',
|
||||
promptDispatched: true,
|
||||
});
|
||||
expect(sessionMessagesMock).toHaveBeenCalledWith({
|
||||
sessionID: 'ses_fork',
|
||||
directory: '/repo/app',
|
||||
limit: 100,
|
||||
});
|
||||
expect(globalThis.fetch).toHaveBeenCalledWith(
|
||||
'http://opencode.test/session/ses_fork/prompt_async?directory=%2Frepo%2Fapp',
|
||||
expect.objectContaining({ method: 'POST' }),
|
||||
);
|
||||
expect(emitSessionCreatedEvent).toHaveBeenCalledWith(expect.objectContaining({
|
||||
sessionID: 'ses_fork',
|
||||
sourceSessionID: 'ses_source',
|
||||
directory: '/repo/app',
|
||||
promptDispatched: true,
|
||||
}));
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('rejects send and fork requests without a prompt before calling OpenCode', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn();
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
const { app } = createApp();
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/send')
|
||||
.send({ directory: '/repo/app' })
|
||||
.expect(400, { error: 'prompt is required' });
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/fork')
|
||||
.send({ directory: '/repo/app' })
|
||||
.expect(400, { error: 'prompt is required' });
|
||||
expect(fetchMock).not.toHaveBeenCalled();
|
||||
expect(sessionForkMock).not.toHaveBeenCalled();
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('reports the forked session when prompt dispatch fails', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
globalThis.fetch = vi.fn(async () => ({ ok: false, status: 500, text: async () => 'dispatch failed' }));
|
||||
try {
|
||||
const { app } = createApp();
|
||||
const response = await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/fork')
|
||||
.send({
|
||||
directory: '/repo/app',
|
||||
prompt: 'Try another approach',
|
||||
model: 'openai/gpt-5.5',
|
||||
agent: 'build',
|
||||
variant: 'high',
|
||||
})
|
||||
.expect(500);
|
||||
|
||||
expect(response.body).toMatchObject({
|
||||
partial: true,
|
||||
partialAction: 'fork-created',
|
||||
sessionId: 'ses_fork',
|
||||
directory: '/repo/app',
|
||||
});
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('does not apply a default variant to an explicitly requested model', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn(async (url) => {
|
||||
const text = String(url);
|
||||
if (text.includes('/prompt_async')) return { ok: true, text: async () => '' };
|
||||
if (text.includes('/config/providers')) {
|
||||
return {
|
||||
ok: true,
|
||||
json: async () => ({
|
||||
providers: [
|
||||
{ id: 'openai', models: { requested: { id: 'requested' }, default: { id: 'default', variants: { high: {} } } } },
|
||||
],
|
||||
}),
|
||||
};
|
||||
}
|
||||
if (text.includes('/agent')) return { ok: true, json: async () => [{ name: 'build', mode: 'primary' }] };
|
||||
if (text.includes('/config')) return { ok: true, json: async () => ({}) };
|
||||
return { ok: true, json: async () => ({ id: 'ses_123' }) };
|
||||
});
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
const { app } = createApp({
|
||||
readSettingsFromDiskMigrated: async () => ({
|
||||
defaultModel: 'openai/default',
|
||||
defaultVariant: 'high',
|
||||
projects: [{ id: 'proj_1', path: '/repo/app' }],
|
||||
}),
|
||||
});
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/send')
|
||||
.send({ directory: '/repo/app', prompt: 'Continue', model: 'openai/requested', agent: 'build' })
|
||||
.expect(200);
|
||||
|
||||
const promptCall = fetchMock.mock.calls.find(([url]) => String(url).includes('/prompt_async'));
|
||||
expect(JSON.parse(promptCall[1].body)).not.toHaveProperty('variant');
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('does not retry a failed slash command as a normal prompt', async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
const fetchMock = vi.fn();
|
||||
commandListMock.mockResolvedValue({ data: [{ name: 'review' }] });
|
||||
sessionCommandMock.mockRejectedValue(new Error('command response failed'));
|
||||
globalThis.fetch = fetchMock;
|
||||
try {
|
||||
const { app } = createApp();
|
||||
await request(app)
|
||||
.post('/api/openchamber/sessions/ses_source/send')
|
||||
.send({
|
||||
directory: '/repo/app',
|
||||
prompt: '/review fix this',
|
||||
model: 'openai/gpt-5.5',
|
||||
agent: 'build',
|
||||
variant: 'high',
|
||||
})
|
||||
.expect(500);
|
||||
|
||||
expect(sessionCommandMock).toHaveBeenCalledTimes(1);
|
||||
expect(fetchMock).not.toHaveBeenCalled();
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user