@vibe-forge/adapter-opencode 0.1.3 → 0.1.4

package/AGENTS.md

@@ -1,13 +1,116 @@
-# OpenCode Adapter 目录说明
+# OpenCode Adapter
 
-- `src/runtime/common/`：纯配置与参数映射层，只做 prompt、tools、permissions、model、mcp、session record 转换，不承载进程控制
-- `src/runtime/session/`：运行时层，负责 child env、skill bridge、direct/stream 会话执行与错误传播
-- `src/runtime/common.ts` / `src/runtime/session.ts`：稳定入口文件，只做 re-export 或轻量路由
-- `__tests__/runtime-*.spec.ts`：按能力拆分测试；公共 mock 和文件系统 helper 放在 `__tests__/runtime-test-helpers.ts`
+## 文档入口
 
-约束：
+- `docs/HOOKS.md`
+  - 通用 hooks 方案、事件矩阵、`.ai/.mock` 托管配置布局
+- `docs/HOOKS-REFERENCE.md`
+  - 真实 CLI 验证命令、本次改造经验、共用实现入口
+- `apps/cli/src/AGENTS.md`
+  - CLI hook bridge 与 `call-hook.js` 入口
+
+## 目录职责
+
+- `src/runtime/common/`
+  - 纯配置与参数映射层，只做 prompt、tools、permissions、model、mcp、session record 转换
+  - 不承载进程控制
+- `src/runtime/session/`
+  - 运行时层，负责 child env、skill bridge、direct/stream 会话执行与错误传播
+- `src/runtime/native-hooks.ts`
+  - 把 `.ai/.mock/.config/opencode/` 写成托管 config/plugin
+  - 把真实用户配置镜像到 mock config dir
+- `src/runtime/common.ts` / `src/runtime/session.ts`
+  - 稳定入口文件，只做 re-export 或轻量路由
+- `__tests__/runtime-*.spec.ts`
+  - 按能力拆分测试；公共 mock 和文件系统 helper 放在 `__tests__/runtime-test-helpers.ts`
+
+## Hooks 维护入口
+
+- `src/runtime/native-hooks.ts`
+  - 负责 `.ai/.mock/.config/opencode/plugins/vibe-forge-hooks.js`
+- `src/runtime/session/skill-config.ts`
+  - base config、plugins、skills 镜像到 session config dir
+- `src/runtime/session/child-env.ts`
+  - session 级 `opencode.json`、provider config、child env
+- `src/runtime/session/stream.ts`
+  - `opencode run --format json` 事件流消费与最终文本提取
+- `src/runtime/common/tools.ts`
+  - `opencode run` 参数构造
+- `packages/core/src/hooks/native.ts`
+- `packages/core/src/hooks/bridge.ts`
+- `packages/core/src/controllers/task/run.ts`
+
+维护时保持这条边界：
+
+- OpenCode adapter 负责 plugin/config dir/session env
+- CLI 或 upstream 事件流负责把 tool 事件送出来
+- core 负责统一 hook runtime 和去重
+
+## 真实 CLI 验证
+
+优先尝试包装层：
+
+仓库根快捷命令：
+
+```bash
+pnpm test:e2e:adapters
+pnpm tools adapter-e2e run opencode
+pnpm tools adapter-e2e test opencode-read-once --update
+```
+
+这条命令会先试 `vf --adapter opencode`，超时后自动 fallback 到 upstream `opencode run --format json`。
+它默认也会启动本地 mock LLM server，并通过仓库根 `.ai.config.json` 里的 `hook-smoke-mock` model service 驱动 OpenCode。adapter E2E 的共享 harness 在 `scripts/adapter-e2e/`，scripts CLI 入口在 `scripts/cli.ts`。
+case 定义、spec 和期望快照统一维护在 `scripts/__tests__/adapter-e2e/`。
+
+```bash
+__VF_PROJECT_AI_CTX_ID__='hooks-smoke-opencode' \
+node apps/cli/cli.js \
+  --adapter opencode \
+  --model hook-smoke-mock,opencode-hooks \
+  --print \
+  --no-inject-default-system-prompt \
+  --exclude-mcp-server ChromeDevtools \
+  --session-id '<uuid>' \
+  "Use the read tool exactly once on README.md, then reply with exactly E2E_OPENCODE and nothing else."
+```
+
+如果包装层没有自然结束，直接复用 session config dir 调 upstream：
+
+```bash
+HOME="$PWD/.ai/.mock" \
+OPENCODE_CONFIG_DIR="$PWD/.ai/.mock/.opencode-adapter/<sessionId>/config-dir" \
+__VF_VIBE_FORGE_OPENCODE_HOOKS_ACTIVE__='1' \
+__VF_PROJECT_WORKSPACE_FOLDER__="$PWD" \
+__VF_PROJECT_NODE_PATH__="$(which node)" \
+__VF_PROJECT_REAL_HOME__="$HOME" \
+__VF_PROJECT_CLI_PACKAGE_DIR__="$PWD/apps/cli" \
+__VF_PROJECT_PACKAGE_DIR__="$PWD/apps/cli" \
+__VF_OPENCODE_TASK_SESSION_ID__='<sessionId>' \
+__VF_OPENCODE_HOOK_RUNTIME__='cli' \
+packages/adapters/opencode/node_modules/.bin/opencode run \
+  --print-logs \
+  --format json \
+  --model opencode/gpt-5-nano \
+  --dir "$PWD" \
+  "Use the read tool exactly once on README.md, then reply with exactly E2E_OPENCODE and nothing else."
+```
+
+通过标准：
+
+- 终端输出 `E2E_OPENCODE`
+- `.ai/logs/<ctxId>/<sessionId>.log.md` 出现 `SessionStart` / `PreToolUse` / `PostToolUse` / `Stop`
+- `.ai/.mock/.config/opencode/opencode.json` 与 `plugins/vibe-forge-hooks.js` 仍落在 mock config dir
+
+OpenCode 这次改造最关键的经验：
+
+- 优先把 `opencode run --format json` 当成稳定基线，不要再依赖最终 stdout 文本猜事件
+- session config 不要只靠 `OPENCODE_CONFIG_CONTENT`，优先写真实 `opencode.json`
+- 包装层与 upstream 直跑当前仍可能有行为差异，文档里必须写清楚
+
+## 约束
 
 - 单文件保持在 200 行以内；接近 160 行时优先继续拆，而不是继续堆分支
 - 新增逻辑先判断属于“映射层”还是“运行时层”，不要再把两类职责混回一个文件
 - 需要 mock `child_process` 的测试，mock 定义放在各自 spec 顶部；helper 不直接持有全局 mock 状态
 - 修改 adapter 行为时，至少补一条对应的 runtime 或 common 回归测试
