aiterm-mcp 0.21.4 → 0.22.0

package/dist/core.js

@@ -11,7 +11,7 @@ import { spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
-import { createHash, randomBytes } from "node:crypto";
+import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import * as rtk from "./rtk.js";
 import { recordRuntimeError } from "./runtime-error-store.js";
@@ -48,6 +48,8 @@ const NON_POSIX_MARK_SHELLS = new Set(["fish", "csh", "tcsh"]);
 const MARK_DONE_RE = /<<<AITERM_DONE rc=[0-9]+>>>/;
 const LAUNCH_ID_RE = /^[0-9a-f]{32}$/;
 const OPERATION_ID_RE = /^sha256:[0-9a-f]{64}$/;
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const AGENT_LINEAGE_RE = /^[A-Za-z0-9_.:-]+(?:>[A-Za-z0-9_.:-]+)*$/;
 const AGENT_DONE_POLL_MS = 100;
 const AGENT_DONE_SETTLE_MIN_MS = 250;
 const AGENT_DONE_SCREEN_SETTLE_POLL_MS = 100;
@@ -57,6 +59,7 @@ const AGENT_SUBMIT_DELAY_MS = 250;
 const AGENT_EVENT_MAX_BYTES = 1024 * 1024;
 const AGENT_EVENT_TAIL_BYTES = 64 * 1024;
 const CODEX_TRANSCRIPT_INCREMENT_MAX_BYTES = 16 * 1024 * 1024;
+const GROK_TRANSCRIPT_INCREMENT_MAX_BYTES = 16 * 1024 * 1024;
 const AGENT_METADATA_NEGATIVE_CACHE_TTL_MS = 2_000;
 const AGENT_TUI_READY_TIMEOUT_MS = 30_000;
 const AGENT_TUI_READY_POLL_MS = 500;
@@ -412,12 +415,6 @@ function agentManagedClaudeSettingsPath(name, launchId) {
         throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
     return path.join(agentsDir(), `${name}.${launchId}.claude-settings.json`);
 }
-function agentManagedClaudeMcpConfigPath(name, launchId) {
-    assertSessionName(name);
-    if (!LAUNCH_ID_RE.test(launchId))
-        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
-    return path.join(agentsDir(), `${name}.${launchId}.claude-mcp.json`);
-}
 function agentClaudeResultPath(name, launchId) {
     assertSessionName(name);
     if (!LAUNCH_ID_RE.test(launchId))
@@ -443,24 +440,6 @@ function agentClaudeDispatchReceiptPath(name, launchId, operationId) {
     const validated = validateOperationId(operationId);
     return path.join(agentsDir(), `${name}.${launchId}.${validated.slice("sha256:".length)}.claude-dispatch`);
 }
-function agentManagedCodexHomePath(name, launchId) {
-    assertSessionName(name);
-    if (!LAUNCH_ID_RE.test(launchId))
-        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
-    return path.join(agentsDir(), `${name}.${launchId}.codex-home`);
-}
-function agentManagedGrokHomePath(name, launchId) {
-    assertSessionName(name);
-    if (!LAUNCH_ID_RE.test(launchId))
-        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
-    return path.join(agentsDir(), `${name}.${launchId}.grok-home`);
-}
-function agentManagedGrokUserHomePath(name, launchId) {
-    assertSessionName(name);
-    if (!LAUNCH_ID_RE.test(launchId))
-        throw new AitermError(`launch_id が不正です: ${launchId}`, 2);
-    return path.join(agentsDir(), `${name}.${launchId}.home`);
-}
 function existingAgentsDir() {
     if (typeof process.getuid !== "function")
         return null;
@@ -960,7 +939,7 @@ function assertManagedClaudeCredentialCommandNotSent(name, text) {
     const normalized = text.replace(PASTE_MARKERS_RE, "").replace(ANSI_RE, "").replace(CTRL_RE, "").trim();
     if (!/^\/(?:login|logout)$/i.test(normalized))
         return;
-    throw new AitermError("managed Claude sessionでは共有認証を変更する /login と /logout を送信できません。" +
+    throw new AitermError("aiterm相関付きClaude sessionでは共有認証を変更する /login と /logout を送信できません。" +
         "認証操作は通常端末で一度だけ行い、必要ならこのsessionをcloseして起動し直してください。", 2);
 }
 export function send(name, text, o = {}) {
@@ -986,7 +965,7 @@ export function send(name, text, o = {}) {
         // 拒否した呼び出しが古いmarkを消したり偽のmarkを残すと、後続readが存在しない
         // sentinelを待つため、公開上の拒否は副作用ゼロでなければならない。
         if (!o.preserveAgentOperation && managedClaudeOperation(name) !== undefined) {
-            throw new AitermError("managed Claude agent sessionへの通常送信はturn境界を失うため拒否します。" +
+            throw new AitermError("aiterm相関付きClaude agent sessionへの通常送信はturn境界を失うため拒否します。" +
                 "pty_send（forceなし＝自動dispatch）を使うか、通常対話へ切り替えるならsessionをcloseしてpty_openから手動起動し直してください。", 2);
         }
         writeLastcmd(name, text); // read rtk の reducer 分類用（書換/mark 前の素のコマンド）
@@ -1071,7 +1050,7 @@ export function sendKey(name, key, o = {}) {
         throw new AitermError(`session '${name}' が無い`, 2);
     const k = KEYMAP[key.toLowerCase()] ?? key;
     if (!o.preserveAgentOperation && managedClaudeOperation(name) !== undefined && k !== "C-c") {
-        throw new AitermError("managed Claude agent sessionではturn相関を壊さないC-cだけをpty_keyで送れます。" +
+        throw new AitermError("aiterm相関付きClaude agent sessionではturn相関を壊さないC-cだけをpty_keyで送れます。" +
             "他の対話操作はpty_send（自動dispatch）、終了はpty_closeを使ってください。", 2);
     }
     tmux("send-keys", "-t", name, k);
@@ -1384,12 +1363,80 @@ export function killAll() {
     agentMetadataNegativeCache.clear();
     return "killed all sessions on this socket";
 }
+function readAgentLineageSeed() {
+    const role = process.env.AITERM_AGENT_ROLE;
+    const session = process.env.AITERM_AGENT_SESSION_ID;
+    const depthRaw = process.env.AITERM_AGENT_DEPTH;
+    const lineage = process.env.AITERM_AGENT_LINEAGE;
+    const delegationAllowed = process.env.AITERM_AGENT_DELEGATION_ALLOWED;
+    const nested = [role, session, depthRaw, lineage, delegationAllowed].some((value) => value !== undefined);
+    if (!nested) {
+        return { parentSessionId: "host-root", delegationDepth: 1, lineagePrefix: "host-root" };
+    }
+    if (role !== "subagent" ||
+        delegationAllowed !== "true" ||
+        !session ||
+        !/^[A-Za-z0-9_-]{1,64}$/.test(session) ||
+        !depthRaw ||
+        !/^\d+$/.test(depthRaw) ||
+        !lineage ||
+        lineage.length > 4096 ||
+        !AGENT_LINEAGE_RE.test(lineage)) {
+        throw new AitermError("継承したAITERM sub-agent lineage環境が不正です", 2);
+    }
+    const parentDepth = Number(depthRaw);
+    if (!Number.isSafeInteger(parentDepth) || parentDepth < 1 || parentDepth >= 1_000_000) {
+        throw new AitermError("継承したAITERM_AGENT_DEPTHが不正です", 2);
+    }
+    return { parentSessionId: session, delegationDepth: parentDepth + 1, lineagePrefix: lineage };
+}
+function createAgentLineageContext(kind, sessionId, seed) {
+    const lineage = `${seed.lineagePrefix}>${kind}:${sessionId}`;
+    if (lineage.length > 4096 || !AGENT_LINEAGE_RE.test(lineage)) {
+        throw new AitermError("AITERM sub-agent lineageが上限または形式に違反しました", 2);
+    }
+    return {
+        agentRole: "subagent",
+        parentSessionId: seed.parentSessionId,
+        delegationDepth: seed.delegationDepth,
+        lineage,
+        delegationAllowed: true,
+    };
+}
+function agentLineageFields(context) {
+    return {
+        agent_role: context.agentRole,
+        parent_session_id: context.parentSessionId,
+        delegation_depth: context.delegationDepth,
+        lineage: context.lineage,
+        delegation_allowed: context.delegationAllowed,
+    };
+}
+function subagentInstruction(meta) {
+    if (meta.agent_role !== "subagent" ||
+        !meta.parent_session_id ||
+        !Number.isSafeInteger(meta.delegation_depth) ||
+        !meta.lineage ||
+        meta.delegation_allowed !== true) {
+        throw new AitermError("sub-agent instructionに必要なlineage metadataがありません", 2);
+    }
+    return [
+        "<aiterm_subagent_context>",
+        "あなたはaitermから起動されたsub-agentであり、root agentではありません。",
+        `AITERM_AGENT_LAUNCH_ID=${meta.launch_id}`,
+        `role=${meta.agent_role}`,
+        `parent_session_id=${meta.parent_session_id}`,
+        `delegation_depth=${meta.delegation_depth}`,
+        `lineage=${meta.lineage}`,
+        "delegation_allowed=true",
+        "任務の所有権を保ち、結果を親へ返してください。必要なら追加のsub-agentへ委譲してよいです。",
+        "ただし、同じ任務全体を同型agentへ反射的に丸投げして自己複製ループを作らないでください。",
+        "</aiterm_subagent_context>",
+    ].join("\n");
+}
 const DEFAULT_AGENT_DONE_TIMEOUT = 600;
 const agentMetadataNegativeCache = new Map();
 let agentTuiReadyStableSamplesTestOverride = null;
-function grokHookScriptPath() {
-    return path.join(path.dirname(fileURLToPath(import.meta.url)), "grok-stop-hook.js");
-}
 function claudeHookScriptPath() {
     return path.join(path.dirname(fileURLToPath(import.meta.url)), "claude-stop-hook.js");
 }
@@ -1472,36 +1519,6 @@ function createEmpty0600NoFollow(p) {
 function realCodexHome() {
     return process.env.CODEX_HOME || path.join(process.env.HOME ?? os.homedir(), ".codex");
 }
-// 引数で model/effort を渡された時は managed config のピンを上書きする（端末 config の
-// model/model_reasoning_effort ピン——例: effort=ultra は proactive 自動委譲 ON——が対話子へ
-// 黙って波及するのを防ぐ）。TOML の top-level キーは最初のテーブルヘッダより前にしか置けないため、
-// 既存行の除去は先頭領域に限定し、上書き行はファイル先頭へ置く。
-function applyCodexConfigOverrides(body, overrides) {
-    const lines = [];
-    if (overrides.model)
-        lines.push(`model = ${JSON.stringify(overrides.model)}`);
-    if (overrides.effort)
-        lines.push(`model_reasoning_effort = ${JSON.stringify(overrides.effort)}`);
-    if (!lines.length)
-        return body;
-    if (body == null)
-        return lines.join("\n") + "\n";
-    const rows = body.split(/\r?\n/);
-    let firstTable = rows.findIndex((l) => /^\s*\[/.test(l));
-    if (firstTable === -1)
-        firstTable = rows.length;
-    const head = rows.slice(0, firstTable).filter((l) => {
-        if (overrides.model && /^\s*(?:"model"|'model'|model)\s*=/.test(l))
-            return false;
-        if (overrides.effort && /^\s*(?:"model_reasoning_effort"|'model_reasoning_effort'|model_reasoning_effort)\s*=/.test(l))
-            return false;
-        return true;
-    });
-    let out = [...lines, ...head, ...rows.slice(firstTable)].join("\n");
-    if (!out.endsWith("\n"))
-        out += "\n";
-    return out;
-}
 function readCodexConfigPins(configPath) {
     let body;
     try {
@@ -1526,7 +1543,7 @@ function readCodexConfigPins(configPath) {
     };
     return { model: pick("model"), effort: pick("model_reasoning_effort") };
 }
-function managedCodexConfigSummary(configPath) {
+function codexConfigSummary(configPath) {
     let body;
     try {
         body = fs.readFileSync(configPath, "utf8");
@@ -1555,93 +1572,9 @@ function managedCodexConfigSummary(configPath) {
         bits.push(`approval_policy=${approvalPolicy}`);
     if (sandboxMode)
         bits.push(`sandbox_mode=${sandboxMode}`);
-    return `managed config: ${bits.join(" / ")}`;
-}
-// Custom agent definitions are configuration, not mutable Codex state. Copy only direct
-// agents/*.toml entries into the per-launch home so role discovery matches the source home while
-// sessions/cache remain isolated. Source symlinks are resolved and their contents are snapshotted;
-// the managed home never points back to the source definition.
-function snapshotCodexAgentDefinitions(srcHome, managedHome) {
-    const srcDir = path.join(srcHome, "agents");
-    let srcDirSt;
-    try {
-        srcDirSt = fs.statSync(srcDir);
-    }
-    catch (e) {
-        if (e.code === "ENOENT")
-            return;
-        throw e;
-    }
-    if (!srcDirSt.isDirectory()) {
-        throw new AitermError(`Codex agents が directory ではありません: ${srcDir}`, 2);
-    }
-    const names = fs.readdirSync(srcDir).filter((name) => name.endsWith(".toml")).sort();
-    if (!names.length)
-        return;
-    const dstDir = path.join(managedHome, "agents");
-    fs.mkdirSync(dstDir, { mode: 0o700 });
-    fs.chmodSync(dstDir, 0o700);
-    for (const name of names) {
-        const src = path.join(srcDir, name);
-        const resolved = fs.realpathSync(src);
-        const st = fs.statSync(resolved);
-        if (!st.isFile()) {
-            throw new AitermError(`Codex agent definition が通常ファイルではありません: ${src}`, 2);
-        }
-        writeText0600(path.join(dstDir, name), fs.readFileSync(resolved, "utf8"));
-    }
-}
-function createManagedCodexHome(name, launchId, overrides = {}) {
-    const srcHome = realCodexHome();
-    let srcSt;
-    try {
-        srcSt = fs.statSync(srcHome);
-    }
-    catch {
-        throw new AitermError(`Codex home が見つかりません: ${srcHome}`, 2);
-    }
-    if (!srcSt.isDirectory())
-        throw new AitermError(`Codex home が directory ではありません: ${srcHome}`, 2);
-    const managedHome = agentManagedCodexHomePath(name, launchId);
-    fs.mkdirSync(managedHome, { recursive: false, mode: 0o700 });
-    fs.chmodSync(managedHome, 0o700);
-    const authSrc = path.join(srcHome, "auth.json");
-    try {
-        const st = fs.statSync(authSrc);
-        if (!st.isFile())
-            throw new AitermError(`Codex auth.json が通常ファイルではありません: ${authSrc}`, 2);
-    }
-    catch (e) {
-        if (e.code === "ENOENT") {
-            throw new AitermError(`Codex auth.json が見つかりません。先に codex login が必要です: ${srcHome}`, 2);
-        }
-        throw e;
-    }
-    fs.symlinkSync(authSrc, path.join(managedHome, "auth.json"));
-    const configSrc = path.join(srcHome, "config.toml");
-    let configBody = null;
-    try {
-        const st = fs.statSync(configSrc);
-        if (st.isFile())
-            configBody = fs.readFileSync(configSrc, "utf8");
-    }
-    catch (e) {
-        if (e.code !== "ENOENT")
-            throw e;
-    }
-    const configOut = applyCodexConfigOverrides(configBody, overrides);
-    if (configOut != null) {
-        const configDst = path.join(managedHome, "config.toml");
-        fs.writeFileSync(configDst, configOut, { mode: 0o600 });
-        fs.chmodSync(configDst, 0o600);
-    }
-    snapshotCodexAgentDefinitions(srcHome, managedHome);
-    // Codex 自身の rollout transcript に task_complete が永続化されるため、完了検出用の
-    // Stop hook は作らない。hook と transcript の二重正本、および hook failure の単一障害点を
-    // ここでなくす。
-    return managedHome;
+    return `共有 config: ${bits.join(" / ")}`;
 }
-function createManagedClaudeSettings(name, launchId) {
+function createClaudeCorrelationSettings(name, launchId) {
     const hookScript = claudeHookScriptPath();
     if (!fs.existsSync(hookScript)) {
         throw new AitermError(`Claude Stop hook wrapper が見つかりません。npm run build を実行してください: ${hookScript}`, 2);
@@ -1664,52 +1597,6 @@ function createManagedClaudeSettings(name, launchId) {
     });
     return settings;
 }
-function createManagedClaudeMcpConfig(name, launchId) {
-    const home = process.env.HOME?.trim() || os.homedir();
-    const source = path.join(home, ".claude.json");
-    let canonical;
-    try {
-        canonical = fs.realpathSync(source);
-    }
-    catch (error) {
-        if (error.code === "ENOENT")
-            return null;
-        throw new AitermError(`Claude user MCP設定を読めません: ${error.message}`, 2);
-    }
-    let fd;
-    let parsed;
-    try {
-        fd = fs.openSync(canonical, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW | fs.constants.O_NONBLOCK);
-        const st = fs.fstatSync(fd);
-        if (!st.isFile() || st.uid !== currentUid() || st.size > 16 * 1024 * 1024) {
-            throw new AitermError("Claude user MCP設定の安全検証に失敗しました", 2);
-        }
-        parsed = JSON.parse(fs.readFileSync(fd, "utf8"));
-    }
-    catch (error) {
-        if (error instanceof AitermError)
-            throw error;
-        throw new AitermError(`Claude user MCP設定を読めません: ${error.message}`, 2);
-    }
-    finally {
-        if (fd !== undefined)
-            fs.closeSync(fd);
-    }
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-        throw new AitermError("Claude user MCP設定のtop-level JSONはobjectである必要があります", 2);
-    }
-    const servers = parsed.mcpServers;
-    if (servers === undefined)
-        return null;
-    if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
-        throw new AitermError("Claude user MCP設定のmcpServersはobjectである必要があります", 2);
-    }
-    if (Object.keys(servers).length === 0)
-        return null;
-    const destination = agentManagedClaudeMcpConfigPath(name, launchId);
-    writeJson0600(destination, { mcpServers: servers });
-    return destination;
-}
 function realGrokHome() {
     return path.resolve(process.env.GROK_HOME || path.join(process.env.HOME ?? os.homedir(), ".grok"));
 }
@@ -1767,64 +1654,6 @@ function resolveAndValidateGrokAuth(srcHome) {
             fs.closeSync(fd);
     }
 }
-function writeManagedGrokConfig(grokHome) {
-    fs.mkdirSync(path.join(grokHome, "hooks"), { recursive: false, mode: 0o700 });
-    writeText0600(path.join(grokHome, "config.toml"), [
-        "[cli]",
-        "auto_update = false",
-        "",
-        "[features]",
-        "remote_fetch = false",
-        "managed_config = false",
-        "",
-        "[compat.claude]",
-        "skills = false",
-        "rules = false",
-        "agents = false",
-        "mcps = false",
-        "hooks = false",
-        "",
-        "[compat.cursor]",
-        "skills = false",
-        "rules = false",
-        "agents = false",
-        "mcps = false",
-        "hooks = false",
-        "",
-    ].join("\n"));
-}
-function createManagedGrokHome(name, launchId, authPath) {
-    const grokHome = agentManagedGrokHomePath(name, launchId);
-    const fakeHome = agentManagedGrokUserHomePath(name, launchId);
-    fs.mkdirSync(grokHome, { recursive: false, mode: 0o700 });
-    fs.mkdirSync(fakeHome, { recursive: false, mode: 0o700 });
-    fs.chmodSync(grokHome, 0o700);
-    fs.chmodSync(fakeHome, 0o700);
-    fs.symlinkSync(grokHome, path.join(fakeHome, ".grok"));
-    const hookScript = grokHookScriptPath();
-    if (!fs.existsSync(hookScript)) {
-        throw new AitermError(`Grok Stop hook wrapper が見つかりません。npm run build を実行してください: ${hookScript}`, 2);
-    }
-    writeManagedGrokConfig(grokHome);
-    writeJson0600(path.join(grokHome, "hooks", "aiterm-stop.json"), {
-        hooks: {
-            Stop: [
-                {
-                    hooks: [
-                        {
-                            type: "command",
-                            command: nodeHookCommand(hookScript),
-                            timeout: 10,
-                        },
-                    ],
-                },
-            ],
-        },
-    });
-    // Grok 0.2.87 は compat false でも ~/.claude/plugins の hook file を拾う。HOME を一時化して
-    // plugin/hook source を完全に 0 にする。実 HOME は必要なら hook/agent 側で参照できるよう env で渡す。
-    return { grokHome, home: fakeHome, authPath };
-}
 function writeAgentMetadata(meta) {
     writeJson0600(agentMetadataPath(meta.aiterm_session, meta.launch_id), meta);
 }
@@ -1959,7 +1788,7 @@ function parseClaudeApprovalScreen(screen) {
             question = i;
     }
     if (question < 0) {
-        throw new AitermError("managed Claudeの承認UIを現在画面で確認できません（Do you want to proceed? がありません）", 2);
+        throw new AitermError("aiterm相関付きClaudeの承認UIを現在画面で確認できません（Do you want to proceed? がありません）", 2);
     }
     const choices = [];
     const seen = new Set();
@@ -1978,13 +1807,13 @@ function parseClaudeApprovalScreen(screen) {
         if (!decision)
             continue;
         if (!Number.isSafeInteger(index) || index < 1 || seen.has(decision)) {
-            throw new AitermError("managed Claudeの承認UI選択肢が一意に解釈できません", 2);
+            throw new AitermError("aiterm相関付きClaudeの承認UI選択肢が一意に解釈できません", 2);
         }
         seen.add(decision);
         choices.push({ decision, index, label });
     }
     if (!seen.has("approve_once") || !seen.has("deny")) {
-        throw new AitermError("managed Claudeの承認UIに安全な単発Yes/No選択肢を確認できません", 2);
+        throw new AitermError("aiterm相関付きClaudeの承認UIに安全な単発Yes/No選択肢を確認できません", 2);
     }
     return {
         promptDigest: `sha256:${createHash("sha256").update(canonical, "utf8").digest("hex")}`,
@@ -1994,7 +1823,7 @@ function parseClaudeApprovalScreen(screen) {
 function assertExpectedClaudeOperation(meta, expectedOperationId) {
     const active = readClaudeOperationMarker(meta);
     if (!active)
-        throw new AitermError("managed Claudeに未解決のactive operationがありません", 2);
+        throw new AitermError("aiterm相関付きClaudeに未解決のactive operationがありません", 2);
     if (active.operationId !== expectedOperationId) {
         const actual = active.operationId ?? "operation_idなし";
         const expected = expectedOperationId ?? "operation_idなし";
@@ -2008,7 +1837,7 @@ export function runClaudeApproval({ action, session_id: name, operation_id: oper
         throw new AitermError(`session '${name}' が無い`, 2);
     const meta = loadAgentMetadata(name);
     if (meta.kind !== "claude")
-        throw new AitermError("claude_approvalはmanaged Claude agent sessionだけで使用できます", 2);
+        throw new AitermError("claude_approvalはaiterm相関付きClaude agent sessionだけで使用できます", 2);
     const operationId = operationIdInput == null ? null : validateOperationId(operationIdInput);
     if (action === "inspect") {
         if (approvalChoice != null || observedPromptDigest != null) {
@@ -2274,14 +2103,13 @@ function liveWaitLocks(name) {
     }
     return out;
 }
-function createClaudeAgentMetadata(name, cwd, initialPrompt, launchOperationId, launchRequestDigest) {
+function createClaudeAgentMetadata(name, cwd, initialPrompt, launchOperationId, launchRequestDigest, lineageContext) {
     const launchId = randomBytes(16).toString("hex");
     const eventFile = agentEventPath(name, launchId);
     const resultFile = agentClaudeResultPath(name, launchId);
     createEmpty0600NoFollow(eventFile);
     createEmpty0600NoFollow(resultFile);
-    const claudeSettings = createManagedClaudeSettings(name, launchId);
-    const claudeMcpConfig = createManagedClaudeMcpConfig(name, launchId);
+    const claudeSettings = createClaudeCorrelationSettings(name, launchId);
     const meta = {
         kind: "claude",
         aiterm_session: name,
@@ -2289,24 +2117,24 @@ function createClaudeAgentMetadata(name, cwd, initialPrompt, launchOperationId,
         event_file: eventFile,
         created_at: new Date().toISOString(),
         cwd,
-        vendor_session_id: null,
+        vendor_session_id: randomUUID(),
         initial_prompt: initialPrompt,
         launch_operation_id: launchOperationId,
         launch_request_digest: launchRequestDigest,
-        hook_route: "managed_claude_settings",
+        hook_route: "shared_claude_settings",
+        ...agentLineageFields(lineageContext),
         node_platform: process.platform,
         claude_settings: claudeSettings,
-        claude_mcp_config: claudeMcpConfig,
         result_file: resultFile,
     };
     writeAgentMetadata(meta);
     return meta;
 }
-function createCodexAgentMetadata(name, cwd, initialPrompt, overrides = {}, writeScope) {
+function createCodexAgentMetadata(name, cwd, initialPrompt, overrides = {}, writeScope, lineageContext) {
     const launchId = randomBytes(16).toString("hex");
     const eventFile = agentEventPath(name, launchId);
     createEmpty0600NoFollow(eventFile);
-    const codexHome = createManagedCodexHome(name, launchId, overrides);
+    const codexHome = realCodexHome();
     const meta = {
         kind: "codex",
         aiterm_session: name,
@@ -2317,19 +2145,20 @@ function createCodexAgentMetadata(name, cwd, initialPrompt, overrides = {}, writ
         ...(writeScope === undefined ? {} : { write_scope: writeScope }),
         vendor_session_id: null,
         initial_prompt: initialPrompt,
-        hook_route: "managed_codex_home",
+        hook_route: "shared_codex_home",
         completion_route: "codex_transcript",
+        ...(lineageContext ? agentLineageFields(lineageContext) : {}),
         node_platform: process.platform,
         codex_home: codexHome,
     };
     writeAgentMetadata(meta);
     return meta;
 }
-function createGrokAgentMetadata(kind, name, cwd, initialPrompt, authPath, writeScope) {
+function createGrokAgentMetadata(kind, name, cwd, initialPrompt, authPath, writeScope, lineageContext) {
     const launchId = randomBytes(16).toString("hex");
     const eventFile = agentEventPath(name, launchId);
     createEmpty0600NoFollow(eventFile);
-    const managed = createManagedGrokHome(name, launchId, authPath);
+    const grokHome = realGrokHome();
     const meta = {
         kind,
         aiterm_session: name,
@@ -2338,17 +2167,45 @@ function createGrokAgentMetadata(kind, name, cwd, initialPrompt, authPath, write
         created_at: new Date().toISOString(),
         cwd,
         ...(writeScope === undefined ? {} : { write_scope: writeScope }),
-        vendor_session_id: null,
+        vendor_session_id: randomUUID(),
         initial_prompt: initialPrompt,
-        hook_route: "managed_grok_home",
+        hook_route: "shared_grok_home",
+        completion_route: "grok_transcript",
+        ...(lineageContext ? agentLineageFields(lineageContext) : {}),
         node_platform: process.platform,
-        grok_home: managed.grokHome,
-        home: managed.home,
-        grok_auth_path: managed.authPath,
+        grok_home: grokHome,
+        grok_auth_path: authPath,
     };
     writeAgentMetadata(meta);
     return meta;
 }
+function loadAgentLineageFields(m, required) {
+    const present = m.agent_role !== undefined ||
+        m.parent_session_id !== undefined ||
+        m.delegation_depth !== undefined ||
+        m.lineage !== undefined ||
+        m.delegation_allowed !== undefined;
+    if (!present && !required)
+        return {};
+    if (m.agent_role !== "subagent" ||
+        typeof m.parent_session_id !== "string" ||
+        !/^[A-Za-z0-9_-]{1,64}$/.test(m.parent_session_id) ||
+        !Number.isSafeInteger(m.delegation_depth) ||
+        m.delegation_depth < 1 ||
+        typeof m.lineage !== "string" ||
+        m.lineage.length > 4096 ||
+        !AGENT_LINEAGE_RE.test(m.lineage) ||
+        m.delegation_allowed !== true) {
+        throw new AitermError("agent metadata のsub-agent lineageが不正です", 2);
+    }
+    return agentLineageFields({
+        agentRole: "subagent",
+        parentSessionId: m.parent_session_id,
+        delegationDepth: m.delegation_depth,
+        lineage: m.lineage,
+        delegationAllowed: true,
+    });
+}
 function loadAgentMetadata(name) {
     assertSessionName(name);
     const dir = agentsDir();
@@ -2356,7 +2213,7 @@ function loadAgentMetadata(name) {
         .readdirSync(dir)
         .filter((f) => f.startsWith(`${name}.`) && f.endsWith(".agent.json"));
     if (files.length === 0) {
-        throw new AitermError(`session '${name}' は agent_done 管理セッションではありません。claude_agent／codex_agent 等の launcher で起動してください（launcher は常に managed）。`, 2);
+        throw new AitermError(`session '${name}' は agent_done 管理セッションではありません。claude_agent／codex_agent 等の launcher で起動してください。`, 2);
     }
     if (files.length !== 1) {
         throw new AitermError(`session '${name}' の agent metadata が複数あります。閉じて起動し直してください。`, 2);
@@ -2381,14 +2238,13 @@ function loadAgentMetadata(name) {
     }
     if (m.kind === "claude") {
         const expectedSettings = agentManagedClaudeSettingsPath(name, m.launch_id);
-        const expectedMcpConfig = agentManagedClaudeMcpConfigPath(name, m.launch_id);
         const expectedResult = agentClaudeResultPath(name, m.launch_id);
-        const claudeMcpConfig = m.claude_mcp_config ?? null;
         const launchOperationId = m.launch_operation_id ?? null;
         const launchRequestDigest = m.launch_request_digest ?? null;
-        if (m.hook_route !== "managed_claude_settings" ||
+        if (m.hook_route !== "shared_claude_settings" ||
             m.claude_settings !== expectedSettings ||
-            (claudeMcpConfig !== null && claudeMcpConfig !== expectedMcpConfig) ||
+            typeof m.vendor_session_id !== "string" ||
+            !UUID_RE.test(m.vendor_session_id) ||
             m.result_file !== expectedResult ||
             ((launchOperationId === null) !== (launchRequestDigest === null)) ||
             (launchOperationId !== null && !OPERATION_ID_RE.test(launchOperationId)) ||
@@ -2403,20 +2259,20 @@ function loadAgentMetadata(name) {
             created_at: typeof m.created_at === "string" ? m.created_at : "",
             cwd: typeof m.cwd === "string" ? m.cwd : null,
             ...(typeof m.write_scope === "string" ? { write_scope: m.write_scope } : {}),
-            vendor_session_id: typeof m.vendor_session_id === "string" ? m.vendor_session_id : null,
+            vendor_session_id: m.vendor_session_id,
             initial_prompt: normalizeInitialPromptState(m.initial_prompt),
             launch_operation_id: launchOperationId,
             launch_request_digest: launchRequestDigest,
-            hook_route: "managed_claude_settings",
+            hook_route: "shared_claude_settings",
+            ...loadAgentLineageFields(m, true),
             node_platform: process.platform,
             claude_settings: expectedSettings,
-            claude_mcp_config: claudeMcpConfig === expectedMcpConfig ? expectedMcpConfig : null,
             result_file: expectedResult,
         };
     }
     if (m.kind === "codex") {
-        const expectedHome = agentManagedCodexHomePath(name, m.launch_id);
-        if (m.hook_route !== "managed_codex_home" || m.codex_home !== expectedHome) {
+        const expectedHome = realCodexHome();
+        if (m.hook_route !== "shared_codex_home" || m.completion_route !== "codex_transcript" || m.codex_home !== expectedHome) {
             throw new AitermError("agent metadata の path が現在の secure state root と一致しません", 2);
         }
         return {
@@ -2429,15 +2285,19 @@ function loadAgentMetadata(name) {
             ...(typeof m.write_scope === "string" ? { write_scope: m.write_scope } : {}),
             vendor_session_id: typeof m.vendor_session_id === "string" ? m.vendor_session_id : null,
             initial_prompt: normalizeInitialPromptState(m.initial_prompt),
-            hook_route: "managed_codex_home",
-            ...(m.completion_route === "codex_transcript" ? { completion_route: "codex_transcript" } : {}),
+            hook_route: "shared_codex_home",
+            completion_route: "codex_transcript",
+            ...loadAgentLineageFields(m, true),
             node_platform: process.platform,
             codex_home: expectedHome,
         };
     }
-    const expectedGrokHome = agentManagedGrokHomePath(name, m.launch_id);
-    const expectedHome = agentManagedGrokUserHomePath(name, m.launch_id);
-    if (m.hook_route !== "managed_grok_home" || m.grok_home !== expectedGrokHome || m.home !== expectedHome) {
+    const expectedGrokHome = realGrokHome();
+    if (m.hook_route !== "shared_grok_home" ||
+        m.completion_route !== "grok_transcript" ||
+        m.grok_home !== expectedGrokHome ||
+        typeof m.vendor_session_id !== "string" ||
+        !UUID_RE.test(m.vendor_session_id)) {
         throw new AitermError("agent metadata の path が現在の secure state root と一致しません", 2);
     }
     const expectedAuthPath = resolveAndValidateGrokAuth(realGrokHome());
@@ -2452,12 +2312,13 @@ function loadAgentMetadata(name) {
         created_at: typeof m.created_at === "string" ? m.created_at : "",
         cwd: typeof m.cwd === "string" ? m.cwd : null,
         ...(typeof m.write_scope === "string" ? { write_scope: m.write_scope } : {}),
-        vendor_session_id: typeof m.vendor_session_id === "string" ? m.vendor_session_id : null,
+        vendor_session_id: m.vendor_session_id,
         initial_prompt: normalizeInitialPromptState(m.initial_prompt),
-        hook_route: "managed_grok_home",
+        hook_route: "shared_grok_home",
+        completion_route: "grok_transcript",
+        ...loadAgentLineageFields(m, true),
         node_platform: process.platform,
         grok_home: expectedGrokHome,
-        home: expectedHome,
         grok_auth_path: expectedAuthPath,
     };
 }
@@ -2563,7 +2424,10 @@ function bindCompletedInitialPrompt(meta) {
         setInitialPromptState(meta, "done");
         return;
     }
-    if (meta.vendor_session_id) {
+    if ((meta.kind === "grok" || meta.kind === "composer") && meta.completion_route === "grok_transcript") {
+        if (!latestGrokCompletion(meta)) {
+            throw new AitermError(`agent session '${meta.aiterm_session}' は起動時 prompt の完了待ちです。${agentWaitGuide(meta.aiterm_session)}`, 2);
+        }
         setInitialPromptState(meta, "done");
         return;
     }
@@ -2597,6 +2461,9 @@ function tryLoadAgentMetadata(name) {
 function latestAgentDoneEvent(meta, expectedOperationId = null) {
     if (meta.kind === "codex")
         return latestCodexCompletion(meta);
+    if ((meta.kind === "grok" || meta.kind === "composer") && meta.completion_route === "grok_transcript") {
+        return latestGrokCompletion(meta);
+    }
     const size = safeStatSize(meta.event_file);
     if (size === 0)
         return null;
@@ -2732,10 +2599,52 @@ function listCodexTranscripts(codexHome) {
         }
     };
     visit(sessionsDir);
-    // managed CODEX_HOME では root TUI の rollout が最初に作られる。後から同じ home に
-    // sub-agent rollout が増えても root を取り違えないよう、未bind時は最古を選べる順にする。
     return files.sort();
 }
+function codexTranscriptMatchesLaunch(file, meta) {
+    const createdAt = Date.parse(meta.created_at);
+    try {
+        const st = fs.statSync(file);
+        if (Number.isFinite(createdAt) && st.mtimeMs + 5_000 < createdAt)
+            return false;
+    }
+    catch {
+        return false;
+    }
+    const size = Math.min(safeStatSize(file), 1024 * 1024);
+    if (size === 0)
+        return false;
+    const marker = `AITERM_AGENT_LAUNCH_ID=${meta.launch_id}`;
+    let rootCli = false;
+    let launchMarker = false;
+    for (const line of readFileRange(file, 0, size).toString("utf8").split("\n")) {
+        if (!line.trim())
+            continue;
+        let record;
+        try {
+            record = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        if (record?.type === "session_meta") {
+            rootCli = record?.payload?.originator === "codex-tui" && record?.payload?.source === "cli";
+            if (!rootCli)
+                return false;
+        }
+        if (record?.type === "response_item" &&
+            record?.payload?.type === "message" &&
+            record?.payload?.role === "developer" &&
+            Array.isArray(record?.payload?.content)) {
+            launchMarker ||= record.payload.content.some((item) => (item?.type === "input_text" || item?.type === "output_text") &&
+                typeof item?.text === "string" &&
+                item.text.includes(marker));
+        }
+        if (rootCli && launchMarker)
+            return true;
+    }
+    return false;
+}
 function codexTranscriptSessionId(file) {
     const size = Math.min(safeStatSize(file), AGENT_EVENT_TAIL_BYTES);
     if (size === 0)
@@ -2761,6 +2670,13 @@ function codexRootTranscript(meta) {
         return null;
     if (meta.vendor_session_id)
         return findLatestCodexTranscript(meta.codex_home, meta.vendor_session_id);
+    if (meta.hook_route === "shared_codex_home") {
+        const matches = listCodexTranscripts(meta.codex_home).filter((file) => codexTranscriptMatchesLaunch(file, meta));
+        if (matches.length > 1) {
+            throw new AitermError("共有CODEX_HOMEに同じlaunch markerのroot rolloutが複数あります。sessionを閉じて起動し直してください。", 2);
+        }
+        return matches[0] ?? null;
+    }
     return listCodexTranscripts(meta.codex_home)[0] ?? null;
 }
 function bindCodexTranscriptSession(meta) {
@@ -2812,7 +2728,84 @@ function latestCodexCompletion(meta) {
     }
     return latest;
 }
+function grokSessionDirectory(meta) {
+    if ((meta.kind !== "grok" && meta.kind !== "composer") || !meta.grok_home || !meta.vendor_session_id)
+        return null;
+    const cwd = meta.cwd ?? process.cwd();
+    return path.join(meta.grok_home, "sessions", encodeURIComponent(cwd), meta.vendor_session_id);
+}
+function grokEventsTranscript(meta) {
+    const dir = grokSessionDirectory(meta);
+    return dir ? path.join(dir, "events.jsonl") : null;
+}
+function grokCompletionEvent(meta, record) {
+    if ((meta.kind !== "grok" && meta.kind !== "composer") ||
+        record?.type !== "turn_ended" ||
+        (record?.outcome !== "completed" && record?.outcome !== "cancelled"))
+        return null;
+    const turnId = typeof record?.ts === "string" || typeof record?.ts === "number" ? String(record.ts) : null;
+    return {
+        type: "agent_done",
+        vendor: meta.kind,
+        aiterm_session: meta.aiterm_session,
+        launch_id: meta.launch_id,
+        vendor_session_id: meta.vendor_session_id,
+        turn_id: turnId,
+        operation_id: null,
+        reason: `Grok transcript turn_ended:${record.outcome}`,
+        done_status: "turn_done",
+        stop_hook_active: false,
+        at: typeof record?.ts === "string" ? record.ts : new Date().toISOString(),
+    };
+}
+function latestGrokCompletion(meta) {
+    const transcript = grokEventsTranscript(meta);
+    if (!transcript || !fs.existsSync(transcript))
+        return null;
+    let latest = null;
+    for (const line of readTranscriptLines(transcript)) {
+        if (!line.trim())
+            continue;
+        try {
+            latest = grokCompletionEvent(meta, JSON.parse(line)) ?? latest;
+        }
+        catch {
+            // 末尾書込み中のlineは次の観測で完結してから読む。
+        }
+    }
+    return latest;
+}
+function grokInitializationComplete(meta) {
+    const transcript = grokEventsTranscript(meta);
+    if (!transcript || !fs.existsSync(transcript))
+        return false;
+    const size = safeStatSize(transcript);
+    const from = Math.max(0, size - GROK_TRANSCRIPT_INCREMENT_MAX_BYTES);
+    const lines = readFileRange(transcript, from, size).toString("utf8").split("\n");
+    if (from > 0)
+        lines.shift();
+    for (let index = lines.length - 1; index >= 0; index -= 1) {
+        const line = lines[index].trim();
+        if (!line)
+            continue;
+        try {
+            const record = JSON.parse(line);
+            if (record?.type === "mcp_init_completed")
+                return true;
+            if (record?.type === "mcp_init_started")
+                return false;
+        }
+        catch {
+            // 末尾書込み中や無関係な破損lineはready判定を進めない。
+        }
+    }
+    return false;
+}
 function agentCompletionCursor(meta) {
+    if ((meta.kind === "grok" || meta.kind === "composer") && meta.completion_route === "grok_transcript") {
+        const transcript = grokEventsTranscript(meta);
+        return transcript ? safeStatSize(transcript) : 0;
+    }
     if (meta.kind !== "codex")
         return safeStatSize(meta.event_file);
     const transcript = bindCodexTranscriptSession(meta);
@@ -3176,6 +3169,80 @@ async function observeCodexDone(meta, timeout, requestedCursor) {
         await sleep(AGENT_DONE_POLL_MS);
     }
 }
+async function observeGrokDone(meta, timeout, requestedCursor) {
+    const metadataFile = agentMetadataPath(meta.aiterm_session, meta.launch_id);
+    const transcript = grokEventsTranscript(meta);
+    if (!transcript)
+        throw new AitermError("Grok transcriptのsession相関情報がありません", 2);
+    const startOffset = requestedCursor ?? safeStatSize(transcript);
+    let cursor = startOffset;
+    let carry = "";
+    let malformedEvents = 0;
+    let discardLeadingFragment = false;
+    let initializedBoundary = false;
+    const deadline = performance.now() + timeout * 1000;
+    const observation = (outcome, ev = null) => ({
+        schema: "aiterm.agent-wait-result.v1",
+        session_id: meta.aiterm_session,
+        launch_id: meta.launch_id,
+        vendor: meta.kind,
+        outcome,
+        operation_id: null,
+        vendor_session_id: meta.vendor_session_id,
+        turn_id: ev?.turn_id ?? null,
+        malformed_events: malformedEvents,
+        at: ev?.at ?? null,
+    });
+    for (;;) {
+        if (!fs.existsSync(metadataFile))
+            return observation("closed");
+        if (fs.existsSync(transcript)) {
+            if (!initializedBoundary) {
+                if (cursor > 0) {
+                    const previous = readFileRange(transcript, cursor - 1, cursor).toString("utf8");
+                    discardLeadingFragment = previous !== "\n";
+                }
+                initializedBoundary = true;
+            }
+            const size = safeStatSize(transcript);
+            if (size < cursor) {
+                throw new AitermError("Grok transcript が完了待機中に短くなりました。該当セッションを閉じて起動し直してください。", 2);
+            }
+            if (size - startOffset > GROK_TRANSCRIPT_INCREMENT_MAX_BYTES) {
+                throw new AitermError("Grok transcript のturn増分が大きすぎます。該当セッションを閉じて起動し直してください。", 2);
+            }
+            if (size > cursor) {
+                carry += readFileRange(transcript, cursor, size).toString("utf8");
+                cursor = size;
+                const parts = carry.split("\n");
+                carry = parts.pop() ?? "";
+                if (discardLeadingFragment && parts.length > 0) {
+                    parts.shift();
+                    discardLeadingFragment = false;
+                }
+                for (const line of parts) {
+                    if (!line.trim())
+                        continue;
+                    if (Buffer.byteLength(line, "utf8") > AGENT_EVENT_MAX_BYTES) {
+                        malformedEvents++;
+                        continue;
+                    }
+                    try {
+                        const done = grokCompletionEvent(meta, JSON.parse(line));
+                        if (done)
+                            return observation("done", done);
+                    }
+                    catch {
+                        malformedEvents++;
+                    }
+                }
+            }
+        }
+        if (performance.now() >= deadline)
+            return observation(timeout === 0 ? "running" : "timeout");
+        await sleep(AGENT_DONE_POLL_MS);
+    }
+}
 // 外部waiterプロセス用の純リーダー観測。lock・PTY・metadata書込・dispatch状態には一切触れない。
 // Codexはrollout transcript、他vendorはevent fileを増分走査し、vendor_session_idのbind永続化を
 // 行わない（waiterは観測者であって所有者でない）。
@@ -3192,6 +3259,9 @@ export async function observeAgentDone(name, o = {}) {
     if (meta.kind === "codex" && meta.completion_route === "codex_transcript") {
         return observeCodexDone(meta, timeout, o.cursor);
     }
+    if ((meta.kind === "grok" || meta.kind === "composer") && meta.completion_route === "grok_transcript") {
+        return observeGrokDone(meta, timeout, o.cursor);
+    }
     const metadataFile = agentMetadataPath(meta.aiterm_session, meta.launch_id);
     // 境界の優先順: dispatch receipt の event_cursor（起動順序に依存しない）→ operation相関
     // （operation_idの一意性で先頭から全走査できる）→ waiter起動時EOF（waiter先行起動が前提）。
@@ -3250,7 +3320,10 @@ function isAgentTuiReady(kind, screen) {
     if (kind === "codex") {
         return screen.includes("OpenAI Codex") && /(^|\n)\s*[›>]/.test(screen);
     }
-    return screen.includes("Grok Build") && /(^|\n|\s)❯/.test(screen);
+    // Grok Build 0.2.117 は起動完了後に製品名を消し、model footerだけを残す。
+    // Composerも同じfrontendでmodel名だけが異なるため、両方をvendor UIの根拠にする。
+    const grokFrontend = screen.includes("Grok Build") || /\b(?:Grok|Composer)\s+[\w.()-]+/.test(screen);
+    return grokFrontend && /(^|\n|\s)❯/.test(screen);
 }
 // Codex/Claude は実行中に「(esc to interrupt)」を表示する（実機採取）。startup 側の処理
 // （MCP initialize 等）が走ったまま composer だけ描画されている画面は入力受付とみなさない。
@@ -3289,7 +3362,11 @@ async function waitAgentTuiReadyImpl(kind, sample, sleepFn, opts = {}) {
     }
 }
 async function waitAgentTuiReady(name, meta, timeoutMs = AGENT_TUI_READY_TIMEOUT_MS) {
-    return waitAgentTuiReadyImpl(meta.kind, () => captureScreen(name, AGENT_TUI_READY_LINES), sleep, { timeoutMs });
+    return waitAgentTuiReadyImpl(meta.kind, () => {
+        if ((meta.kind === "grok" || meta.kind === "composer") && !grokInitializationComplete(meta))
+            return "";
+        return captureScreen(name, AGENT_TUI_READY_LINES);
+    }, sleep, { timeoutMs });
 }
 async function waitAgentTuiReadyByKind(name, kind, timeoutMs = AGENT_TUI_READY_TIMEOUT_MS) {
     return waitAgentTuiReadyImpl(kind, () => captureScreen(name, AGENT_TUI_READY_LINES), sleep, { timeoutMs });
@@ -3493,9 +3570,10 @@ export async function dispatchAgentTurn(name, text, o = {}) {
         throw new AitermError("operation_id はClaude agent sessionだけで使用できます", 2);
     }
     bindCompletedInitialPrompt(meta);
-    // Codexはbind済みのfollow-upでも毎回idleを確認してからtranscript境界を切る。同じcursorへ
-    // 複数turnを帰属させる余地を作らない。他vendorの既存dispatch条件は変えない。
-    if (meta.kind === "codex" || !meta.vendor_session_id) {
+    // Codex/Grok/Composerはbind済みのfollow-upでも毎回idleを確認してからtranscript境界を切る。
+    // Grok/Composerはsession IDが起動前から既知でも、共有MCPの初期化完了前には送信しない。
+    // 同じcursorへ複数turnを帰属させる余地や、初期化中TUIへの早送信を作らない。
+    if (meta.kind !== "claude" || !meta.vendor_session_id) {
         const ready = await waitAgentTuiReady(name, meta, o.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
         if (!ready.ready) {
             throw new AitermError(`agent session '${name}' の ${agentLabel(meta.kind)} TUI が入力受付状態になりません。文字列は送信していません。` +
@@ -3544,7 +3622,7 @@ export async function runClaudeOperation({ session_id: name, action, operation_i
     const operationId = validateOperationId(operationIdInput);
     const meta = loadAgentMetadata(name);
     if (meta.kind !== "claude")
-        throw new AitermError("claude_turnはmanaged Claude agent sessionだけで使用できます", 2);
+        throw new AitermError("claude_turnはaiterm相関付きClaude agent sessionだけで使用できます", 2);
     let dispatchReceipt = null;
     if (action === "issue") {
         if (typeof text !== "string" || text.length === 0) {
@@ -3655,7 +3733,7 @@ function assertClaudeAuthenticationReady(bin) {
         status.loggedIn === false) {
         throw new AitermError("Claude Codeの認証を利用できません。sessionは作成していません。" +
             "通常端末で `claude doctor` を実行し、Keychain／credential storeを直してから一度だけ `claude auth login` を実行してください。" +
-            "managed Claude session内で /login を繰り返さないでください。", 2);
+            "aiterm相関付きClaude session内で /login を繰り返さないでください。", 2);
     }
     const timedOut = result.error && result.error.code === "ETIMEDOUT";
     throw new AitermError(`Claude Codeの認証状態を起動前に確認できません${timedOut ? "（5秒でtimeout）" : ""}。sessionは作成していません。` +
@@ -3698,9 +3776,7 @@ function buildAgentCmd(kind, bin, model, effort, prompt, meta = null) {
     const parts = [shq(bin)];
     if (kind === "claude") {
         if (meta?.kind === "claude") {
-            parts.push("--setting-sources", shq(""), "--settings", shq(meta.claude_settings ?? ""));
-            if (meta.claude_mcp_config)
-                parts.push("--mcp-config", shq(meta.claude_mcp_config));
+            parts.push("--setting-sources", shq("user,project,local"), "--settings", shq(meta.claude_settings ?? ""), "--session-id", shq(meta.vendor_session_id ?? ""), "--append-system-prompt", shq(subagentInstruction(meta)));
         }
         if (model)
             parts.push("--model", shq(model));
@@ -3712,12 +3788,14 @@ function buildAgentCmd(kind, bin, model, effort, prompt, meta = null) {
         // launcher自身が実効能力壁を作る。パス説明はCodex CLIに同等のallowlist引数がないため宣言のまま残す。
         if (meta?.kind === "codex" && meta.write_scope === "read-only")
             parts.push("--sandbox", "read-only");
-        // model/effort は CLI 引数で明示（config 継承より優先）。agent_done 時は managed home 側
-        // config.toml も同値で上書き済み（applyCodexConfigOverrides）。
+        // model/effort は共有configを書き換えず、CLI引数で明示して起動単位に優先する。
         if (model)
             parts.push("-m", shq(model));
         if (effort)
             parts.push("-c", `model_reasoning_effort=${shq(effort)}`);
+        if (meta?.kind === "codex" && meta.hook_route === "shared_codex_home") {
+            parts.push("-c", `developer_instructions=${shq(subagentInstruction(meta))}`);
+        }
     }
     else {
         // grok / composer は同じ grok CLI をモデル違いで起動。--effort は headless（grok -p）専用で
@@ -3726,6 +3804,9 @@ function buildAgentCmd(kind, bin, model, effort, prompt, meta = null) {
         if (meta?.kind === "grok" || meta?.kind === "composer")
             parts.push("--no-alt-screen");
         parts.push("--model", shq(model ?? GROK_MODEL_DEFAULTS[kind]));
+        if ((meta?.kind === "grok" || meta?.kind === "composer") && meta.hook_route === "shared_grok_home") {
+            parts.push("--session-id", shq(meta.vendor_session_id ?? ""), "--rules", shq(subagentInstruction(meta)));
+        }
         if ((meta?.kind === "grok" || meta?.kind === "composer") && prompt)
             parts.push("--verbatim");
     }
@@ -3741,29 +3822,21 @@ function agentEnvPrefix(meta, sid) {
         `AITERM_SESSION_ID=${shq(sid)}`,
         `AITERM_AGENT_SESSION_ID=${shq(sid)}`,
         `AITERM_AGENT_LAUNCH_ID=${shq(meta.launch_id)}`,
+        `AITERM_AGENT_ROLE=${shq(meta.agent_role ?? "subagent")}`,
+        `AITERM_AGENT_PARENT_SESSION_ID=${shq(meta.parent_session_id ?? "host-root")}`,
+        `AITERM_AGENT_DEPTH=${shq(String(meta.delegation_depth ?? 1))}`,
+        `AITERM_AGENT_LINEAGE=${shq(meta.lineage ?? `host-root>${meta.kind}:${sid}`)}`,
+        `AITERM_AGENT_DELEGATION_ALLOWED=${shq(meta.delegation_allowed === true ? "true" : "false")}`,
     ];
     if (meta.kind === "claude") {
         return common.join(" ") + " ";
     }
     if (meta.kind === "codex") {
-        return [`CODEX_HOME=${shq(meta.codex_home ?? "")}`, ...common].join(" ") + " ";
+        return common.join(" ") + " ";
     }
     return [
-        `HOME=${shq(meta.home ?? "")}`,
-        `GROK_HOME=${shq(meta.grok_home ?? "")}`,
         ...(meta.grok_auth_path ? [`GROK_AUTH_PATH=${shq(meta.grok_auth_path)}`] : []),
         "GROK_DISABLE_AUTOUPDATER=1",
-        "GROK_CLAUDE_HOOKS_ENABLED=false",
-        "GROK_CURSOR_HOOKS_ENABLED=false",
-        "GROK_CLAUDE_SKILLS_ENABLED=false",
-        "GROK_CURSOR_SKILLS_ENABLED=false",
-        "GROK_CLAUDE_RULES_ENABLED=false",
-        "GROK_CURSOR_RULES_ENABLED=false",
-        "GROK_CLAUDE_AGENTS_ENABLED=false",
-        "GROK_CURSOR_AGENTS_ENABLED=false",
-        "GROK_CLAUDE_MCPS_ENABLED=false",
-        "GROK_CURSOR_MCPS_ENABLED=false",
-        `AITERM_REAL_HOME=${shq(process.env.HOME ?? os.homedir())}`,
         ...common,
     ].join(" ") + " ";
 }
@@ -3808,7 +3881,7 @@ function buildAgentLaunchNote(kind, model, effort, meta) {
         (effectiveEffort === "ultra"
             ? "⚠ effort=ultra は max 推論＋proactive 自動委譲 ON（子エージェント自動生成・使用量急増に注意）。"
             : "");
-    const summary = meta?.kind === "codex" && meta.codex_home ? managedCodexConfigSummary(configPath) : "";
+    const summary = meta?.kind === "codex" && meta.codex_home ? codexConfigSummary(configPath) : "";
     return (summary ? `${launch}\n${summary}\n` : launch) + writeScopeNote;
 }
 function claudeLaunchRequestDigest({ sessionName, model, effort, cwd, agentDone, }) {
@@ -3886,6 +3959,8 @@ export function openAgent(kind, opts = {}) {
             throw new AitermError("launch_operation_id付きlaunchにpromptは指定できません", 2);
         }
     }
+    // 継承lineageの破損はsession作成前にfail loudする。root callerにはhost-root/depth 1を割り当てる。
+    const lineageSeed = readAgentLineageSeed();
     let bin;
     try {
         bin = resolveAgentBin(kind);
@@ -3956,12 +4031,13 @@ export function openAgent(kind, opts = {}) {
     }
     let launchNote = "";
     try {
+        const lineageContext = createAgentLineageContext(kind, sid, lineageSeed);
         const meta = agentDone
             ? kind === "claude"
-                ? createClaudeAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", launchOperationId, launchRequestDigest)
+                ? createClaudeAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", launchOperationId, launchRequestDigest, lineageContext)
                 : kind === "codex"
-                    ? createCodexAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", { model, effort }, writeScope)
-                    : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none", grokAuthPath, writeScope)
+                    ? createCodexAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", { model, effort }, writeScope, lineageContext)
+                    : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none", grokAuthPath, writeScope, lineageContext)
             : null;
         if (meta)
             agentMetadataNegativeCache.delete(sid);
@@ -4001,7 +4077,7 @@ export function openAgent(kind, opts = {}) {
     return [
         sid,
         `${label} を session ${sid} で起動した。${launchNote}${agentDone ? "agent_done 待機が有効。" : ""}` +
-            `${agentDone && (kind === "grok" || kind === "composer") ? " hook 汚染防止のため Grok 実行中は一時 HOME を使う。" : ""}\n${hint}\n` +
+            `${agentDone ? " 通常のproject／user環境を共有し、aiterm所有の完了相関とsub-agent lineageだけを加算。" : ""}\n${hint}\n` +
             driveHint +
             `起動直後に増分 pty_read すると空/半描画になり得るので screen:true を使う。`,
     ];
@@ -4009,7 +4085,7 @@ export function openAgent(kind, opts = {}) {
 export async function openAgentWithInitialPrompt(kind, opts = {}) {
     const prompt = opts.prompt ?? null;
     if (opts.launch_operation_id != null && prompt !== null) {
-        throw new AitermError("launch_operation_idはpromptなしのmanaged Claude launchだけで指定できます", 2);
+        throw new AitermError("launch_operation_idはpromptなしのClaude相関launchだけで指定できます", 2);
     }
     // v0.16.0: launcher は常に managed（Stop hook つき）で立つ。手動運転したい場合は
     // pty_open で素の PTY を開き、vendor CLI を自分で send する。