@ory/opencode 0.3.0 → 0.4.0

package/README.md

@@ -13,26 +13,27 @@ You don't need an Ory account or any prior Ory experience to start.
 
 ## Install
 
-Add the plugin to your `opencode.json`:
+Run the installer from your project directory:
 
-```json
-{ "plugin": ["@ory/opencode"] }
+```bash
+npx -y -p @ory/opencode ory-opencode install
 ```
 
-OpenCode fetches the plugin from npm on next launch.
+This writes the plugin into `opencode.json`, registers the Ory MCP server, and drops the Ory skill catalog into `.opencode/skills/` and the local-stack slash commands into `.opencode/commands/ory/` — all in one step. Run `npx -y -p @ory/opencode ory-opencode uninstall` to reverse it.
 
 <details>
-<summary>Alternative install paths</summary>
+<summary>Alternative install: edit opencode.json by hand</summary>
 
-The Ory installer registers the plugin **and** the Ory MCP server in one step, with no prior `npm install` required:
+If you want only the plugin (no MCP server, no skills, no slash commands), add it directly to `opencode.json`:
 
-```bash
-npx @ory/opencode install                          # writes opencode.json + MCP config
-npx @ory/opencode install --project-dir <path>
-npx @ory/opencode uninstall
+```json
+{
+  "$schema": "https://opencode.ai/config.json",
+  "plugin": ["@ory/opencode"]
+}
 ```
 
-Either flow drops the Ory skill catalog into `.opencode/skills/` and the local-stack commands into `.opencode/commands/ory/`.
+OpenCode fetches the plugin from npm on next launch. The Quickstart below will not work via this path — `/ory:local-up` and the scaffolding skills only land on disk when you run the installer.
 
 </details>
 
@@ -54,6 +55,14 @@ From any project where you'd like Ory authentication, inside OpenCode:
 
 3. **Sign in.** Start your app, visit the login page OpenCode added, and sign in with the seeded credentials. You now have a real Ory session backed by a real Ory stack — locally, offline, with zero configuration.
 