+- OpenCode 的 native hooks 通过 `.ai/.mock/.config/opencode/plugins/vibe-forge-hooks.js` 接入，不再直接依赖 stdout 文本桥接

package/__tests__/native-hooks.spec.ts

@@ -0,0 +1,73 @@
+import { lstat, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { ensureOpenCodeNativeHooksInstalled } from '../src/runtime/native-hooks'
+
+const tempDirs: string[] = []
+
+const createTempDir = async (prefix: string) => {
+  const dir = await mkdtemp(join(tmpdir(), prefix))
+  tempDirs.push(dir)
+  return dir
+}
+
+const writeDocument = async (filePath: string, content: string) => {
+  await mkdir(dirname(filePath), { recursive: true })
+  await writeFile(filePath, content, { encoding: 'utf8', flag: 'w' })
+}
+
+afterEach(async () => {
+  delete process.env.__VF_PROJECT_REAL_HOME__
+  await Promise.all(tempDirs.splice(0).map(dir => rm(dir, { recursive: true, force: true })))
+})
+
+describe('ensureOpenCodeNativeHooksInstalled', () => {
+  it('creates an isolated mock config dir and installs the managed plugin there', async () => {
+    const workspace = await createTempDir('opencode-hooks-workspace-')
+    const realHome = await createTempDir('opencode-hooks-home-')
+    const mockHome = join(workspace, '.ai', '.mock')
+
+    await writeDocument(join(realHome, '.config', 'opencode', 'opencode.json'), JSON.stringify({
+      $schema: 'https://opencode.ai/config.json'
+    }))
+    await writeDocument(join(realHome, '.config', 'opencode', 'commands', 'review.md'), '# review')
+    process.env.__VF_PROJECT_REAL_HOME__ = realHome
+
+    const ctx = {
+      cwd: workspace,
+      env: {
+        HOME: mockHome
+      },
+      logger: {
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+        debug: vi.fn()
+      },
+      assets: {
+        hookPlugins: [
+          {
+            id: 'hookPlugin:project:logger'
+          }
+        ]
+      }
+    } as any
+
+    const installed = await ensureOpenCodeNativeHooksInstalled(ctx)
+    const managedConfigDir = join(mockHome, '.config', 'opencode')
+    const pluginPath = join(managedConfigDir, 'plugins', 'vibe-forge-hooks.js')
+
+    expect(installed).toBe(true)
+    expect(ctx.env.__VF_PROJECT_AI_OPENCODE_NATIVE_HOOKS_AVAILABLE__).toBe('1')
+    expect(ctx.env.OPENCODE_CONFIG_DIR).toBe(managedConfigDir)
+    expect((await lstat(managedConfigDir)).isDirectory()).toBe(true)
+    expect((await lstat(join(managedConfigDir, 'commands'))).isSymbolicLink()).toBe(true)
+    expect(await readFile(pluginPath, 'utf8')).toContain('tool.execute.before')
+    expect(JSON.parse(await readFile(join(managedConfigDir, 'opencode.json'), 'utf8'))).toMatchObject({
+      $schema: 'https://opencode.ai/config.json'
+    })
+  })
+})

package/__tests__/session-runtime-config.spec.ts

@@ -1,4 +1,4 @@
-import { lstat } from 'node:fs/promises'
+import { lstat, readFile } from 'node:fs/promises'
 import { execFile, spawn } from 'node:child_process'
 import { join } from 'node:path'
 
@@ -87,7 +87,10 @@ describe('createOpenCodeSession runtime config', () => {
     await flushAsyncWork()
 
     const spawnOptions = spawnMock.mock.calls[0]?.[2] as { env?: Record<string, string> }
-    const inlineConfig = JSON.parse(spawnOptions.env?.OPENCODE_CONFIG_CONTENT ?? '{}') as {
+    const configDir = spawnOptions.env?.OPENCODE_CONFIG_DIR
+    const inlineConfig = JSON.parse(
+      configDir ? await readFile(join(configDir, 'opencode.json'), 'utf8') : '{}'
+    ) as {
       mcp?: Record<string, unknown>
     }
 
@@ -153,4 +156,68 @@ describe('createOpenCodeSession runtime config', () => {
     expect((await lstat(join(configDir!, 'skills', 'research'))).isSymbolicLink()).toBe(true)
     await expect(lstat(join(configDir!, 'skills', 'review'))).rejects.toThrow()
   })
+
+  it('merges base opencode.json into the session config without mutating the source file', async () => {
+    const workspace = await createWorkspace()
+    const baseConfigDir = join(workspace, 'user-opencode-config')
+    await writeDocument(
+      join(baseConfigDir, 'opencode.json'),
+      JSON.stringify({
+        instructions: ['base-instructions.md'],
+        theme: 'ocean',
+        nested: {
+          keep: true
+        }
+      }, null, 2)
+    )
+    mockExecFileJsonResponses(execFileMock, [
+      { id: 'sess_merge', title: 'Vibe Forge:session-merge', updatedAt: '2026-03-26T00:00:00.000Z' }
+    ])
+    spawnMock.mockImplementation(() => makeProc({ stdout: 'merged\n' }))
+
+    const { ctx } = makeCtx({
+      cwd: workspace,
+      env: {
+        OPENCODE_CONFIG_DIR: baseConfigDir
+      }
+    })
+
+    await createOpenCodeSession(ctx, {
+      type: 'create',
+      runtime: 'server',
+      sessionId: 'session-merge',
+      description: 'merge config',
+      onEvent: () => {}
+    } as any)
+
+    await flushAsyncWork()
+
+    const spawnOptions = spawnMock.mock.calls[0]?.[2] as { env?: Record<string, string> }
+    const configDir = spawnOptions.env?.OPENCODE_CONFIG_DIR
+    const sessionConfig = JSON.parse(
+      configDir ? await readFile(join(configDir, 'opencode.json'), 'utf8') : '{}'
+    ) as {
+      instructions?: string[]
+      theme?: string
+      nested?: Record<string, unknown>
+    }
+    const sourceConfig = JSON.parse(
+      await readFile(join(baseConfigDir, 'opencode.json'), 'utf8')
+    ) as {
+      instructions?: string[]
+      theme?: string
+      nested?: Record<string, unknown>
+    }
+
+    expect(sessionConfig.instructions).toContain('base-instructions.md')
+    expect(sessionConfig.theme).toBe('ocean')
+    expect(sessionConfig.nested).toMatchObject({ keep: true })
+    expect(sourceConfig).toEqual({
+      instructions: ['base-instructions.md'],
+      theme: 'ocean',
+      nested: {
+        keep: true
+      }
+    })
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/adapter-opencode",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "OpenCode Adapter for Vibe Forge",
   "imports": {
     "#~/*.js": {
@@ -54,6 +54,6 @@
   },
   "dependencies": {
     "opencode-ai": "1.3.2",
-    "@vibe-forge/core": "^0.7.4"
+    "@vibe-forge/core": "^0.7.5"
   }
 }

package/src/AGENTS.md

@@ -1,5 +1,11 @@
 # `src` 目录说明
 
+hooks 相关改动先交叉看：
+
+- `../AGENTS.md`
+- `../../../docs/HOOKS.md`
+- `../../../docs/HOOKS-REFERENCE.md`
+
 ## 入口层
 
 - `index.ts`：adapter 包对外入口，只负责导出 `init` / `query` 能力
@@ -21,6 +27,12 @@
 - `runtime/common.ts` / `runtime/session.ts`
 - 仅作为稳定入口和 re-export 路由
 - 新逻辑不要继续堆回这两个文件
+- `runtime/native-hooks.ts`
+- `runtime/session/child-env.ts`
+- `runtime/session/skill-config.ts`
+- `runtime/session/stream.ts`
+- `runtime/common/tools.ts`
+  - 这几处共同决定 OpenCode native hooks、session config dir 和 JSON 事件流
 
 ## 依赖方向
 
@@ -36,3 +48,4 @@
 - 涉及 OpenCode CLI 参数、env、session resume 语义的改动，至少补一条 runtime 回归测试
 - 涉及 permissions / tools / model / mcp 映射的改动，至少补一条 common 回归测试
 - 若新增目录，先在本文件补一句职责说明，再落代码
+- hooks 改动不要只跑单测，至少再按 `../AGENTS.md` 里的真实 CLI 路径补一轮 smoke

package/src/runtime/common/inline-config.ts

@@ -8,6 +8,7 @@ import { buildToolPermissionConfig, mapPermissionModeToOpenCode } from './permis
 import { buildToolConfig } from './tools'
 
 export const buildInlineConfigContent = (params: {
+  baseConfigContent?: Record<string, unknown>
   adapterConfigContent?: Record<string, unknown>
   envConfigContent?: Record<string, unknown>
   permissionMode?: AdapterQueryOptions['permissionMode']
@@ -17,7 +18,10 @@ export const buildInlineConfigContent = (params: {
   systemPromptFile?: string
   providerConfig?: Record<string, unknown>
 }) => {
-  const mergedBaseConfig = deepMerge(params.envConfigContent ?? {}, params.adapterConfigContent ?? {})
+  const mergedBaseConfig = deepMerge(
+    deepMerge(params.baseConfigContent ?? {}, params.envConfigContent ?? {}),
+    params.adapterConfigContent ?? {}
+  )
   const inheritedPermission = normalizePermissionNode(mergedBaseConfig.permission)
   const hasToolFilter = (params.tools?.include?.length ?? 0) > 0 || (params.tools?.exclude?.length ?? 0) > 0
   const basePermission = params.permissionMode === 'dontAsk' || params.permissionMode === 'bypassPermissions'

package/src/runtime/common/tools.ts

@@ -106,10 +106,12 @@ export const buildOpenCodeRunArgs = (params: {
   agent?: string
   share?: boolean
   title?: string
+  dir?: string
   opencodeSessionId?: string
   extraOptions?: string[]
+  format?: 'default' | 'json'
 }) => {
-  const args = ['run', '--format', 'default']
+  const args = ['run', '--format', params.format ?? 'default']
 
   if (params.opencodeSessionId) {
     args.push('--session', params.opencodeSessionId)
@@ -120,6 +122,7 @@ export const buildOpenCodeRunArgs = (params: {
   if (params.model) args.push('--model', params.model)
   if (params.agent) args.push('--agent', params.agent)
   if (params.share) args.push('--share')
+  if (params.dir) args.push('--dir', params.dir)
 
   for (const file of params.files) args.push('--file', file)
   args.push(...sanitizeOpenCodeExtraOptions(params.extraOptions))

package/src/runtime/init.ts

@@ -7,6 +7,7 @@ import { promisify } from 'node:util'
 import type { AdapterCtx } from '@vibe-forge/core/adapter'
 
 import { resolveOpenCodeBinaryPath } from '#~/paths.js'
+import { ensureOpenCodeNativeHooksInstalled } from './native-hooks'
 
 const execFileAsync = promisify(execFile)
 
@@ -38,18 +39,15 @@ export const initOpenCodeAdapter = async (ctx: AdapterCtx) => {
   const realHome = process.env.__VF_PROJECT_REAL_HOME__
   const aiHome = process.env.HOME
 
-  if (!realHome || !aiHome) return
-
-  await ensureSymlink(
-    join(realHome, '.config', 'opencode'),
-    join(aiHome, '.config', 'opencode')
-  )
-  await ensureSymlink(
-    join(realHome, '.local', 'share', 'opencode', 'auth.json'),
-    join(aiHome, '.local', 'share', 'opencode', 'auth.json')
-  )
-  await ensureSymlink(
-    join(realHome, '.local', 'share', 'opencode', 'mcp-auth.json'),
-    join(aiHome, '.local', 'share', 'opencode', 'mcp-auth.json')
-  )
+  if (realHome && aiHome) {
+    await ensureSymlink(
+      join(realHome, '.local', 'share', 'opencode', 'auth.json'),
+      join(aiHome, '.local', 'share', 'opencode', 'auth.json')
+    )
+    await ensureSymlink(
+      join(realHome, '.local', 'share', 'opencode', 'mcp-auth.json'),
+      join(aiHome, '.local', 'share', 'opencode', 'mcp-auth.json')
+    )
+  }
+  await ensureOpenCodeNativeHooksInstalled(ctx)
 }

package/src/runtime/native-hooks.ts

@@ -0,0 +1,242 @@
+import { access, mkdir, readdir, rm, symlink, writeFile } from 'node:fs/promises'
+import { dirname, resolve } from 'node:path'
+import process from 'node:process'
+
+import type { AdapterCtx } from '@vibe-forge/core/adapter'
+import {
+  hasManagedHookPlugins,
+  prepareManagedHookRuntime,
+  resolveHookCliScriptPath,
+  writeJsonFile
+} from '@vibe-forge/core/hooks'
+
+const MANAGED_PLUGIN_FILE_NAME = 'vibe-forge-hooks.js'
+const DEFAULT_OPENCODE_CONFIG = {
+  $schema: 'https://opencode.ai/config.json'
+}
+
+const pathExists = async (targetPath: string) => {
+  try {
+    await access(targetPath)
+    return true
+  } catch {
+    return false
+  }
+}
+
+const ensureSymlinkTarget = async (sourcePath: string, targetPath: string) => {
+  await rm(targetPath, { recursive: true, force: true })
+  await mkdir(dirname(targetPath), { recursive: true })
+  await symlink(sourcePath, targetPath)
+}
+
+const mirrorDirectory = async (sourceDir: string, targetDir: string) => {
+  if (!await pathExists(sourceDir)) return
+  await rm(targetDir, { recursive: true, force: true })
+  await mkdir(dirname(targetDir), { recursive: true })
+  await symlink(sourceDir, targetDir)
+}
+
+const mirrorFile = async (sourcePath: string, targetPath: string) => {
+  if (!await pathExists(sourcePath)) return false
+  await ensureSymlinkTarget(sourcePath, targetPath)
+  return true
+}
+
+const syncPluginDirectory = async (sourceDir: string | undefined, targetDir: string) => {
+  await mkdir(targetDir, { recursive: true })
+
+  const existingEntries = await readdir(targetDir).catch(() => [])
+  await Promise.all(existingEntries
+    .filter(entry => entry !== MANAGED_PLUGIN_FILE_NAME)
+    .map(entry => rm(resolve(targetDir, entry), { recursive: true, force: true })))
+
+  if (sourceDir == null || !await pathExists(sourceDir)) return
+
+  const sourceEntries = await readdir(sourceDir)
+  for (const entry of sourceEntries) {
+    if (entry === MANAGED_PLUGIN_FILE_NAME) continue
+    await ensureSymlinkTarget(resolve(sourceDir, entry), resolve(targetDir, entry))
+  }
+}
+
+const buildManagedPluginSource = () => {
+  const callHookPath = resolveHookCliScriptPath('call-hook.js')
+
+  return `import { spawnSync } from "node:child_process"
+import process from "node:process"
+
+const ACTIVE_MARKER = "__VF_VIBE_FORGE_OPENCODE_HOOKS_ACTIVE__"
+const NODE_PATH = process.env.__VF_PROJECT_NODE_PATH__ ?? ${JSON.stringify(process.execPath)}
+const CALL_HOOK_PATH = ${JSON.stringify(callHookPath)}
+const SESSION_ID = process.env.__VF_OPENCODE_TASK_SESSION_ID__ ?? "opencode-session"
+const RUNTIME = process.env.__VF_OPENCODE_HOOK_RUNTIME__
+
+const parseJson = (value, fallback) => {
+  try {
+    return JSON.parse(value)
+  } catch {
+    return fallback
+  }
+}
+
+const createBaseInput = (hookEventName, cwd, canBlock) => ({
+  hookEventName,
+  cwd,
+  sessionId: SESSION_ID,
+  adapter: "opencode",
+  runtime: RUNTIME,
+  hookSource: "native",
+  canBlock,
+})
+
+const callVibeForgeHook = (payload) => {
+  if (process.env[ACTIVE_MARKER] !== "1") return { continue: true }
+
+  try {
+    const result = spawnSync(NODE_PATH, [CALL_HOOK_PATH], {
+      input: JSON.stringify(payload),
+      encoding: "utf8",
+      env: {
+        ...process.env,
+        __VF_PROJECT_WORKSPACE_FOLDER__: payload.cwd ?? process.env.__VF_PROJECT_WORKSPACE_FOLDER__ ?? process.cwd(),
+      },
+    })
+
+    if ((result.status ?? 0) !== 0) {
+      console.error("[vibe-forge opencode hook] process exited with", result.status, result.stderr)
+      return { continue: true }
+    }
+
+    const stdout = result.stdout?.trim()
+    return stdout ? parseJson(stdout, { continue: true }) : { continue: true }
+  } catch (error) {
+    console.error("[vibe-forge opencode hook] failed", error)
+    return { continue: true }
+  }
+}
+
+const stopReason = (result, fallback) => (
+  typeof result?.stopReason === "string" && result.stopReason.trim() !== ""
+    ? result.stopReason.trim()
+    : fallback
+)
+
+const normalizeToolName = (input) => {
+  if (typeof input?.tool === "string" && input.tool.trim() !== "") return input.tool
+  if (typeof input?.name === "string" && input.name.trim() !== "") return input.name
+  return "unknown"
+}
+
+const normalizeToolInput = (input, output) => (
+  output?.args ?? input?.args ?? input?.input ?? input
+)
+
+const normalizeToolResponse = (input, output) => (
+  output?.result ?? output?.response ?? output?.data ?? input?.result ?? output
+)
+
+export const VibeForgeHooks = async ({ directory }) => ({
+  event: async ({ event }) => {
+    if (event?.type === "session.created") {
+      callVibeForgeHook({
+        ...createBaseInput("SessionStart", directory, true),
+        source: "startup",
+      })
+      return
+    }
+
+    if (event?.type === "session.idle") {
+      callVibeForgeHook(createBaseInput("Stop", directory, false))
+    }
+  },
+  "tool.execute.before": async (input, output) => {
+    const result = callVibeForgeHook({
+      ...createBaseInput("PreToolUse", directory, true),
+      toolName: normalizeToolName(input),
+      toolInput: normalizeToolInput(input, output),
+    })
+
+    if (result?.continue === false) {
+      throw new Error(stopReason(result, "blocked by Vibe Forge PreToolUse hook"))
+    }
+  },
+  "tool.execute.after": async (input, output) => {
+    const result = callVibeForgeHook({
+      ...createBaseInput("PostToolUse", directory, true),
+      toolName: normalizeToolName(input),
+      toolInput: normalizeToolInput(input, output),
+      toolResponse: normalizeToolResponse(input, output),
+      isError: Boolean(output?.error ?? output?.isError ?? input?.error),
+    })
+
+    if (result?.continue === false) {
+      throw new Error(stopReason(result, "blocked by Vibe Forge PostToolUse hook"))
+    }
+  },
+})
+`
+}
+
+const resolveSourceConfigDir = (ctx: Pick<AdapterCtx, 'env'>) => {
+  const explicit = ctx.env.OPENCODE_CONFIG_DIR?.trim() || process.env.OPENCODE_CONFIG_DIR?.trim()
+  if (explicit) return resolve(explicit)
+
+  const realHome = process.env.__VF_PROJECT_REAL_HOME__?.trim()
+  return realHome ? resolve(realHome, '.config', 'opencode') : undefined
+}
+
+export const ensureOpenCodeNativeHooksInstalled = async (
+  ctx: Pick<AdapterCtx, 'cwd' | 'env' | 'logger' | 'assets'>
+) => {
+  const { env, logger, assets } = ctx
+
+  env.__VF_PROJECT_AI_OPENCODE_NATIVE_HOOKS_AVAILABLE__ = '0'
+  const enabled = hasManagedHookPlugins({ assets })
+
+  try {
+    const { mockHome } = prepareManagedHookRuntime(ctx)
+    const sourceConfigDir = resolveSourceConfigDir(ctx)
+    const managedConfigDir = resolve(mockHome, '.config', 'opencode')
+    const pluginDir = resolve(managedConfigDir, 'plugins')
+    const managedPluginPath = resolve(pluginDir, MANAGED_PLUGIN_FILE_NAME)
+
+    await mkdir(managedConfigDir, { recursive: true })
+
+    if (sourceConfigDir != null && resolve(sourceConfigDir) !== managedConfigDir) {
+      await Promise.all([
+        mirrorDirectory(resolve(sourceConfigDir, 'agents'), resolve(managedConfigDir, 'agents')),
+        mirrorDirectory(resolve(sourceConfigDir, 'commands'), resolve(managedConfigDir, 'commands')),
+        mirrorDirectory(resolve(sourceConfigDir, 'modes'), resolve(managedConfigDir, 'modes')),
+        mirrorDirectory(resolve(sourceConfigDir, 'skills'), resolve(managedConfigDir, 'skills')),
+        mirrorFile(resolve(sourceConfigDir, 'package.json'), resolve(managedConfigDir, 'package.json')),
+        mirrorFile(resolve(sourceConfigDir, 'bun.lock'), resolve(managedConfigDir, 'bun.lock')),
+        mirrorFile(resolve(sourceConfigDir, 'bun.lockb'), resolve(managedConfigDir, 'bun.lockb'))
+      ])
+      await syncPluginDirectory(resolve(sourceConfigDir, 'plugins'), pluginDir)
+      if (!await mirrorFile(resolve(sourceConfigDir, 'opencode.json'), resolve(managedConfigDir, 'opencode.json'))) {
+        await writeJsonFile(resolve(managedConfigDir, 'opencode.json'), DEFAULT_OPENCODE_CONFIG)
+      }
+    } else {
+      await syncPluginDirectory(undefined, pluginDir)
+      if (!await pathExists(resolve(managedConfigDir, 'opencode.json'))) {
+        await writeJsonFile(resolve(managedConfigDir, 'opencode.json'), DEFAULT_OPENCODE_CONFIG)
+      }
+    }
+
+    if (enabled) {
+      await mkdir(pluginDir, { recursive: true })
+      await writeFile(managedPluginPath, buildManagedPluginSource(), 'utf8')
+    } else {
+      await rm(managedPluginPath, { force: true })
+    }
+
+    env.OPENCODE_CONFIG_DIR = managedConfigDir
+    env.__VF_PROJECT_AI_OPENCODE_NATIVE_HOOKS_AVAILABLE__ = enabled ? '1' : '0'
+    return enabled
+  } catch (error) {
+    logger.warn('[opencode hooks] failed to install native hook bridge', error)
+    env.__VF_PROJECT_AI_OPENCODE_NATIVE_HOOKS_AVAILABLE__ = '0'
+    return false
+  }
+}

package/src/runtime/session/child-env.ts

@@ -1,4 +1,4 @@
-import { mkdir, writeFile } from 'node:fs/promises'
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
 import process from 'node:process'
 
@@ -53,6 +53,17 @@ const parseEnvConfigContent = (env: AdapterCtx['env']) => {
   }
 }
 
+const readBaseConfigContent = async (configDir: string | undefined) => {
+  if (configDir == null) return undefined
+
+  try {
+    const parsed = JSON.parse(await readFile(resolve(configDir, 'opencode.json'), 'utf8'))
+    return asPlainRecord(parsed)
+  } catch {
+    return undefined
+  }
+}
+
 export const buildChildEnv = async (params: {
   ctx: AdapterCtx
   options: AdapterQueryOptions
@@ -60,10 +71,29 @@ export const buildChildEnv = async (params: {
   systemPromptFile?: string
 }) => {
   const configDir = await ensureOpenCodeConfigDir({ ctx: params.ctx, options: params.options })
+  const nativeHooksAvailable = params.ctx.env.__VF_PROJECT_AI_OPENCODE_NATIVE_HOOKS_AVAILABLE__ === '1'
+  const baseConfigContent = await readBaseConfigContent(configDir)
   const { cliModel, providerConfig } = resolveOpenCodeModel(
     params.options.model,
     resolveMergedModelServices(params.ctx)
   )
+  const inlineConfigContent = buildInlineConfigContent({
+    baseConfigContent,
+    adapterConfigContent: params.adapterConfig.configContent,
+    envConfigContent: parseEnvConfigContent(params.ctx.env),
+    permissionMode: params.options.permissionMode,
+    tools: params.options.tools,
+    mcpServers: undefined,
+    availableMcpServers: params.options.assetPlan?.mcpServers ?? mapResolvedMcpServerSelection(params.ctx, params.options),
+    systemPromptFile: params.systemPromptFile,
+    providerConfig
+  })
+
+  if (configDir != null) {
+    const configPath = resolve(configDir, 'opencode.json')
+    await rm(configPath, { force: true })
+    await writeFile(configPath, `${JSON.stringify(inlineConfigContent, null, 2)}\n`, 'utf8')
+  }
 
   return {
     cliModel,
@@ -71,21 +101,48 @@ export const buildChildEnv = async (params: {
       ...process.env,
       ...params.ctx.env,
       OPENCODE_DISABLE_AUTOUPDATE: params.ctx.env.OPENCODE_DISABLE_AUTOUPDATE ?? 'true',
-      OPENCODE_CONFIG_CONTENT: JSON.stringify(buildInlineConfigContent({
-        adapterConfigContent: params.adapterConfig.configContent,
-        envConfigContent: parseEnvConfigContent(params.ctx.env),
-        permissionMode: params.options.permissionMode,
-        tools: params.options.tools,
-        mcpServers: resolveMcpServerSelection(params.ctx, params.options.mcpServers),
-        availableMcpServers: resolveMergedMcpServers(params.ctx),
-        systemPromptFile: params.systemPromptFile,
-        providerConfig
-      })),
+      ...(nativeHooksAvailable
+        ? {
+            __VF_VIBE_FORGE_OPENCODE_HOOKS_ACTIVE__: '1',
+            __VF_OPENCODE_HOOK_RUNTIME__: params.options.runtime,
+            __VF_OPENCODE_TASK_SESSION_ID__: params.options.sessionId
+          }
+        : {}),
+      ...(configDir == null
+        ? { OPENCODE_CONFIG_CONTENT: JSON.stringify(inlineConfigContent) }
+        : {}),
       ...(configDir != null ? { OPENCODE_CONFIG_DIR: configDir } : {})
     })
   }
 }
 
+const mapResolvedMcpServerSelection = (
+  ctx: AdapterCtx,
+  options: AdapterQueryOptions
+) => (
+  options.assetPlan?.mcpServers ?? mapSelectedMcpServersToConfig(
+    resolveMergedMcpServers(ctx),
+    resolveMcpServerSelection(ctx, options.mcpServers)
+  )
+)
+
+const mapSelectedMcpServersToConfig = (
+  availableMcpServers: Config['mcpServers'],
+  selection: AdapterQueryOptions['mcpServers']
+) => {
+  if (availableMcpServers == null) return undefined
+  const include = selection?.include != null ? new Set(selection.include) : undefined
+  const exclude = new Set(selection?.exclude ?? [])
+
+  return Object.fromEntries(
+    Object.entries(availableMcpServers).filter(([name]) => {
+      if (include != null && !include.has(name)) return false
+      if (exclude.has(name)) return false
+      return true
+    })
+  )
+}
+
 export const ensureSystemPromptFile = async (
   ctx: AdapterCtx,
   options: AdapterQueryOptions

package/src/runtime/session/direct.ts

@@ -47,6 +47,7 @@ export const createDirectOpenCodeSession = async (
     agent,
     share: adapterConfig.share,
     title,
+    dir: ctx.cwd,
     opencodeSessionId,
     extraOptions: options.extraOptions
   }), {

package/src/runtime/session/shared.ts

@@ -19,6 +19,13 @@ export interface OpenCodeRunResult {
   stderr: string
 }
 
+interface OpenCodeJsonLineEvent {
+  type?: string
+  part?: {
+    text?: string
+  }
+}
+
 export const execFileAsync = (
   file: string,
   args: string[],
@@ -43,6 +50,25 @@ export const createAssistantMessage = (content: string, model?: string): ChatMes
   ...(model != null ? { model } : {})
 })
 
+export const extractTextFromOpenCodeJsonEvents = (stdout: string) => {
+  const textParts: string[] = []
+
+  for (const rawLine of stdout.split('\n')) {
+    const line = rawLine.trim()
+    if (!line.startsWith('{') || !line.endsWith('}')) continue
+
+    try {
+      const event = JSON.parse(line) as OpenCodeJsonLineEvent
+      if (event.type === 'text' && typeof event.part?.text === 'string') {
+        textParts.push(event.part.text)
+      }
+    } catch {
+    }
+  }
+
+  return textParts.join('')
+}
+
 export const getErrorMessage = (error: unknown) => (
   error instanceof Error ? error.message : String(error ?? 'OpenCode session failed unexpectedly')
 )

package/src/runtime/session/skill-config.ts

@@ -55,8 +55,14 @@ export const ensureOpenCodeConfigDir = async (params: {
   options: AdapterQueryOptions
 }) => {
   const baseConfigDir = params.ctx.env.OPENCODE_CONFIG_DIR ?? process.env.OPENCODE_CONFIG_DIR ?? undefined
-  const resolvedSkills = await filterResolvedSkills(params.ctx.cwd, params.options.skills)
-  if (baseConfigDir == null && resolvedSkills.size === 0) return undefined
+  const planOverlays = params.options.assetPlan?.overlays ?? []
+  const resolvedSkills = planOverlays.length > 0
+    ? new Map(
+        planOverlays
+          .filter((entry) => entry.kind === 'skill')
+          .map((entry) => [basename(entry.targetPath), entry.sourcePath] as const)
+      )
+    : await filterResolvedSkills(params.ctx.cwd, params.options.skills)
 
   const configDir = resolve(
     params.ctx.cwd,
@@ -73,6 +79,9 @@ export const ensureOpenCodeConfigDir = async (params: {
     for (const folderName of ['agents', 'commands', 'modes', 'plugins']) {
       await ensureSymlinkTarget(resolve(baseConfigDir, folderName), resolve(configDir, folderName)).catch(() => undefined)
     }
+    for (const fileName of ['opencode.json', 'package.json', 'bun.lock', 'bun.lockb']) {
+      await ensureSymlinkTarget(resolve(baseConfigDir, fileName), resolve(configDir, fileName)).catch(() => undefined)
+    }
     await mirrorDirectoryEntries(resolve(baseConfigDir, 'skills'), resolve(configDir, 'skills'))
   }
 
@@ -80,5 +89,9 @@ export const ensureOpenCodeConfigDir = async (params: {
     await ensureSymlinkTarget(sourceDir, resolve(configDir, 'skills', name))
   }
 
+  for (const overlay of planOverlays.filter((entry) => entry.kind !== 'skill')) {
+    await ensureSymlinkTarget(overlay.sourcePath, resolve(configDir, overlay.targetPath))
+  }
+
   return configDir
 }

package/src/runtime/session/stream.ts

@@ -12,7 +12,14 @@ import {
 import { resolveOpenCodeBinaryPath } from '../../paths'
 import { buildChildEnv, ensureSystemPromptFile } from './child-env'
 import { findOpenCodeSessionId, runOpenCodeCommand } from './process'
-import { createAssistantMessage, getErrorMessage, resolveAdapterConfig, stripAnsi, toAdapterErrorData } from './shared'
+import {
+  createAssistantMessage,
+  extractTextFromOpenCodeJsonEvents,
+  getErrorMessage,
+  resolveAdapterConfig,
+  stripAnsi,
+  toAdapterErrorData
+} from './shared'
 
 export const createStreamOpenCodeSession = async (
   ctx: AdapterCtx,
@@ -93,8 +100,10 @@ export const createStreamOpenCodeSession = async (
         agent,
         share: adapterConfig.share,
         title,
+        dir: ctx.cwd,
         opencodeSessionId,
-        extraOptions: options.extraOptions
+        extraOptions: options.extraOptions,
+        format: 'json'
       }),
       cwd: ctx.cwd,
       env,
@@ -115,10 +124,10 @@ export const createStreamOpenCodeSession = async (
     currentKill = undefined
     if (destroyed) return
 
-    const output = stripAnsi(result.stdout).trim()
+    const output = extractTextFromOpenCodeJsonEvents(result.stdout).trim()
     const error = stripAnsi(result.stderr).trim()
     if (result.exitCode !== 0) {
-      const missingSession = /session.+not found|no session found/i.test(`${output}\n${error}`)
+      const missingSession = /session.+not found|no session found/i.test(`${result.stdout}\n${error}`)
       if (missingSession && opencodeSessionId != null && allowRetry) {
         opencodeSessionId = undefined
         await ctx.cache.set('adapter.opencode.session', { title })
@@ -155,7 +164,7 @@ export const createStreamOpenCodeSession = async (
     }
 
     const assistantMessage = createAssistantMessage(
-      output === '' ? '[OpenCode completed without text output]' : output,
+      output === '' ? (stripAnsi(result.stdout).trim() || '[OpenCode completed without text output]') : output,
       cliModel
     )
     emitEvent({ type: 'message', data: assistantMessage })