Skip to content

The open-source app everyone uses to manage agents at work

Merge PR #62: Full OpenCode adapter integration

Aaron44a00596a4c1
diff --cc cli/src/adapters/registry.ts
index ba8f93a8e2,a0cd553dc1..818bc6e6b7
--- a/cli/src/adapters/registry.ts
+++ b/cli/src/adapters/registry.ts
@@@ -33,7 -27,7 +33,7 @@@ const openclawCLIAdapter: CLIAdapterMod
};
const adaptersByType = new Map<string, CLIAdapterModule>(
- [claudeLocalCLIAdapter, codexLocalCLIAdapter, opencodeLocalCLIAdapter, cursorLocalCLIAdapter, openclawCLIAdapter, processCLIAdapter, httpCLIAdapter].map((a) => [a.type, a]),
- [claudeLocalCLIAdapter, codexLocalCLIAdapter, openCodeLocalCLIAdapter, openclawCLIAdapter, processCLIAdapter, httpCLIAdapter].map((a) => [a.type, a]),
++ [claudeLocalCLIAdapter, codexLocalCLIAdapter, openCodeLocalCLIAdapter, cursorLocalCLIAdapter, openclawCLIAdapter, processCLIAdapter, httpCLIAdapter].map((a) => [a.type, a]),
);
export function getCLIAdapter(type: string): CLIAdapterModule {
diff --cc packages/adapters/opencode-local/src/cli/format-event.ts
index 37b3425046,1af4736782..00d0ec765f
--- a/packages/adapters/opencode-local/src/cli/format-event.ts
+++ b/packages/adapters/opencode-local/src/cli/format-event.ts
@@@ -66,15 -51,9 +51,15 @@@ export function printOpenCodeStreamEven
const type = asString(parsed.type);
+ if (type === "step_start") {
+ const sessionId = asString(parsed.sessionID);
+ console.log(pc.blue(`step started${sessionId ? ` (session: ${sessionId})` : ""}`));
+ return;
+ }
+
if (type === "text") {
const part = asRecord(parsed.part);
- const text = asString(part?.text);
+ const text = asString(part?.text).trim();
if (text) console.log(pc.green(`assistant: ${text}`));
return;
}
diff --cc packages/adapters/opencode-local/src/index.ts
index 2688a0f2e2,7a21a45551..1661a85b2c
--- a/packages/adapters/opencode-local/src/index.ts
+++ b/packages/adapters/opencode-local/src/index.ts
@@@ -38,7 -22,7 +32,9 @@@ Operational fields
- graceSec (number, optional): SIGTERM grace period in seconds
Notes:
+ - OpenCode supports multiple providers and models. Use \
+ \`opencode models\` to list available options in provider/model format.
+ - Paperclip requires an explicit \`model\` value for \`opencode_local\` agents.
+- Runs are executed with: opencode run --format json ...
- - Prompts are passed as the final positional message argument.
+- Sessions are resumed with --session when stored session cwd matches current cwd.
`;
diff --cc packages/adapters/opencode-local/src/server/execute.ts
index d0070dca4d,06f6478e00..338646b3a1
--- a/packages/adapters/opencode-local/src/server/execute.ts
+++ b/packages/adapters/opencode-local/src/server/execute.ts
@@@ -16,15 -14,9 +16,15 @@@ import
renderTemplate,
runChildProcess,
} from "@paperclipai/adapter-utils/server-utils";
- import { DEFAULT_OPENCODE_LOCAL_MODEL } from "../index.js";
- import { parseOpenCodeJsonl, isOpenCodeUnknownSessionError } from "./parse.js";
+ import { isOpenCodeUnknownSessionError, parseOpenCodeJsonl } from "./parse.js";
+ import { ensureOpenCodeModelConfiguredAndAvailable } from "./models.js";
+const __moduleDir = path.dirname(fileURLToPath(import.meta.url));
+const PAPERCLIP_SKILLS_CANDIDATES = [
+ path.resolve(__moduleDir, "../../skills"),
+ path.resolve(__moduleDir, "../../../../../skills"),
+];
+
function firstNonEmptyLine(text: string): string {
return (
text
@@@ -34,124 -26,13 +34,54 @@@
);
}
- function getEffectiveEnvValue(envOverrides: Record<string, string>, key: string): string {
- if (Object.prototype.hasOwnProperty.call(envOverrides, key)) {
- const raw = envOverrides[key];
- return typeof raw === "string" ? raw : "";
- }
- const raw = process.env[key];
- return typeof raw === "string" ? raw : "";
- }
-
- function hasEffectiveEnvValue(envOverrides: Record<string, string>, key: string): boolean {
- return getEffectiveEnvValue(envOverrides, key).trim().length > 0;
- }
-
- function resolveOpenCodeBillingType(env: Record<string, string>): "api" | "subscription" {
- return hasEffectiveEnvValue(env, "OPENAI_API_KEY") ? "api" : "subscription";
- }
-
- function resolveProviderFromModel(model: string): string | null {
+ function parseModelProvider(model: string | null): string | null {
+ if (!model) return null;
const trimmed = model.trim();
- if (!trimmed) return null;
- const slash = trimmed.indexOf("/");
- if (slash <= 0) return null;
- return trimmed.slice(0, slash).toLowerCase();
- }
-
- function isProviderModelNotFoundFailure(stdout: string, stderr: string): boolean {
- const haystack = `${stdout}\n${stderr}`;
- return /ProviderModelNotFoundError|provider model not found/i.test(haystack);
- }
-
- type ProviderModelNotFoundDetails = {
- providerId: string | null;
- modelId: string | null;
- suggestions: string[];
- };
-
- function parseProviderModelNotFoundDetails(
- stdout: string,
- stderr: string,
- ): ProviderModelNotFoundDetails | null {
- if (!isProviderModelNotFoundFailure(stdout, stderr)) return null;
- const haystack = `${stdout}\n${stderr}`;
-
- const providerMatch = haystack.match(/providerID:\s*"([^"]+)"/i);
- const modelMatch = haystack.match(/modelID:\s*"([^"]+)"/i);
- const suggestionsMatch = haystack.match(/suggestions:\s*\[([^\]]*)\]/i);
- const suggestions = suggestionsMatch
- ? Array.from(
- suggestionsMatch[1].matchAll(/"([^"]+)"/g),
- (match) => match[1].trim(),
- ).filter((value) => value.length > 0)
- : [];
-
- return {
- providerId: providerMatch?.[1]?.trim().toLowerCase() || null,
- modelId: modelMatch?.[1]?.trim() || null,
- suggestions,
- };
- }
-
- function formatModelNotFoundError(
- model: string,
- providerFromModel: string | null,
- details: ProviderModelNotFoundDetails | null,
- ): string {
- const provider = details?.providerId || providerFromModel || "unknown";
- const missingModel = details?.modelId || model;
- const suggestions = details?.suggestions ?? [];
- const suggestionText =
- suggestions.length > 0 ? ` Suggested models: ${suggestions.map((value) => `\`${value}\``).join(", ")}.` : "";
- return (
- `OpenCode model \`${missingModel}\` is unavailable for provider \`${provider}\`.` +
- ` Run \`opencode models ${provider}\` and set adapterConfig.model to a supported value.` +
- suggestionText
- );
+ if (!trimmed.includes("/")) return null;
+ return trimmed.slice(0, trimmed.indexOf("/")).trim() || null;
}
+function claudeSkillsHome(): string {
+ return path.join(os.homedir(), ".claude", "skills");
+}
+
+async function resolvePaperclipSkillsDir(): Promise<string | null> {
+ for (const candidate of PAPERCLIP_SKILLS_CANDIDATES) {
+ const isDir = await fs.stat(candidate).then((s) => s.isDirectory()).catch(() => false);
+ if (isDir) return candidate;
+ }
+ return null;
+}
+
+async function ensureOpenCodeSkillsInjected(onLog: AdapterExecutionContext["onLog"]) {
+ const skillsDir = await resolvePaperclipSkillsDir();
+ if (!skillsDir) return;
+
+ const skillsHome = claudeSkillsHome();
+ await fs.mkdir(skillsHome, { recursive: true });
+ const entries = await fs.readdir(skillsDir, { withFileTypes: true });
+ for (const entry of entries) {
+ if (!entry.isDirectory()) continue;
+ const source = path.join(skillsDir, entry.name);
+ const target = path.join(skillsHome, entry.name);
+ const existing = await fs.lstat(target).catch(() => null);
+ if (existing) continue;
+
+ try {
+ await fs.symlink(source, target);
+ await onLog(
+ "stderr",
+ `[paperclip] Injected OpenCode skill "${entry.name}" into ${skillsHome}\n`,
+ );
+ } catch (err) {
+ await onLog(
+ "stderr",
+ `[paperclip] Failed to inject OpenCode skill "${entry.name}" into ${skillsHome}: ${err instanceof Error ? err.message : String(err)}\n`,
+ );
+ }
+ }
+}
+
export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecutionResult> {
const { runId, agent, runtime, config, context, onLog, onMeta, authToken } = ctx;
diff --cc packages/adapters/opencode-local/src/server/index.ts
index 17300e753e,3fc48655c2..a2275d420a
--- a/packages/adapters/opencode-local/src/server/index.ts
+++ b/packages/adapters/opencode-local/src/server/index.ts
@@@ -55,10 -46,16 +52,20 @@@ export const sessionCodec: AdapterSessi
},
getDisplayId(params: Record<string, unknown> | null) {
if (!params) return null;
- return readNonEmptyString(params.sessionId) ?? readNonEmptyString(params.session_id);
+ return (
+ readNonEmptyString(params.sessionId) ??
+ readNonEmptyString(params.session_id) ??
+ readNonEmptyString(params.sessionID)
+ );
},
};
+
+ export { execute } from "./execute.js";
+ export { testEnvironment } from "./test.js";
+ export {
+ listOpenCodeModels,
+ discoverOpenCodeModels,
+ ensureOpenCodeModelConfiguredAndAvailable,
+ resetOpenCodeModelsCacheForTests,
+ } from "./models.js";
+ export { parseOpenCodeJsonl, isOpenCodeUnknownSessionError } from "./parse.js";
diff --cc packages/adapters/opencode-local/src/server/parse.ts
index 2b02856698,09cc05ffaa..5cbfa46c41
--- a/packages/adapters/opencode-local/src/server/parse.ts
+++ b/packages/adapters/opencode-local/src/server/parse.ts
@@@ -1,10 -1,15 +1,17 @@@
- import { asString, asNumber, parseObject, parseJson } from "@paperclipai/adapter-utils/server-utils";
+ import { asNumber, asString, parseJson, parseObject } from "@paperclipai/adapter-utils/server-utils";
- function asErrorText(value: unknown): string {
+ function errorText(value: unknown): string {
if (typeof value === "string") return value;
const rec = parseObject(value);
- const message = asString(rec.message, "") || asString(rec.error, "") || asString(rec.code, "");
+ const message = asString(rec.message, "").trim();
if (message) return message;
+ const data = parseObject(rec.data);
+ const nestedMessage = asString(data.message, "").trim();
+ if (nestedMessage) return nestedMessage;
+ const name = asString(rec.name, "").trim();
+ if (name) return name;
++ const code = asString(rec.code, "").trim();
++ if (code) return code;
try {
return JSON.stringify(rec);
} catch {
@@@ -70,13 -84,10 +86,13 @@@ export function parseOpenCodeJsonl(stdo
}
export function isOpenCodeUnknownSessionError(stdout: string, stderr: string): boolean {
- const haystack = `${stdout}\n${stderr}`.toLowerCase();
- return (
- haystack.includes("session not found") ||
- haystack.includes("unknown session") ||
- haystack.includes("no session")
+ const haystack = `${stdout}\n${stderr}`
+ .split(/\r?\n/)
+ .map((line) => line.trim())
+ .filter(Boolean)
+ .join("\n");
+
- return /unknown\s+session|session\s+.*\s+not\s+found|resource\s+not\s+found:.*[\\/]session[\\/].*\.json|notfounderror/i.test(
++ return /unknown\s+session|session\s+.*\s+not\s+found|resource\s+not\s+found:.*[\\/]session[\\/].*\.json|notfounderror|no session/i.test(
+ haystack,
);
}
diff --cc packages/adapters/opencode-local/src/ui/parse-stdout.ts
index 5be02f7bfc,d8d2f03f6b..dc48e5d136
--- a/packages/adapters/opencode-local/src/ui/parse-stdout.ts
+++ b/packages/adapters/opencode-local/src/ui/parse-stdout.ts
@@@ -69,56 -89,19 +89,26 @@@ export function parseOpenCodeStdoutLine
return [{ kind: "assistant", ts, text }];
}
- if (type === "tool_use") {
+ if (type === "reasoning") {
const part = asRecord(parsed.part);
- const toolUseId = asString(part?.callID, asString(part?.id, "tool_use"));
- const toolName = asString(part?.tool, "tool");
- const state = asRecord(part?.state);
- const input = state?.input ?? {};
- const output = asString(state?.output).trim();
- const status = asString(state?.status).trim();
- const exitCode = asNumber(asRecord(state?.metadata)?.exit, NaN);
- const isError =
- status === "failed" ||
- status === "error" ||
- status === "cancelled" ||
- (Number.isFinite(exitCode) && exitCode !== 0);
-
- const entries: TranscriptEntry[] = [
+ const text = asString(part?.text).trim();
+ if (!text) return [];
+ return [{ kind: "thinking", ts, text }];
+ }
+
+ if (type === "tool_use") {
+ return parseToolUse(parsed, ts);
+ }
+
+ if (type === "step_start") {
- return [{ kind: "system", ts, text: "step started" }];
++ const sessionId = asString(parsed.sessionID);
++ return [
+ {
- kind: "tool_call",
++ kind: "system",
+ ts,
- name: toolName,
- input,
++ text: `step started${sessionId ? ` (${sessionId})` : ""}`,
+ },
+ ];
-
- if (status || output) {
- const lines: string[] = [];
- if (status) lines.push(`status: ${status}`);
- if (Number.isFinite(exitCode)) lines.push(`exit: ${exitCode}`);
- if (output) {
- if (lines.length > 0) lines.push("");
- if (isJsonLike(output)) {
- try {
- lines.push(JSON.stringify(JSON.parse(output), null, 2));
- } catch {
- lines.push(output);
- }
- } else {
- lines.push(output);
- }
- }
- entries.push({
- kind: "tool_result",
- ts,
- toolUseId,
- content: lines.join("\n").trim() || "tool completed",
- isError,
- });
- }
-
- return entries;
}
if (type === "step_finish") {
diff --cc packages/shared/src/constants.ts
index 02e838175f,7a6abd122e..4f6b75b921
--- a/packages/shared/src/constants.ts
+++ b/packages/shared/src/constants.ts
@@@ -21,7 -21,14 +21,15 @@@ export const AGENT_STATUSES =
] as const;
export type AgentStatus = (typeof AGENT_STATUSES)[number];
- export const AGENT_ADAPTER_TYPES = ["process", "http", "claude_local", "codex_local", "opencode_local", "cursor", "openclaw"] as const;
+ export const AGENT_ADAPTER_TYPES = [
+ "process",
+ "http",
+ "claude_local",
+ "codex_local",
+ "opencode_local",
++ "cursor",
+ "openclaw",
+ ] as const;
export type AgentAdapterType = (typeof AGENT_ADAPTER_TYPES)[number];
export const AGENT_ROLES = [
diff --cc server/src/__tests__/adapter-models.test.ts
index b03166b6af,56500a5975..7ec3f965f1
--- a/server/src/__tests__/adapter-models.test.ts
+++ b/server/src/__tests__/adapter-models.test.ts
@@@ -1,16 -1,15 +1,19 @@@
import { beforeEach, describe, expect, it, vi } from "vitest";
import { models as codexFallbackModels } from "@paperclipai/adapter-codex-local";
+import { models as cursorFallbackModels } from "@paperclipai/adapter-cursor-local";
+ import { resetOpenCodeModelsCacheForTests } from "@paperclipai/adapter-opencode-local/server";
import { listAdapterModels } from "../adapters/index.js";
import { resetCodexModelsCacheForTests } from "../adapters/codex-models.js";
+import { resetCursorModelsCacheForTests, setCursorModelsRunnerForTests } from "../adapters/cursor-models.js";
describe("adapter model listing", () => {
beforeEach(() => {
delete process.env.OPENAI_API_KEY;
+ delete process.env.PAPERCLIP_OPENCODE_COMMAND;
resetCodexModelsCacheForTests();
+ resetCursorModelsCacheForTests();
+ setCursorModelsRunnerForTests(null);
+ resetOpenCodeModelsCacheForTests();
vi.restoreAllMocks();
});
@@@ -60,34 -59,10 +63,42 @@@
expect(models).toEqual(codexFallbackModels);
});
++
+ it("returns cursor fallback models when CLI discovery is unavailable", async () => {
+ setCursorModelsRunnerForTests(() => ({
+ status: null,
+ stdout: "",
+ stderr: "",
+ hasError: true,
+ }));
+
+ const models = await listAdapterModels("cursor");
+ expect(models).toEqual(cursorFallbackModels);
+ });
+
+ it("loads cursor models dynamically and caches them", async () => {
+ const runner = vi.fn(() => ({
+ status: 0,
+ stdout: "Available models: auto, composer-1.5, gpt-5.3-codex-high, sonnet-4.6",
+ stderr: "",
+ hasError: false,
+ }));
+ setCursorModelsRunnerForTests(runner);
+
+ const first = await listAdapterModels("cursor");
+ const second = await listAdapterModels("cursor");
+
+ expect(runner).toHaveBeenCalledTimes(1);
+ expect(first).toEqual(second);
+ expect(first.some((model) => model.id === "auto")).toBe(true);
+ expect(first.some((model) => model.id === "gpt-5.3-codex-high")).toBe(true);
+ expect(first.some((model) => model.id === "composer-1")).toBe(true);
+ });
++
+ it("returns no opencode models when opencode command is unavailable", async () => {
+ process.env.PAPERCLIP_OPENCODE_COMMAND = "__paperclip_missing_opencode_command__";
+
+ const models = await listAdapterModels("opencode_local");
+ expect(models).toEqual([]);
+ });
});
diff --cc server/src/adapters/registry.ts
index 57b057d1e1,c53d4d3bab..c353603a93
--- a/server/src/adapters/registry.ts
+++ b/server/src/adapters/registry.ts
@@@ -12,27 -12,23 +12,30 @@@ import
} from "@paperclipai/adapter-codex-local/server";
import { agentConfigurationDoc as codexAgentConfigurationDoc, models as codexModels } from "@paperclipai/adapter-codex-local";
import {
- execute as openclawExecute,
- testEnvironment as openclawTestEnvironment,
-} from "@paperclipai/adapter-openclaw/server";
-import {
- agentConfigurationDoc as openclawAgentConfigurationDoc,
- models as openclawModels,
-} from "@paperclipai/adapter-openclaw";
+ execute as cursorExecute,
+ testEnvironment as cursorTestEnvironment,
+ sessionCodec as cursorSessionCodec,
+} from "@paperclipai/adapter-cursor-local/server";
+import { agentConfigurationDoc as cursorAgentConfigurationDoc, models as cursorModels } from "@paperclipai/adapter-cursor-local";
import {
- execute as opencodeExecute,
- testEnvironment as opencodeTestEnvironment,
- sessionCodec as opencodeSessionCodec,
+ execute as openCodeExecute,
+ testEnvironment as openCodeTestEnvironment,
+ sessionCodec as openCodeSessionCodec,
+ listOpenCodeModels,
} from "@paperclipai/adapter-opencode-local/server";
- import { agentConfigurationDoc as opencodeAgentConfigurationDoc, models as opencodeModels } from "@paperclipai/adapter-opencode-local";
+ import {
+ agentConfigurationDoc as openCodeAgentConfigurationDoc,
+ } from "@paperclipai/adapter-opencode-local";
+import {
+ execute as openclawExecute,
+ testEnvironment as openclawTestEnvironment,
+} from "@paperclipai/adapter-openclaw/server";
+import {
+ agentConfigurationDoc as openclawAgentConfigurationDoc,
+ models as openclawModels,
+} from "@paperclipai/adapter-openclaw";
import { listCodexModels } from "./codex-models.js";
+import { listCursorModels } from "./cursor-models.js";
import { processAdapter } from "./process/index.js";
import { httpAdapter } from "./http/index.js";
@@@ -57,27 -53,6 +60,17 @@@ const codexLocalAdapter: ServerAdapterM
agentConfigurationDoc: codexAgentConfigurationDoc,
};
- const opencodeLocalAdapter: ServerAdapterModule = {
- type: "opencode_local",
- execute: opencodeExecute,
- testEnvironment: opencodeTestEnvironment,
- sessionCodec: opencodeSessionCodec,
- models: opencodeModels,
- supportsLocalAgentJwt: true,
- agentConfigurationDoc: opencodeAgentConfigurationDoc,
- };
-
+const cursorLocalAdapter: ServerAdapterModule = {
+ type: "cursor",
+ execute: cursorExecute,
+ testEnvironment: cursorTestEnvironment,
+ sessionCodec: cursorSessionCodec,
+ models: cursorModels,
+ listModels: listCursorModels,
+ supportsLocalAgentJwt: true,
+ agentConfigurationDoc: cursorAgentConfigurationDoc,
+};
+
const openclawAdapter: ServerAdapterModule = {
type: "openclaw",
execute: openclawExecute,
@@@ -87,8 -62,21 +80,19 @@@
agentConfigurationDoc: openclawAgentConfigurationDoc,
};
+ const openCodeLocalAdapter: ServerAdapterModule = {
+ type: "opencode_local",
+ execute: openCodeExecute,
+ testEnvironment: openCodeTestEnvironment,
+ sessionCodec: openCodeSessionCodec,
+ models: [],
+ listModels: listOpenCodeModels,
+ supportsLocalAgentJwt: true,
+ agentConfigurationDoc: openCodeAgentConfigurationDoc,
+ };
+
const adaptersByType = new Map<string, ServerAdapterModule>(
- [claudeLocalAdapter, codexLocalAdapter, opencodeLocalAdapter, cursorLocalAdapter, openclawAdapter, processAdapter, httpAdapter].map((a) => [a.type, a]),
- [claudeLocalAdapter, codexLocalAdapter, openCodeLocalAdapter, openclawAdapter, processAdapter, httpAdapter].map(
- (a) => [a.type, a],
- ),
++ [claudeLocalAdapter, codexLocalAdapter, openCodeLocalAdapter, cursorLocalAdapter, openclawAdapter, processAdapter, httpAdapter].map((a) => [a.type, a]),
);
export function getServerAdapter(type: string): ServerAdapterModule {
diff --cc server/src/routes/agents.ts
index 607c451a6a,3b16c12564..e91f00f9cd
--- a/server/src/routes/agents.ts
+++ b/server/src/routes/agents.ts
@@@ -36,8 -36,7 +36,9 @@@ import
DEFAULT_CODEX_LOCAL_BYPASS_APPROVALS_AND_SANDBOX,
DEFAULT_CODEX_LOCAL_MODEL,
} from "@paperclipai/adapter-codex-local";
+import { DEFAULT_CURSOR_LOCAL_MODEL } from "@paperclipai/adapter-cursor-local";
+import { DEFAULT_OPENCODE_LOCAL_MODEL } from "@paperclipai/adapter-opencode-local";
+ import { ensureOpenCodeModelConfiguredAndAvailable } from "@paperclipai/adapter-opencode-local/server";
export function agentRoutes(db: Db) {
const DEFAULT_INSTRUCTIONS_PATH_KEYS: Record<string, string> = {
diff --cc ui/src/components/AgentConfigForm.tsx
index a99fb25bd3,f9b08d2053..861c69f699
--- a/ui/src/components/AgentConfigForm.tsx
+++ b/ui/src/components/AgentConfigForm.tsx
@@@ -337,19 -334,15 +345,19 @@@ export function AgentConfigForm(props:
const thinkingEffortKey =
adapterType === "codex_local"
? "modelReasoningEffort"
- : adapterType === "opencode_local"
- ? "variant"
- : "effort";
+ : adapterType === "cursor"
+ ? "mode"
- : adapterType === "opencode_local"
- ? "variant"
- : "effort";
++ : adapterType === "opencode_local"
++ ? "variant"
++ : "effort";
const thinkingEffortOptions =
adapterType === "codex_local"
? codexThinkingEffortOptions
- : adapterType === "opencode_local"
- ? openCodeThinkingEffortOptions
- : claudeThinkingEffortOptions;
+ : adapterType === "cursor"
+ ? cursorModeOptions
- : adapterType === "opencode_local"
- ? opencodeVariantOptions
- : claudeThinkingEffortOptions;
++ : adapterType === "opencode_local"
++ ? openCodeThinkingEffortOptions
++ : claudeThinkingEffortOptions;
const currentThinkingEffort = isCreate
? val!.thinkingEffort
: adapterType === "codex_local"
@@@ -358,10 -351,8 +366,10 @@@
"modelReasoningEffort",
String(config.modelReasoningEffort ?? config.reasoningEffort ?? ""),
)
- : adapterType === "opencode_local"
- ? eff("adapterConfig", "variant", String(config.variant ?? ""))
+ : adapterType === "cursor"
+ ? eff("adapterConfig", "mode", String(config.mode ?? ""))
- : adapterType === "opencode_local"
- ? eff("adapterConfig", "variant", String(config.variant ?? ""))
++ : adapterType === "opencode_local"
++ ? eff("adapterConfig", "variant", String(config.variant ?? ""))
: eff("adapterConfig", "effort", String(config.effort ?? ""));
const codexSearchEnabled = adapterType === "codex_local"
? (isCreate ? Boolean(val!.search) : eff("adapterConfig", "search", Boolean(config.search)))
@@@ -603,11 -581,9 +611,11 @@@
placeholder={
adapterType === "codex_local"
? "codex"
- : adapterType === "opencode_local"
- ? "opencode"
- : "claude"
+ : adapterType === "cursor"
+ ? "agent"
- : adapterType === "opencode_local"
- ? "opencode"
- : "claude"
++ : adapterType === "opencode_local"
++ ? "opencode"
++ : "claude"
}
/>
</Field>
diff --cc ui/src/components/NewIssueDialog.tsx
index 1b07385f79,8653cb1b4a..5aad72bd2f
--- a/ui/src/components/NewIssueDialog.tsx
+++ b/ui/src/components/NewIssueDialog.tsx
@@@ -110,10 -111,10 +111,12 @@@ function buildAssigneeAdapterOverrides(
if (input.thinkingEffortOverride) {
if (adapterType === "codex_local") {
adapterConfig.modelReasoningEffort = input.thinkingEffortOverride;
+ } else if (adapterType === "opencode_local") {
+ adapterConfig.variant = input.thinkingEffortOverride;
} else if (adapterType === "claude_local") {
adapterConfig.effort = input.thinkingEffortOverride;
+ } else if (adapterType === "opencode_local") {
+ adapterConfig.variant = input.thinkingEffortOverride;
}
}
if (adapterType === "claude_local" && input.chrome) {
diff --cc ui/src/components/OnboardingWizard.tsx
index 61541e3cb4,dd426e53fc..9d0e9638cf
--- a/ui/src/components/OnboardingWizard.tsx
+++ b/ui/src/components/OnboardingWizard.tsx
@@@ -149,22 -146,23 +152,30 @@@ export function OnboardingWizard()
if (step === 3) autoResizeTextarea();
}, [step, taskDescription, autoResizeTextarea]);
- const { data: adapterModels } = useQuery({
- queryKey: ["adapter-models", adapterType],
- queryFn: () => agentsApi.adapterModels(adapterType),
- enabled: onboardingOpen && step === 2
+ const {
+ data: adapterModels,
+ error: adapterModelsError,
+ isLoading: adapterModelsLoading,
+ isFetching: adapterModelsFetching,
+ } = useQuery({
+ queryKey:
+ createdCompanyId
+ ? queryKeys.agents.adapterModels(createdCompanyId, adapterType)
+ : ["agents", "none", "adapter-models", adapterType],
+ queryFn: () => agentsApi.adapterModels(createdCompanyId!, adapterType),
+ enabled: Boolean(createdCompanyId) && onboardingOpen && step === 2
});
const isLocalAdapter =
- adapterType === "claude_local" || adapterType === "codex_local" || adapterType === "opencode_local";
+ adapterType === "claude_local" || adapterType === "codex_local" || adapterType === "opencode_local" || adapterType === "cursor";
const effectiveAdapterCommand =
- command.trim() || (adapterType === "codex_local" ? "codex" : adapterType === "opencode_local" ? "opencode" : "claude");
+ command.trim() ||
+ (adapterType === "codex_local"
+ ? "codex"
+ : adapterType === "cursor"
+ ? "agent"
- : adapterType === "opencode_local"
- ? "opencode"
- : "claude");
++ : adapterType === "opencode_local"
++ ? "opencode"
++ : "claude");
useEffect(() => {
if (step !== 2) return;
@@@ -173,15 -171,41 +184,50 @@@
}, [step, adapterType, cwd, model, command, args, url]);
const selectedModel = (adapterModels ?? []).find((m) => m.id === model);
+ const hasAnthropicApiKeyOverrideCheck =
+ adapterEnvResult?.checks.some(
+ (check) =>
+ check.code === "claude_anthropic_api_key_overrides_subscription"
+ ) ?? false;
+ const shouldSuggestUnsetAnthropicApiKey =
+ adapterType === "claude_local" &&
+ adapterEnvResult?.status === "fail" &&
+ hasAnthropicApiKeyOverrideCheck;
+ const filteredModels = useMemo(() => {
+ const query = modelSearch.trim().toLowerCase();
+ return (adapterModels ?? []).filter((entry) => {
+ if (!query) return true;
+ const provider = extractProviderIdWithFallback(entry.id, "");
+ return (
+ entry.id.toLowerCase().includes(query) ||
+ entry.label.toLowerCase().includes(query) ||
+ provider.toLowerCase().includes(query)
+ );
+ });
+ }, [adapterModels, modelSearch]);
+ const groupedModels = useMemo(() => {
+ if (adapterType !== "opencode_local") {
+ return [
+ {
+ provider: "models",
+ entries: [...filteredModels].sort((a, b) => a.id.localeCompare(b.id)),
+ },
+ ];
+ }
+ const groups = new Map<string, Array<{ id: string; label: string }>>();
+ for (const entry of filteredModels) {
+ const provider = extractProviderIdWithFallback(entry.id);
+ const bucket = groups.get(provider) ?? [];
+ bucket.push(entry);
+ groups.set(provider, bucket);
+ }
+ return Array.from(groups.entries())
+ .sort(([a], [b]) => a.localeCompare(b))
+ .map(([provider, entries]) => ({
+ provider,
+ entries: [...entries].sort((a, b) => a.id.localeCompare(b.id)),
+ }));
+ }, [filteredModels, adapterType]);
function reset() {
setStep(1);
@@@ -584,15 -574,14 +659,21 @@@
value: "codex_local" as const,
label: "Codex",
icon: Code,
- desc: "Local Codex agent"
+ desc: "Local Codex agent",
+ recommended: true
+ },
+ {
+ value: "opencode_local" as const,
+ label: "OpenCode",
+ icon: Code,
+ desc: "Local OpenCode agent"
},
+ {
+ value: "opencode_local" as const,
+ label: "OpenCode",
+ icon: OpenCodeLogoIcon,
+ desc: "Local multi-provider agent"
+ },
{
value: "openclaw" as const,
label: "OpenClaw",
@@@ -638,18 -628,17 +719,23 @@@
setAdapterType(nextType);
if (nextType === "codex_local" && !model) {
setModel(DEFAULT_CODEX_LOCAL_MODEL);
- return;
+ } else if (nextType === "cursor" && !model) {
+ setModel(DEFAULT_CURSOR_LOCAL_MODEL);
- } else if (nextType === "opencode_local" && !model) {
- setModel(DEFAULT_OPENCODE_LOCAL_MODEL);
}
+ if (nextType === "opencode_local") {
+ if (!model.includes("/")) {
+ setModel("");
+ }
+ return;
+ }
+ setModel("");
}}
>
+ {opt.recommended && (
+ <span className="absolute -top-1.5 -right-1.5 bg-green-500 text-white text-[9px] font-semibold px-1.5 py-0.5 rounded-full leading-none">
+ Recommended
+ </span>
+ )}
<opt.icon className="h-4 w-4" />
<span className="font-medium">{opt.label}</span>
<span className="text-muted-foreground text-[10px]">
@@@ -797,34 -800,29 +916,40 @@@
<div className="rounded-md border border-border/70 bg-muted/20 px-2.5 py-2 text-[11px] space-y-1.5">
<p className="font-medium">Manual debug</p>
<p className="text-muted-foreground font-mono break-all">
- {adapterType === "codex_local"
+ {adapterType === "cursor"
+ ? `${effectiveAdapterCommand} -p --mode ask --output-format json \"Respond with hello.\"`
+ : adapterType === "codex_local"
? `${effectiveAdapterCommand} exec --json -`
: adapterType === "opencode_local"
- ? `${effectiveAdapterCommand} run --format json \"Respond with hello.\"`
- ? `${effectiveAdapterCommand} run --format json`
++ ? `${effectiveAdapterCommand} run --format json "Respond with hello."`
: `${effectiveAdapterCommand} --print - --output-format stream-json --verbose`}
</p>
<p className="text-muted-foreground">
Prompt:{" "}
<span className="font-mono">Respond with hello.</span>
</p>
- {adapterType === "codex_local" ? (
+ {adapterType === "cursor" || adapterType === "codex_local" || adapterType === "opencode_local" ? (
<p className="text-muted-foreground">
If auth fails, set{" "}
- <span className="font-mono">OPENAI_API_KEY</span> in
+ <span className="font-mono">
+ {adapterType === "cursor" ? "CURSOR_API_KEY" : "OPENAI_API_KEY"}
+ </span>{" "}
+ in
env or run{" "}
- <span className="font-mono">codex login</span>.
+ <span className="font-mono">
+ {adapterType === "cursor"
+ ? "agent login"
+ : adapterType === "codex_local"
+ ? "codex login"
+ : "opencode auth login"}
+ </span>.
</p>
+ ) : adapterType === "opencode_local" ? (
+ <p className="text-muted-foreground">
+ If providers are unavailable, run{" "}
+ <span className="font-mono">opencode models</span> and{" "}
+ <span className="font-mono">opencode auth login</span>.
+ </p>
) : (
<p className="text-muted-foreground">
If login is required, run{" "}