@duypham93/openkit 0.2.1 → 0.2.2

package/.opencode/README.md

@@ -8,7 +8,7 @@ For phase-1 navigation, treat this file as a local runtime boundary note, not as
 
 What lives here:
 
-- `.opencode/opencode.json`: the current repository-local runtime manifest
+- `.opencode/opencode.json`: the current repository-local OpenCode project config
 - `.opencode/workflow-state.json`: the active compatibility mirror
 - `.opencode/work-items/`: per-item backing store
 - `.opencode/workflow-state.js`: lower-level runtime utility CLI

package/.opencode/opencode.json

@@ -1,93 +1,7 @@
 {
-  "model": "anthropic/claude-sonnet-4-5",
-  "agents_dir": "agents",
-  "skills_dir": "skills",
-  "commands_dir": "commands",
-  "kit": {
-    "name": "OpenKit AI Software Factory",
-    "version": "0.1.0",
-    "entryAgent": "MasterOrchestrator",
-    "productSurface": {
-      "current": "repository-local-openkit-runtime",
-      "emerging": "global-openkit-install",
-      "installReadiness": "emerging",
-      "migrationState": "staged-not-complete",
-      "targetWrapperEntrypoint": "opencode.json",
-      "repositoryInternal": [
-        ".opencode/opencode.json",
-        ".opencode/workflow-state.json",
-        ".opencode/work-items/",
-        ".opencode/workflow-state.js",
-        "hooks/",
-        "agents/",
-        "skills/",
-        "commands/",
-        "context/",
-        "docs/"
-      ],
-      "wrapperFacingMetadata": [
-        "registry.json",
-        ".opencode/install-manifest.json"
-      ],
-      "notes": "This file remains the live checked-in runtime manifest for the repository authoring and compatibility surface while the preferred end-user install path stays global."
-    },
-    "registry": {
-      "path": "registry.json",
-      "schema": "openkit/component-registry@1"
-    },
-    "installManifest": {
-      "path": ".opencode/install-manifest.json",
-      "schema": "openkit/install-manifest@1"
-    },
-    "activeProfile": "openkit-core",
-    "installationMode": "additive-non-destructive",
-    "runtimeSurface": "repository-internal",
-    "wrapperMetadataSurface": "staged-additive"
-  },
-  "hooks": {
-    "config": "hooks/hooks.json"
-  },
-  "state": {
-    "file": ".opencode/workflow-state.json"
-  },
-  "agents": {
-    "root": "agents",
-    "primary": "agents/master-orchestrator.md",
-    "teamRoles": [
-      "agents/master-orchestrator.md",
-      "agents/pm-agent.md",
-      "agents/ba-agent.md",
-      "agents/architect-agent.md",
-      "agents/tech-lead-agent.md",
-      "agents/fullstack-agent.md",
-      "agents/qa-agent.md"
-    ],
-    "helpers": [
-      "agents/code-reviewer.md"
-    ]
-  },
-  "skills": {
-    "root": "skills"
-  },
-  "commands": {
-    "root": "commands",
-    "available": [
-      "commands/task.md",
-      "commands/quick-task.md",
-      "commands/migrate.md",
-      "commands/delivery.md",
-      "commands/brainstorm.md",
-      "commands/write-plan.md",
-      "commands/execute-plan.md"
-    ]
-  },
-  "artifacts": {
-    "tasks": "docs/tasks",
-    "briefs": "docs/briefs",
-    "specs": "docs/specs",
-    "architecture": "docs/architecture",
-    "plans": "docs/plans",
-    "qa": "docs/qa",
-    "adr": "docs/adr"
-  }
+  "$schema": "https://opencode.ai/config.json",
+  "instructions": [
+    "AGENTS.md",
+    "context/navigation.md"
+  ]
 }

package/AGENTS.md

@@ -41,7 +41,7 @@ Current repository facts:
 - `context/core/workflow.md` is the canonical workflow-semantics document for lane behavior, stages, escalation, approvals, and quick-lane artifact expectations
 - Historical planning and example docs have been intentionally pruned from the working tree; prefer current runtime docs and git history when older rationale is needed
 - `npm install -g @duypham93/openkit`, `openkit run`, `openkit doctor`, `openkit upgrade`, and `openkit uninstall` now define the preferred operator path for the global OpenKit kit
