feat(agent-presets): add Codex and Claude Code subagent tools

packages/subagent/subagent-claude-code/src/index.ts

@@ -59,19 +59,25 @@ class ClaudeCodeProvider implements SubagentProvider {
     private readonly config: ResolvedConfig,
   ) {}
 
-  start(request: ResolvedSubagentStartRequest) {
+  async start(request: ResolvedSubagentStartRequest) {
     const parentCwd = request.parent.session.header.cwd
     if (parentCwd === undefined) {
       throw new Error(
         'subagent-claude-code: no working directory for the child — delegate from a parent session that has one',
       )
     }
+    const executable = await this.ctx.subprocess.resolveExecutable(
+      'claude',
+      this.config.env,
+      request.signal,
+    )
     const spec: ClaudeCodeRunSpec = {
       cwd: resolveChildCwd(
         'subagent-claude-code',
         undefined,
         parentCwd,
       ),
+      executable,
       env: this.config.env,
       disposeGraceMs: this.config.disposeGraceMs,
       spawn: spawnSpec => this.ctx.subprocess.spawn(spawnSpec),

packages/subagent/subagent-claude-code/src/process.ts

@@ -6,6 +6,7 @@
  */
 
 import { EventEmitter } from 'node:events'
+import { extname } from 'node:path'
 import type {
   SpawnedProcess,
   SpawnOptions,
@@ -40,17 +41,23 @@ export function sdkEnvironmentOverlay(
  * Translate one official SDK spawn request to the shared process owner.
  * @param options - command, arguments, workspace, environment, and forwarded signal from the SDK.
  * @param graceMs - process-tree termination grace.
+ * @param platform - host platform selecting the Windows batch-shim boundary.
  * @returns the fully explicit shared subprocess request.
  */
 export function claudeSpawnSpec(
   options: SpawnOptions,
   graceMs: number,
+  platform: NodeJS.Platform = process.platform,
 ): SubprocessSpawnSpec {
   if (options.cwd === undefined || options.cwd.length === 0) {
     throw new Error('subagent-claude-code: SDK spawn request omitted its workspace')
   }
+  const extension = extname(options.command).toLowerCase()
+  const argv = platform === 'win32' && (extension === '.cmd' || extension === '.bat')
+    ? ['cmd.exe', '/d', '/s', '/c', options.command, ...options.args]
+    : [options.command, ...options.args]
   return {
-    argv: [options.command, ...options.args],
+    argv,
     cwd: options.cwd,
     stdio: { stdin: 'pipe', stdout: 'pipe', stderr: 'inherit' },
     graceMs,

packages/subagent/subagent-claude-code/src/run.ts

@@ -44,6 +44,8 @@ export const DEFAULT_DISPOSE_GRACE_MS = 3_000
 export interface ClaudeCodeRunSpec {
   /** Parent Session workspace supplied to the SDK and real CLI. */
   readonly cwd: string
+  /** Exact native Claude Code executable resolved from the host PATH. */
+  readonly executable: string
   /** Explicit deployment/test environment layered after shared scrubbing. */
   readonly env: Record<string, string>
   /** Subprocess termination grace passed to the shared process-tree owner. */
@@ -180,6 +182,7 @@ export function claudeQueryOptions(
   return {
     abortController: controller,
     cwd: spec.cwd,
+    pathToClaudeCodeExecutable: spec.executable,
     env: { ...scrubbedParentEnv(), ...spec.env },
     persistSession: false,
     disallowedTools: ['AskUserQuestion'],