+4. **Turn on Ory login for the OpenCode session itself.** *(Optional but recommended.)* Out of the box the plugin only governs your *app*. To also attach an Ory identity to *OpenCode's* session — so every tool call is attributed to you, not a fallback `session:<id>` subject — set:
+
+   ```bash
+   export ORY_AUTH_GATE=1
+   ```
+
+   Then restart OpenCode. On next session start, OpenCode opens an Ory login in your browser; sign in with the same seeded credentials from step 1. This is what makes `permissions enforce` (see [Agent security](#agent-security)) deny on the right identity later. (Note: OpenCode's session-start primitive can't hard-block, so the gate runs in advisory mode — auth still happens and the audit trail is correct, but the session always proceeds.)
+
 That's the full Ory DX path. Stop here if you're just evaluating the plugin. Continue to [Agent security](#agent-security) when you're ready to enforce.
 
 ## What's included
@@ -168,6 +177,7 @@ Highlights:
 - **`/ory:local-up` fails.** Make sure Docker is running and ports `3000`, `4000`, `4100`, and `16686` are free.
 - **PKCE login loops.** Clear persisted state with `npx -y -p @ory/opencode ory-opencode agent unregister` and retry.
 - **`npx` fetches an old version.** Force a fresh fetch: `npx -y -p @ory/opencode@latest ory-opencode …`.
+- **`npm error code ENOVERSIONS` on install.** Your npm has a supply-chain freshness filter (`min-release-age`) that's hiding all `@ory/opencode` versions newer than its threshold. Either wait it out, or run the installer with `--min-release-age=0`: `npx -y --min-release-age=0 -p @ory/opencode ory-opencode install`.
 - **Need more signal.** Set `ORY_AGENT_DEBUG=true` and `ORY_AGENT_LOG_FILE=/tmp/ory.log` to capture structured logs.
 
 ## Links

package/dist/cli/main.js

@@ -75,7 +75,10 @@ function main() {
             });
             break;
         case "status":
-            status(args);
+            status(args).then(() => process.exit(0), (err) => {
+                console.error(err.message ?? err);
+                process.exit(1);
+            });
             break;
         case "local":
             (0, argus_1.runLocalCommand)("ory-opencode", args).catch((err) => {
@@ -111,13 +114,21 @@ const PLUGIN_MODULE = "@ory/opencode";
 const MCP_SERVER_NAME = "ory";
 const MCP_SERVER_COMMAND = [
     "npx",
+    "-y",
     "--package=@ory/mcp-server",
     "ory-mcp-server",
 ];
+const OPENCODE_SCHEMA_URL = "https://opencode.ai/config.json";
 function install(args) {
     const projectDir = parseProjectDir(args);
     const configPath = path.join(projectDir, "opencode.json");
+    const fileExists = fs.existsSync(configPath);
     const config = (0, argus_1.readJsonFile)(configPath);
+    // Set $schema for editor autocomplete on fresh configs only — don't
+    // overwrite a user's existing schema reference.
+    if (!fileExists && !config.$schema) {
+        config.$schema = OPENCODE_SCHEMA_URL;
+    }
     const plugin = (config.plugin ?? []).filter((p) => (typeof p === "string" ? p : p[0]) !== PLUGIN_MODULE);
     plugin.push(PLUGIN_MODULE);
     config.plugin = plugin;
@@ -158,63 +169,70 @@ function uninstall(args) {
     else {
         config.mcp = mcp;
     }
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+    // If the file is now effectively empty (we created it, only $schema left
+    // from our own install) delete it instead of leaving `{}` behind. Keep
+    // it if there's any user-authored content.
+    const remainingKeys = Object.keys(config).filter((k) => k !== "$schema");
+    if (remainingKeys.length === 0) {
+        fs.unlinkSync(configPath);
+        console.log(`Removed Ory plugin and MCP server; opencode.json was empty after cleanup and has been deleted.`);
+    }
+    else {
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+        console.log(`Ory plugin and MCP server removed from ${configPath}`);
+    }
     (0, assets_js_1.uninstallOpencodeOryAssets)(projectDir);
-    console.log(`Ory plugin and MCP server removed from ${configPath}`);
 }
-function status(args) {
+async function status(args) {
     const projectDir = parseProjectDir(args);
     const configPath = path.join(projectDir, "opencode.json");
-    console.log("Ory Agent Plugin Status (OpenCode)");
-    console.log("===================================");
-    console.log("");
-    // OpenCode-specific: check plugin registration
-    const config = (0, argus_1.readJsonFile)(configPath);
-    const moduleName = "@ory/opencode";
-    const plugin = (config.plugin ?? []);
-    const oryPlugin = plugin.find((p) => (typeof p === "string" ? p : p[0]) === moduleName);
-    console.log("Configuration:");
-    console.log(`  Config file: ${configPath}`);
-    console.log(`  Plugin registered: ${oryPlugin ? "yes" : "NO"}`);
-    if (oryPlugin) {
-        console.log(`  Module: ${typeof oryPlugin === "string" ? oryPlugin : oryPlugin[0]}`);
-    }
-    // Shared Ory config
-    console.log("");
-    console.log("Ory Configuration:");
-    const resolved = (0, argus_1.resolveConfig)();
-    const oryConfigPath = (0, argus_1.getConfigPath)();
-    console.log(`  Config file: ${oryConfigPath}`);
-    console.log(`  Project URL: ${resolved.projectUrl ?? "NOT SET"} [source: ${resolved.projectUrlSource}]`);
-    console.log(`  API Key:     ${resolved.apiKey ? "(set)" : "NOT SET"} [source: ${resolved.apiKeySource}]`);
-    (0, argus_1.printEnvironment)();
-    (0, argus_1.printLogTail)();
+    await (0, argus_1.runStatusCommand)("ory-opencode", "opencode", {
+        title: "OpenCode",
+        printPluginSection: () => {
+            const config = (0, argus_1.readJsonFile)(configPath);
+            const moduleName = "@ory/opencode";
+            const plugin = (config.plugin ?? []);
+            const oryPlugin = plugin.find((p) => (typeof p === "string" ? p : p[0]) === moduleName);
+            console.log("Hooks & plugin:");
+            console.log(`  Config file:       ${configPath}`);
+            console.log(`  Plugin registered: ${oryPlugin ? "yes" : "NO"}`);
+            if (oryPlugin) {
+                console.log(`  Module:            ${typeof oryPlugin === "string" ? oryPlugin : oryPlugin[0]}`);
+            }
+        },
+    });
 }
 function help() {
     console.log(`
 ory-opencode — Ory plugin for OpenCode
 
 Usage:
-  npx ory-opencode <command> [options]
+  npx -y -p @ory/opencode ory-opencode <command> [options]
 
 Commands:
-  install [--project-dir <path>]   Register the Ory plugin in opencode.json
-  uninstall [--project-dir <path>] Remove the Ory plugin from opencode.json
+  install [--project-dir <path>]   Register the Ory plugin and MCP server in opencode.json
+  uninstall [--project-dir <path>] Remove the Ory plugin and MCP server from opencode.json
   configure                        Set or view Ory project URL and API key
-  permissions <cmd>                Manage permission mode and tool permissions (status, bootstrap, observe, enforce)
+  agent <status|unregister>        Manage the agent's OAuth2 (DCR) identity
+  permissions <cmd>                Manage permission mode and tool permissions
+                                   (status, bootstrap, observe, enforce)
+  local <cmd>                      Manage local Ory dev environment
+                                   (up, down, status, seed, logs, env, configure, reset)
   status [--project-dir <path>]    Show plugin configuration and status
-  local <cmd>                      Manage local Ory dev environment (up, down, status, seed, ...)
 
-After installing, the plugin hooks into these OpenCode lifecycle events:
-  session.created        Verify agent session via Ory Identities
+After installing, the plugin registers these OpenCode hooks:
+  config                 Log resolved Ory config at startup
+  chat.message           Trace user prompts per turn
+  permission.ask         Authorize actions via Ory Permissions
   tool.execute.before    Check tool permissions via Ory Permissions
   tool.execute.after     Audit log tool executions
-  permission.ask         Authorize actions via Ory Permissions
 
 Examples:
-  npx ory-opencode install           # Register in current directory
-  npx ory-opencode status            # Check configuration
-  npx ory-opencode uninstall         # Remove plugin
+  npx -y -p @ory/opencode ory-opencode install
+  npx -y -p @ory/opencode ory-opencode configure --project-url https://<id>.projects.oryapis.com --api-key ory_pat_...
+  npx -y -p @ory/opencode ory-opencode permissions bootstrap
+  npx -y -p @ory/opencode ory-opencode local up
+  npx -y -p @ory/opencode ory-opencode status
 `);
 }
 main();

package/dist/cli/setup.js

@@ -51,9 +51,11 @@ const PLUGIN_MODULE = "@ory/opencode";
 const MCP_SERVER_NAME = "ory";
 const MCP_SERVER_COMMAND = [
     "npx",
+    "-y",
     "--package=@ory/mcp-server",
     "ory-mcp-server",
 ];
+const OPENCODE_SCHEMA_URL = "https://opencode.ai/config.json";
 // OpenCode's config schema uses `mcp` (singular) with a `local` connector
 // shape `{ type: "local", command: [...] }`, not the generic `mcpServers`
 // helper from core.
@@ -108,22 +110,34 @@ function main() {
         return;
     }
     const configPath = getConfigPath(args);
+    const fileExists = fs.existsSync(configPath);
     const existing = (0, argus_1.readJsonFile)(configPath);
     if (args.uninstall) {
-        if (!fs.existsSync(configPath)) {
+        if (!fileExists) {
             console.log("No opencode.json found. Nothing to uninstall.");
             return;
         }
         let updated = removePlugin(existing);
         updated = removeOpencodeMcp(updated);
-        (0, argus_1.writeJsonFile)(configPath, updated);
+        const remainingKeys = Object.keys(updated).filter((k) => k !== "$schema");
+        if (remainingKeys.length === 0) {
+            fs.unlinkSync(configPath);
+            console.log(`Removed Ory plugin and MCP server; opencode.json was empty after cleanup and has been deleted.`);
+        }
+        else {
+            (0, argus_1.writeJsonFile)(configPath, updated);
+            console.log(`Removed Ory plugin and MCP server from ${configPath}`);
+        }
         (0, assets_js_1.uninstallOpencodeOryAssets)(args.projectDir);
-        console.log(`Removed Ory plugin and MCP server from ${configPath}`);
         console.log(`Removed Ory skills and commands from ${path.join(args.projectDir, ".opencode")}`);
         return;
     }
     let merged = mergePlugin(existing);
     merged = mergeOpencodeMcp(merged);
+    // Add $schema for editor autocomplete on fresh configs only.
+    if (!fileExists && !merged.$schema) {
+        merged = { $schema: OPENCODE_SCHEMA_URL, ...merged };
+    }
     (0, argus_1.writeJsonFile)(configPath, merged);
     (0, assets_js_1.installOpencodeOryAssets)(args.projectDir);
     console.log(`Ory plugin and MCP server configured in ${configPath}`);

package/dist/plugin.js

@@ -31,7 +31,6 @@ function createOryPlugin(clientOrConfig, deps = {}) {
             return {
                 config: createConfigHandler(client),
                 "chat.message": createChatMessageHandler(client),
-                "command.execute.before": createCommandBeforeHandler(client),
                 "permission.ask": createPermissionHandler(client, options),
                 "tool.execute.before": createToolBeforeHandler(client),
                 "tool.execute.after": createToolAfterHandler(client),
@@ -78,27 +77,6 @@ function createChatMessageHandler(client) {
         });
     };
 }
-// ─── command.execute.before ────────────────────────────────────────
-function createCommandBeforeHandler(client) {
-    return async (input, _output) => {
-        if (input.sessionID) {
-            client.tracer.setContext({
-                traceId: (0, argus_1.deriveTraceId)(input.sessionID),
-                sessionId: input.sessionID,
-            });
-        }
-        client.logger.info("lifecycle.command_execute_before", {
-            command: input.name,
-            sessionID: input.sessionID,
-        });
-        client.tracer.record("hook.receive", "ok", {
-            attributes: {
-                event: "command.execute.before",
-                command: input.name,
-            },
-        });
-    };
-}
 // ─── Session verification on startup ────────────────────────────────
 async function verifyOnStartup(client, deps) {
     // Run the user auth gate. The OpenCode `server` factory has no block
@@ -185,38 +163,44 @@ async function verifyOnStartup(client, deps) {
 // ─── permission.ask ─────────────────────────────────────────────────
 function createPermissionHandler(client, _options) {
     return async (input, output) => {
+        // Canonical Permission uses `type`; older plugin versions read `toolID`.
+        // Coalesce so the handler works regardless of which the runtime populates.
+        const toolId = input.toolID ?? input.type ?? "unknown";
         client.logger.info("lifecycle.permission_ask", {
-            toolID: input.toolID,
+            toolID: toolId,
             title: input.title,
         });
         // In audit-only mode, defer to user prompt
         if ((0, argus_1.resolveConfig)().auditOnly) {
             return;
         }
-        const subject = (0, argus_1.resolveUserSubject)(client, "agent:opencode");
-        const mcpTool = (0, argus_1.parseMcpToolGeneric)(input.toolID);
+        // Use the session as the subject fallback, matching tool.execute.before.
+        // Letting this default to the agent's own subject (the prior behavior)
+        // would silently match the agent's tuples instead of the user's.
+        const subject = (0, argus_1.resolveUserSubject)(client, input.sessionID ? `session:${input.sessionID}` : undefined);
+        const mcpTool = (0, argus_1.parseMcpToolGeneric)(toolId);
         try {
             if (mcpTool) {
                 const mcpResult = await (0, argus_1.checkMcpPermission)(client, mcpTool, {
                     subject,
-                    spanAttributes: { toolName: input.toolID },
+                    spanAttributes: { toolName: toolId },
                 });
                 const decision = (0, argus_1.applyPermissionMode)(client, mcpResult.allowed, {
                     object: mcpTool.serverName,
                     relation: "use",
                     subjectId: (0, argus_1.subjectLabel)(subject),
                     ...("subjectSet" in subject ? { subjectSet: subject.subjectSet } : {}),
-                    spanAttributes: { toolName: input.toolID, mcpServer: mcpTool.serverName, mcpTool: mcpTool.toolName },
+                    spanAttributes: { toolName: toolId, mcpServer: mcpTool.serverName, mcpTool: mcpTool.toolName },
                 });
                 output.status = decision.kind === "deny" ? "deny" : "allow";
                 return;
             }
-            const decision = await (0, argus_1.checkAndDecide)(client, { namespace: resolveNamespace(), object: input.toolID, relation: "use", ...subject }, { spanAttributes: { toolName: input.toolID } });
+            const decision = await (0, argus_1.checkAndDecide)(client, { namespace: resolveNamespace(), object: toolId, relation: "use", ...subject }, { spanAttributes: { toolName: toolId } });
             if (decision.kind === "fail_open") {
                 const code = decision.error.code;
                 if (code === "network_error" || code === "rate_limited") {
                     client.logger.warn("permission.fallback", {
-                        toolID: input.toolID,
+                        toolID: toolId,
                         code,
                     });
                     // Leave output.status as "ask" (default)
@@ -230,7 +214,7 @@ function createPermissionHandler(client, _options) {
         catch (err) {
             if (isOryError(err) && (err.code === "network_error" || err.code === "rate_limited")) {
                 client.logger.warn("permission.fallback", {
-                    toolID: input.toolID,
+                    toolID: toolId,
                     code: err.code,
                 });
                 // Leave output.status as "ask" (default)
@@ -262,7 +246,7 @@ function createToolBeforeHandler(client) {
             });
             return;
         }
-        const subject = (0, argus_1.resolveUserSubject)(client, input.sessionID ? `session:${input.sessionID}` : "agent:opencode");
+        const subject = (0, argus_1.resolveUserSubject)(client, input.sessionID ? `session:${input.sessionID}` : undefined);
         const subjectId = (0, argus_1.subjectLabel)(subject);
         const mcpTool = (0, argus_1.parseMcpToolGeneric)(input.tool);
         try {
@@ -379,15 +363,15 @@ function createToolAfterHandler(client) {
             sessionID: input.sessionID,
             callID: input.callID,
         });
-        // Set trace context for this tool completion
         client.tracer.setContext({
             traceId: (0, argus_1.deriveTraceId)(input.sessionID),
             sessionId: input.sessionID,
         });
+        // OpenCode's canonical tool.execute.after input has no `args`,
+        // so input summary is unavailable here; output summary only.
         client.tracer.record("tool.complete", "ok", {
             attributes: {
                 toolName: input.tool,
-                ...(0, argus_1.summarizeToolInput)(input.tool, input.args),
                 ...(0, argus_1.summarizeToolOutput)(input.tool, {
                     title: output.title,
                     output: output.output,

package/dist/types.d.ts

@@ -25,10 +25,19 @@ export interface PluginModule {
     server: Plugin;
 }
 export interface Permission {
-    toolID: string;
+    id?: string;
+    type?: string;
+    pattern?: string | Array<string>;
+    sessionID?: string;
+    messageID?: string;
+    callID?: string;
     title: string;
-    description: string;
     metadata: Record<string, unknown>;
+    time?: {
+        created: number;
+    };
+    toolID?: string;
+    description?: string;
 }
 export interface ChatMessageInput {
     sessionID: string;
@@ -39,11 +48,6 @@ export interface ChatMessageInput {
         modelID?: string;
     };
 }
-export interface CommandExecuteBeforeInput {
-    name: string;
-    sessionID?: string;
-    args?: unknown;
-}
 export interface Hooks {
     event?: (input: {
         event: unknown;
@@ -52,8 +56,6 @@ export interface Hooks {
     config?: (input: Record<string, unknown>) => Promise<void>;
     /** Fires on every user message. Observer only — useful for per-turn audit. */
     "chat.message"?: (input: ChatMessageInput, output: Record<string, unknown>) => Promise<void>;
-    /** Fires before a slash command runs. Observer only. */
-    "command.execute.before"?: (input: CommandExecuteBeforeInput, output: Record<string, unknown>) => Promise<void>;
     "permission.ask"?: (input: Permission, output: {
         status: "ask" | "deny" | "allow";
     }) => Promise<void>;
@@ -68,7 +70,6 @@ export interface Hooks {
         tool: string;
         sessionID: string;
         callID: string;
-        args: unknown;
     }, output: {
         title: string;
         output: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ory/opencode",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Ory plugin for OpenCode: scaffolding skills, a local Ory instance, and authentication, authorization, and audit for every tool call",
   "license": "Apache-2.0",
   "homepage": "https://ory.com",
@@ -54,7 +54,6 @@
     }
   },
   "bin": {
-    "opencode": "dist/cli/main.js",
     "ory-opencode": "dist/cli/main.js",
     "ory-opencode-setup": "dist/cli/setup.js"
   },
@@ -64,10 +63,10 @@
     "!dist/**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@ory/argus": "0.3.0"
+    "@ory/argus": "0.4.0"
   },
   "engines": {
-    "node": ">=24"
+    "node": ">=22"
   },
   "scripts": {
     "build": "tsc",