-- `.opencode/opencode.json` is present as the runtime manifest for this kit
+- `.opencode/opencode.json` is present as the repository-local OpenCode config for this kit
 - `.opencode/workflow-state.json` is present as the active external compatibility mirror for the active work item
 - `.opencode/work-items/` is present as the internal per-item workflow backing store for managed runtime state
 - `.opencode/workflow-state.js` now supports the live mode-aware workflow state contract
@@ -71,7 +71,7 @@ Approved follow-on direction from FEATURE-002 also includes:
 The next product-layer direction is the global OpenKit kit layered over OpenCode while preserving the checked-in authoring and compatibility runtime. In this repository today:
 
 - the global install path is implemented for the `openkit` CLI and stores the managed kit inside the OpenCode home directory, materializing it automatically on first `openkit run`
-- `.opencode/opencode.json` remains the checked-in authoring and compatibility runtime manifest
+- `.opencode/opencode.json` remains the checked-in repository-local OpenCode config for the authoring surface
 - `registry.json` remains checked-in local metadata describing repository surfaces and profiles
 - `.opencode/install-manifest.json` remains additive local install metadata for this repository
 - project artifacts stay local to the target repository, while kit installation and workspace state are managed through the global OpenKit path
@@ -130,7 +130,7 @@ Current state:
 - No single canonical package manager or language toolchain has been established for future generated applications
 - Node.js is a documented runtime dependency for the workflow-state utility only, not for future application code by default
 - The workflow-state CLI exists and is aligned with the live stage and approval model documented in this repository
-- The repository-local runtime still boots from `.opencode/opencode.json`; do not claim that a root `opencode.json` entrypoint already exists unless the file is added
+- The repository-local OpenCode config still lives at `.opencode/opencode.json`; do not claim that a root `opencode.json` entrypoint already exists unless the file is added
 
 Rules for agents:
 
@@ -153,8 +153,8 @@ These are illustrative patterns, not current repository commands.
 
 The operating system layer is file-backed and should stay explicit.
 
-- Runtime manifest: `.opencode/opencode.json`
-- Runtime manifest for the checked-in authoring surface: `.opencode/opencode.json`
+- Repository-local OpenCode config: `.opencode/opencode.json`
+- Repository-local OpenCode config for the checked-in authoring surface: `.opencode/opencode.json`
 - Active compatibility mirror: `.opencode/workflow-state.json`
 - Per-item backing store: `.opencode/work-items/`
 - Workflow-state CLI: `node .opencode/workflow-state.js ...`

package/README.md

@@ -80,7 +80,7 @@ The preferred product path is now the globally installed OpenKit kit. This repos
 Preferred global path:
 
 1. Run `npm install -g @duypham93/openkit` to install the CLI once on the machine.
-2. Run `openkit run <args>` to launch `opencode --profile openkit`; on first run, OpenKit materializes the global kit into the OpenCode home directory automatically.
+2. Run `openkit run <args>` to launch OpenCode with the OpenKit-managed kit directory injected as the active config for the current project; on first run, OpenKit materializes the global kit into the OpenCode home directory automatically.
 3. Run `openkit doctor` to confirm the global install and current workspace are healthy.
 4. Run `openkit upgrade` to refresh the installed global kit when a newer package version is available.
 5. Run `openkit uninstall [--remove-workspaces]` when you need to remove the global kit and optionally clear workspace state.
@@ -100,7 +100,7 @@ On first run, `openkit run` materializes the managed global kit into the OpenCod
 
 Current boundary:
 
-- `.opencode/opencode.json` is still the live runtime manifest in this checked-in repository runtime.
+- `.opencode/opencode.json` is the repository-local OpenCode config for this checked-in authoring surface.
 - `.opencode/workflow-state.json`, `.opencode/work-items/`, `.opencode/workflow-state.js`, `hooks/`, `agents/`, `skills/`, `commands/`, `context/`, and `docs/` remain repository-internal runtime or support surfaces.
 - `registry.json` is local metadata describing repository surfaces and the global-kit compatibility contract.
 - `.opencode/install-manifest.json` records the local installed profile for this repository and remains additive metadata rather than a destructive installer.
@@ -196,7 +196,7 @@ node .opencode/workflow-state.js show
 node --test ".opencode/tests/*.test.js"
 ```
 
-The default manifest currently carries a starter model value inherited from the existing repo setup. Treat that as a default, not as a statement that the kit only supports one model.
+The repository-local OpenCode config stays intentionally minimal and should not be treated as proof that the kit only supports one model or one launcher shape.
 
 ## Registry Metadata
 
@@ -204,7 +204,7 @@ OpenKit includes a small checked-in metadata layer for local inspection and for
 
 - `registry.json` describes the component categories that exist in this repository today, including agents, skills, commands, artifact directories, runtime files, hooks, and anchor docs, while also declaring which metadata participates in the global-kit compatibility contract.
 - `.opencode/install-manifest.json` records which local profile is active for this repository, points back to `registry.json`, and documents the current install stance as additive and non-destructive.
-- `.opencode/opencode.json` remains the live repository-local manifest while also exposing pointers to both metadata files plus the active profile name and current wrapper-readiness status.
+- `.opencode/opencode.json` remains the repository-local OpenCode config, while `registry.json` and `.opencode/install-manifest.json` carry the additive OpenKit metadata for this repository.
 
 This metadata is local repository state, not a remote installer. It does not fetch, download, replace, or update components from elsewhere.
 
@@ -225,7 +225,7 @@ The install manifest is intended to make future runtime commands and diagnostics
 The current workflow for profile metadata is local and inspectable:
 
 1. `registry.json` defines the available component categories, checked-in components, and named profiles.
-2. `.opencode/opencode.json` points to the registry and install manifest, declares the repository's active profile, and remains the live manifest for the current repository-local runtime.
+2. `.opencode/opencode.json` remains the repository-local OpenCode config for this worktree.
 3. `.opencode/install-manifest.json` records which profile is installed for this working tree, which broad component categories are present, and that installation remains additive rather than destructive.
 4. `node .opencode/workflow-state.js profiles` lists the named profiles from the registry.
 5. `node .opencode/workflow-state.js show-profile <name>` shows whether a profile is the repository default and which component categories it includes.

package/context/core/project-config.md

@@ -23,7 +23,7 @@ For the canonical workflow contract, including lane semantics, stage order, esca
 - Session hook configuration lives in `hooks/hooks.json`.
 - The session-start hook script lives in `hooks/session-start`.
 - The global OpenKit CLI entrypoint lives at `bin/openkit.js`.
-- The OpenCode kit manifest lives in `.opencode/opencode.json`.
+- The repository-local OpenCode project config lives in `.opencode/opencode.json`.
 - The global install writes its own profile manifest under the OpenCode home directory.
 - The active compatibility mirror lives in `.opencode/workflow-state.json`.
 - The managed work-item backing store lives in `.opencode/work-items/`.
@@ -82,7 +82,7 @@ Current workflow-state behavior:
 - `openkit run` materializes the globally managed kit into the OpenCode home directory on first use when needed.
 - `openkit doctor` checks the global install and the current workspace bootstrap.
 - `openkit install-global` remains available as a manual or compatibility setup path.
-- `openkit run` launches OpenCode with the globally installed `openkit` profile and workspace-specific environment.
+- `openkit run` launches OpenCode with the OpenKit-managed config directory and workspace-specific environment.
 - `openkit upgrade` refreshes the global managed kit bundle in place.
 - `openkit uninstall` removes the global managed kit and profile, with optional workspace cleanup.
 - `status`, `doctor`, `version`, `profiles`, `show-profile`, and `sync-install-manifest` are part of the current runtime inspection surface.

package/docs/maintainer/README.md

@@ -31,7 +31,7 @@ Use it to find canonical repository docs and upkeep surfaces quickly. Do not tre
 
 ## Repository Internals To Keep Honest
 
-- `.opencode/opencode.json` remains the checked-in authoring and compatibility runtime manifest even though the preferred end-user install path is now global
+- `.opencode/opencode.json` remains the checked-in repository-local OpenCode config even though the preferred end-user install path is now global
 - `.opencode/workflow-state.json` remains the active compatibility mirror for the active work item
 - `.opencode/work-items/` remains the per-item backing store for managed runtime state
 - `registry.json` and `.opencode/install-manifest.json` remain additive local metadata, not destructive install machinery

package/docs/operator/README.md

@@ -46,5 +46,5 @@ Use it to find the right live docs quickly. Do not treat it as a canonical repla
 
 - The preferred user path is the global OpenKit install in the OpenCode home directory
 - `openkit install-global` remains available as a manual or compatibility setup command, but it is no longer the preferred onboarding step
-- `.opencode/opencode.json` remains the checked-in authoring and compatibility runtime manifest in this repository
+- `.opencode/opencode.json` remains the checked-in repository-local OpenCode config in this repository
 - `Quick Task+` remains the current semantics of the `quick` lane, not a third live mode

package/docs/plans/2026-03-23-openkit-global-install-runtime.md

@@ -35,7 +35,7 @@ approval_gate: tech_lead_to_fullstack
   - `npx @duypham93/openkit@latest install-global`
   - `npx @duypham93/openkit@latest doctor`
 - Day-to-day usage in any repo:
-  - `opencode --profile openkit`
+  - `openkit run`
 - Existing repo should not need checked-in `agents/`, `skills/`, `commands/`, or `.opencode/` surfaces just to use the kit.
 
 ## Proposed Runtime Shape
@@ -105,7 +105,7 @@ approval_gate: tech_lead_to_fullstack
 
 ### [ ] Task 7: Register and validate the OpenCode profile integration
 - Files: global profile config templates, launcher wiring, doctor/profile checks
-- Goal: make `opencode --profile openkit` a supported path after global installation.
+- Goal: make `openkit run` the supported path after global installation, with OpenCode launched through managed config injection rather than a profile flag.
 - Validation: profile registration can be inspected; doctor confirms registration; run-path smoke tests succeed.
 - Notes:
   - do not assume OpenCode plugin APIs that are not proven; verify the real profile/config surface during implementation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duypham93/openkit",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "files": [
     ".opencode/",

package/src/global/launcher.js

@@ -19,10 +19,10 @@ export function launchGlobalOpenKit(args = [], { projectRoot = process.cwd(), en
     OPENKIT_WORKFLOW_STATE: paths.workflowStatePath,
     OPENKIT_KIT_ROOT: paths.kitRoot,
     OPENKIT_HOME: paths.openCodeHome,
-    OPENCODE_CONFIG_DIR: paths.profilesRoot,
+    OPENCODE_CONFIG_DIR: paths.kitRoot,
   };
 
-  const result = spawn('opencode', ['--profile', 'openkit', ...args], {
+  const result = spawn('opencode', [paths.projectRoot, ...args], {
     cwd: paths.projectRoot,
     env: launcherEnv,
     encoding: 'utf8',

package/src/global/materialize.js

@@ -58,23 +58,10 @@ function listManagedFiles(kitRoot) {
   return files.sort();
 }
 
-function createProfileManifest(kitRoot, profileHooksPath) {
-  const kitManifestPath = path.join(kitRoot, '.opencode', 'opencode.json');
-  const kitManifest = JSON.parse(fs.readFileSync(kitManifestPath, 'utf8'));
-
+function createOpenCodeConfig() {
   return {
-    model: kitManifest.model,
-    agents_dir: path.join(kitRoot, 'agents'),
-    skills_dir: path.join(kitRoot, 'skills'),
-    commands_dir: path.join(kitRoot, 'commands'),
-    hooks: {
-      config: profileHooksPath,
-    },
-    openkit: {
-      profile: 'openkit',
-      kit_root: kitRoot,
-      manifest: kitManifestPath,
-    },
+    $schema: 'https://opencode.ai/config.json',
+    default_agent: 'master-orchestrator',
   };
 }
 
@@ -92,8 +79,11 @@ export function materializeGlobalInstall({ env = process.env, kitVersion = '0.1.
   }
 
   const installState = createGlobalInstallState({ kitVersion, profile: 'openkit' });
+  const openCodeConfig = createOpenCodeConfig();
+
+  writeJson(paths.kitConfigPath, openCodeConfig);
   writeJson(paths.installStatePath, installState);
-  writeJson(paths.profileManifestPath, createProfileManifest(paths.kitRoot, paths.profileHooksPath));
+  writeJson(paths.profileManifestPath, openCodeConfig);
   writeJson(paths.profileHooksPath, {
     hooks: {
       SessionStart: [

package/src/global/paths.js

@@ -52,6 +52,7 @@ export function getGlobalPaths(options = {}) {
   return {
     openCodeHome,
     kitRoot,
+    kitConfigPath: path.join(kitRoot, 'opencode.json'),
     installStatePath: path.join(kitRoot, 'install-state.json'),
     managedFilesPath: path.join(kitRoot, 'managed-files.json'),
     profilesRoot,

package/src/runtime/opencode-layering.js

@@ -1,13 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-export const CONFIG_DIR_RELATIVE_PATHS = [
-  'agents_dir',
-  'commands_dir',
-  'skills_dir',
-  'hooks.config',
-];
-
 function isPlainObject(value) {
   return value !== null && typeof value === 'object' && !Array.isArray(value);
 }
@@ -51,11 +44,6 @@ function parseJsonContent(content, sourceLabel) {
   }
 }
 
-function shouldResolveRelativeToConfigDir(keyPath) {
-  const joinedPath = keyPath.filter((segment) => typeof segment === 'string').join('.');
-  return CONFIG_DIR_RELATIVE_PATHS.includes(joinedPath);
-}
-
 function normalizeConfigPaths(value, configDir, keyPath = []) {
   if (Array.isArray(value)) {
     return value.map((entry, index) => normalizeConfigPaths(entry, configDir, [...keyPath, index]));
@@ -74,11 +62,14 @@ function normalizeConfigPaths(value, configDir, keyPath = []) {
     return value;
   }
 
-  if (!shouldResolveRelativeToConfigDir(keyPath)) {
-    return value;
+  const parentKey = keyPath.at(-2);
+  const currentKey = keyPath.at(-1);
+
+  if (currentKey === 'instructions' || parentKey === 'instructions') {
+    return path.resolve(configDir, value);
   }
 
-  return path.resolve(configDir, value);
+  return value;
 }
 
 export function buildOpenCodeLayering({ projectRoot, env = process.env }) {

package/tests/cli/openkit-cli.test.js

@@ -90,7 +90,8 @@ test('openkit install-global materializes global kit and profile files', () => {
   assert.equal(fs.existsSync(path.join(kitRoot, '.opencode', 'workflow-state.js')), true);
   assert.equal(fs.existsSync(path.join(kitRoot, 'commands', 'migrate.md')), true);
   assert.equal(fs.existsSync(path.join(profileRoot, 'opencode.json')), true);
-  assert.equal(readJson(path.join(profileRoot, 'opencode.json')).openkit.profile, 'openkit');
+  assert.equal(readJson(path.join(profileRoot, 'opencode.json')).default_agent, 'master-orchestrator');
+  assert.equal(fs.existsSync(path.join(kitRoot, 'opencode.json')), true);
 });
 
 test('openkit init and install remain compatibility aliases for install-global', () => {
@@ -215,10 +216,10 @@ process.stdout.write('mock opencode launched\\n');
   assert.match(result.stdout, /mock opencode launched/);
 
   const invocation = readJson(logPath);
-  assert.deepEqual(invocation.argv, ['--profile', 'openkit', '--mode', 'quick']);
+  assert.deepEqual(invocation.argv, [projectRoot, '--mode', 'quick']);
   assert.equal(fs.realpathSync(invocation.cwd), fs.realpathSync(projectRoot));
   assert.equal(fs.realpathSync(invocation.projectRoot), fs.realpathSync(projectRoot));
-  assert.equal(invocation.configDir, path.join(tempHome, 'profiles', 'openkit'));
+  assert.equal(invocation.configDir, path.join(tempHome, 'kits', 'openkit'));
   assert.match(invocation.workflowState, /workspaces\/.*\/openkit\/\.opencode\/workflow-state\.json$/);
   assert.equal(invocation.kitRoot, path.join(tempHome, 'kits', 'openkit'));
 });
@@ -291,7 +292,7 @@ process.stdout.write('mock opencode launched after auto-install\\n');
   assert.equal(fs.existsSync(path.join(tempHome, 'kits', 'openkit', '.opencode', 'workflow-state.js')), true);
 
   const invocation = readJson(logPath);
-  assert.deepEqual(invocation.argv, ['--profile', 'openkit']);
+  assert.deepEqual(invocation.argv, [projectRoot]);
   assert.equal(invocation.kitRoot, path.join(tempHome, 'kits', 'openkit'));
 });
 

package/tests/runtime/launcher.test.js

@@ -5,7 +5,6 @@ import os from 'node:os';
 import path from 'node:path';
 
 import {
-  CONFIG_DIR_RELATIVE_PATHS,
   buildOpenCodeLayering,
 } from '../../src/runtime/opencode-layering.js';
 import { launchManagedOpenCode } from '../../src/runtime/launcher.js';
@@ -23,8 +22,8 @@ test('buildOpenCodeLayering uses the managed config dir when no baseline config
   const projectRoot = makeTempDir();
 
   writeJson(path.join(projectRoot, '.opencode', 'opencode.json'), {
-    model: 'managed-model',
-    commands_dir: 'commands',
+    $schema: 'https://opencode.ai/config.json',
+    default_agent: 'master-orchestrator',
   });
 
   const result = buildOpenCodeLayering({ projectRoot, env: {} });
@@ -41,19 +40,15 @@ test('buildOpenCodeLayering preserves baseline config while layering managed con
   const baselineConfigDir = path.join(projectRoot, 'user-config');
 
   writeJson(path.join(baselineConfigDir, 'opencode.json'), {
-    commands_dir: 'user-commands',
-    hooks: {
-      config: 'user-hooks/hooks.json',
-    },
+    model: 'baseline-model',
+    instructions: ['./docs/global-instructions.md'],
+    plugin: ['existing-plugin'],
   });
 
   writeJson(path.join(projectRoot, '.opencode', 'opencode.json'), {
-    model: 'managed-model',
-    agents_dir: 'agents',
-    commands_dir: 'commands',
-    hooks: {
-      config: 'hooks/hooks.json',
-    },
+    $schema: 'https://opencode.ai/config.json',
+    default_agent: 'master-orchestrator',
+    instructions: ['AGENTS.md', 'context/navigation.md'],
   });
 
   const result = buildOpenCodeLayering({
@@ -61,12 +56,8 @@ test('buildOpenCodeLayering preserves baseline config while layering managed con
     env: {
       OPENCODE_CONFIG_DIR: baselineConfigDir,
       OPENCODE_CONFIG_CONTENT: JSON.stringify({
-        model: 'baseline-model',
         customSetting: true,
-        skills_dir: 'user-skills',
-        hooks: {
-          enabled: true,
-        },
+        share: 'manual',
       }),
     },
   });
@@ -75,29 +66,24 @@ test('buildOpenCodeLayering preserves baseline config while layering managed con
 
   const layeredContent = JSON.parse(result.env.OPENCODE_CONFIG_CONTENT);
   assert.equal(layeredContent.customSetting, true);
-  assert.equal(layeredContent.model, 'managed-model');
-  assert.equal(layeredContent.commands_dir, 'commands');
-  assert.equal(layeredContent.agents_dir, 'agents');
-  assert.equal(layeredContent.skills_dir, path.join(baselineConfigDir, 'user-skills'));
-  assert.deepEqual(layeredContent.hooks, {
-    enabled: true,
-    config: 'hooks/hooks.json',
-  });
+  assert.equal(layeredContent.share, 'manual');
+  assert.equal(layeredContent.model, 'baseline-model');
+  assert.equal(layeredContent.default_agent, 'master-orchestrator');
+  assert.deepEqual(layeredContent.plugin, ['existing-plugin']);
+  assert.deepEqual(layeredContent.instructions, ['AGENTS.md', 'context/navigation.md']);
   assert.equal(result.baseline.configDir, baselineConfigDir);
-  assert.equal(result.baseline.config.commands_dir, path.join(baselineConfigDir, 'user-commands'));
-  assert.equal(
-    result.baseline.config.hooks.config,
-    path.join(baselineConfigDir, 'user-hooks', 'hooks.json')
-  );
   assert.equal(result.baseline.config.model, 'baseline-model');
+  assert.deepEqual(result.baseline.config.instructions, [
+    path.join(baselineConfigDir, 'docs/global-instructions.md'),
+  ]);
 });
 
-test('buildOpenCodeLayering only normalizes the documented config-dir-relative keys', () => {
+test('buildOpenCodeLayering only resolves instruction paths relative to the config dir', () => {
   const projectRoot = makeTempDir();
   const baselineConfigDir = path.join(projectRoot, 'user-config');
 
   writeJson(path.join(projectRoot, '.opencode', 'opencode.json'), {
-    model: 'managed-model',
+    $schema: 'https://opencode.ai/config.json',
   });
 
   const result = buildOpenCodeLayering({
@@ -105,23 +91,13 @@ test('buildOpenCodeLayering only normalizes the documented config-dir-relative k
     env: {
       OPENCODE_CONFIG_DIR: baselineConfigDir,
       OPENCODE_CONFIG_CONTENT: JSON.stringify({
-        model: 'baseline-model',
-        agents_dir: 'agents',
-        skills_dir: 'skills',
-        commands_dir: 'commands',
-        hooks: {
-          config: 'hooks/hooks.json',
-        },
+        instructions: ['docs/local.md'],
         otherRelativePath: 'notes/local.md',
       }),
     },
   });
 
-  assert.deepEqual(CONFIG_DIR_RELATIVE_PATHS, ['agents_dir', 'commands_dir', 'skills_dir', 'hooks.config']);
-  assert.equal(result.baseline.config.agents_dir, path.join(baselineConfigDir, 'agents'));
-  assert.equal(result.baseline.config.skills_dir, path.join(baselineConfigDir, 'skills'));
-  assert.equal(result.baseline.config.commands_dir, path.join(baselineConfigDir, 'commands'));
-  assert.equal(result.baseline.config.hooks.config, path.join(baselineConfigDir, 'hooks', 'hooks.json'));
+  assert.deepEqual(result.baseline.config.instructions, [path.join(baselineConfigDir, 'docs/local.md')]);
   assert.equal(result.baseline.config.otherRelativePath, 'notes/local.md');
 });
 
@@ -129,7 +105,7 @@ test('launchManagedOpenCode reports a clear error when opencode is unavailable',
   const projectRoot = makeTempDir();
 
   writeJson(path.join(projectRoot, '.opencode', 'opencode.json'), {
-    model: 'managed-model',
+    $schema: 'https://opencode.ai/config.json',
   });
 
   const result = launchManagedOpenCode([], {
@@ -153,7 +129,7 @@ test('launchManagedOpenCode uses interactive stdio by default for the real launc
   let spawnCall = null;
 
   writeJson(path.join(projectRoot, '.opencode', 'opencode.json'), {
-    model: 'managed-model',
+    $schema: 'https://opencode.ai/config.json',
   });
 
   const result = launchManagedOpenCode(['status'], {
@@ -178,13 +154,14 @@ test('launchManagedOpenCode forwards layered config to opencode on the supported
   const baselineConfigDir = path.join(projectRoot, 'user-config');
 
   writeJson(path.join(baselineConfigDir, 'opencode.json'), {
-    skills_dir: 'baseline-skills',
+    model: 'baseline-model',
+    instructions: ['./docs/global-instructions.md'],
   });
 
   writeJson(path.join(projectRoot, '.opencode', 'opencode.json'), {
-    model: 'managed-model',
-    commands_dir: 'commands',
-    agents_dir: 'agents',
+    $schema: 'https://opencode.ai/config.json',
+    default_agent: 'master-orchestrator',
+    instructions: ['AGENTS.md', 'context/navigation.md'],
   });
 
   fs.mkdirSync(fakeBinDir, { recursive: true });
@@ -223,8 +200,7 @@ test('launchManagedOpenCode forwards layered config to opencode on the supported
 
   const layeredContent = JSON.parse(payload.configContent);
   assert.equal(layeredContent.customSetting, true);
-  assert.equal(layeredContent.model, 'managed-model');
-  assert.equal(layeredContent.commands_dir, 'commands');
-  assert.equal(layeredContent.agents_dir, 'agents');
-  assert.equal(layeredContent.skills_dir, path.join(baselineConfigDir, 'baseline-skills'));
+  assert.equal(layeredContent.model, 'baseline-model');
+  assert.equal(layeredContent.default_agent, 'master-orchestrator');
+  assert.deepEqual(layeredContent.instructions, ['AGENTS.md', 'context/navigation.md']);
 });

package/.opencode/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}