aiterm-mcp 0.27.8 → 0.28.0

package/dist/agent-resolver.js

@@ -1,4 +1,4 @@
-// エージェント CLI（claude / codex / grok）・Throughline・pane shell（Windows は Git Bash）の
+// エージェント CLI（claude / codex / grok / cursor-agent）・Throughline・pane shell（Windows は Git Bash）の
 // 実行ファイルをどう見つけ、どう起動するかの所有者（OS 分岐の所有者。tmux とは独立）。
 import { spawnSync } from "node:child_process";
 import * as fs from "node:fs";
@@ -115,7 +115,9 @@ export function resolveAgentBin(kind) {
         ? ["CLAUDE_BIN", [".local", "bin", "claude"], "claude"]
         : kind === "codex"
             ? ["CODEX_BIN", [".local", "bin", "codex"], "codex"]
-            : ["GROK_BIN", [".grok", "bin", isWin ? "grok.exe" : "grok"], "grok"];
+            : kind === "cursor"
+                ? ["CURSOR_AGENT_BIN", [".local", "bin", "cursor-agent"], "cursor-agent"]
+                : ["GROK_BIN", [".grok", "bin", isWin ? "grok.exe" : "grok"], "grok"];
     const fromEnv = process.env[envVar];
     if (fromEnv) {
         // 明示指定 env は実在を検証する。存在しないパスを黙って返すと、session を作って
@@ -125,9 +127,16 @@ export function resolveAgentBin(kind) {
             return resolveWindowsCodexShim(kind, fromEnv);
         throw new AitermError(`${envVar} に指定された ${name} が存在しません: ${fromEnv}`, 2);
     }
-    const cand = path.join(home, ...rel);
-    if (isUsableAgentExecutableFile(cand))
-        return resolveWindowsCodexShim(kind, cand);
+    const defaultCandidates = [path.join(home, ...rel)];
+    if (kind === "cursor" && isWin && process.env.LOCALAPPDATA) {
+        // Cursor公式Windows installerは %LOCALAPPDATA%\cursor-agent をPATHへ追加し、
+        // cursor-agent.exe/cmdを置く。GUI hostの古いPATHでも公式配置を直接解決する。
+        defaultCandidates.unshift(path.join(process.env.LOCALAPPDATA, "cursor-agent", "cursor-agent.exe"), path.join(process.env.LOCALAPPDATA, "cursor-agent", "cursor-agent.cmd"));
+    }
+    for (const cand of defaultCandidates) {
+        if (isUsableAgentExecutableFile(cand))
+            return resolveWindowsCodexShim(kind, cand);
+    }
     const w = spawnSync(isWin ? "where" : "which", [name], {
         encoding: "utf8",
         timeout: 5000,

package/dist/agent-shared.js

@@ -164,7 +164,18 @@ export function agentLabel(kind) {
             ? "Grok Build(Composer)"
             : kind === "grok"
                 ? "Grok Build(Grok)"
-                : "Codex";
+                : kind === "cursor"
+                    ? "Cursor Agent CLI"
+                    : "Codex";
+}
+export function agentHarness(kind) {
+    return kind === "claude"
+        ? "claude-code"
+        : kind === "codex"
+            ? "codex-cli"
+            : kind === "cursor"
+                ? "cursor-cli"
+                : "grok-cli";
 }
 export function subagentInstruction(meta) {
     if (meta.agent_role !== "subagent" ||
@@ -193,10 +204,12 @@ export function subagentInstruction(meta) {
 export function writeScopeLaunchNote(kind, writeScope) {
     return writeScope === undefined
         ? ""
-        : (kind === "codex" || kind === "grok" || kind === "composer") && writeScope === "read-only"
-            ? `\n能力宣言: write_scope=${JSON.stringify(writeScope)}。${agentLabel(kind)} CLIへ --sandbox read-only を付与し、書込みを実効禁止。` +
-                (kind === "codex" ? "" : "MCPツール許可は --always-approve で自動承認（sandbox内のため能力拡大なし）。")
-            : `\n能力宣言: write_scope=${JSON.stringify(writeScope)}。パス単位のsandbox allowlistに対応するCLI引数がないため宣言の記録のみ（構造的unsupported）。`;
+        : kind === "cursor" && writeScope === "read-only"
+            ? `\n能力宣言: write_scope=${JSON.stringify(writeScope)}。Cursor Agent CLIへ --mode ask を付与し、書込みを実効禁止。`
+            : (kind === "codex" || kind === "grok" || kind === "composer") && writeScope === "read-only"
+                ? `\n能力宣言: write_scope=${JSON.stringify(writeScope)}。${agentLabel(kind)} CLIへ --sandbox read-only を付与し、書込みを実効禁止。` +
+                    (kind === "codex" ? "" : "MCPツール許可は --always-approve で自動承認（sandbox内のため能力拡大なし）。")
+                : `\n能力宣言: write_scope=${JSON.stringify(writeScope)}。パス単位のsandbox allowlistに対応するCLI引数がないため宣言の記録のみ（構造的unsupported）。`;
 }
 export function agentLineageFields(context) {
     return {

package/dist/aiterm-wait-cli.js

@@ -42,7 +42,7 @@ export function parseArgs(argv) {
                 if (cursor !== null)
                     throw new Error(`--cursor が重複しています。${USAGE}`);
                 if (!/^\d+$/.test(v))
-                    throw new Error(`--cursor は0以上の整数byte offsetだけを受理します。${USAGE}`);
+                    throw new Error(`--cursor は0以上の整数完了境界だけを受理します。${USAGE}`);
                 cursor = Number(v);
             }
             else {

package/dist/core.js

@@ -13,14 +13,16 @@ import * as path from "node:path";
 import { createHash, randomBytes } from "node:crypto";
 import * as rtk from "./rtk.js";
 import { AitermError, telemetryOwnedFailure, ownTelemetryFailure } from "./errors.js";
-import { isWin, SOCKDIR, tmuxCommand, loadPtyBufferChunk, pasteBufferBaseArgs, TMUX_EMPTY_CONFIG, attachCommand, normalizePaneCommand, settlePaneLog, paneCwdArgument, } from "./tmux-runtime.js";
-import { sleep, currentUid, runtimeStateBase, safeStatSize, readFileRange, writeJson0600, createEmpty0600, shq, LAUNCH_ID_RE, AGENT_DONE_POLL_MS, AGENT_EVENT_MAX_BYTES, assertSessionName, agentsDir, agentEventPath, agentMetadataPath, writeAgentMetadata, AGENT_EVENT_TAIL_BYTES, agentLabel, agentLineageFields, } from "./agent-shared.js";
+import { isWin, SOCKDIR, tmuxCommand, loadPtyBufferChunk, pasteBufferBaseArgs, TMUX_EMPTY_CONFIG, attachCommand, normalizePaneCommand, appendMarkSentinel, settlePaneLog, paneCwdArgument, } from "./tmux-runtime.js";
+import { sleep, currentUid, runtimeStateBase, safeStatSize, readFileRange, writeJson0600, createEmpty0600, shq, LAUNCH_ID_RE, AGENT_DONE_POLL_MS, AGENT_EVENT_MAX_BYTES, assertSessionName, agentsDir, agentEventPath, agentMetadataPath, writeAgentMetadata, AGENT_EVENT_TAIL_BYTES, agentLabel, agentHarness, subagentInstruction, agentLineageFields, } from "./agent-shared.js";
 import { GROK_MODEL_DEFAULTS, realGrokHome, resolveAndValidateGrokAuth, assertGrokModelAvailable, grokEventsTranscript, latestGrokCompletion, grokInitializationComplete, observeGrokDone, buildGrokAgentCmd, grokLaunchNote, grokEnvTokens, grokTuiReady, GROK_COMPOSER_MARKER_RE, grokFooterHasConfiguration, grokTranscriptText, createGrokAgentMetadata, } from "./vendors/grok.js";
 import { bindCodexTranscriptSession, latestCodexCompletion, observeCodexDone, buildCodexAgentCmd, codexLaunchNote, codexTuiReady, CODEX_COMPOSER_MARKER_RE, codexModelChoice, codexEffortChoice, codexMoreReasoningChoice, codexTranscriptText, createCodexAgentMetadata, } from "./vendors/codex.js";
 import { OPERATION_ID_RE, CLAUDE_RESULT_MAX_BYTES, CLAUDE_EFFORTS, agentManagedClaudeSettingsPath, agentClaudeResultPath, agentClaudeOperationPath, agentClaudeApprovalReceiptPath, agentClaudeDispatchReceiptPath, validateOperationId, readClaudeResultText, assertClaudeAuthenticationReady, buildClaudeAgentCmd, claudeLaunchNote, claudeTuiReady, CLAUDE_COMPOSER_MARKER_RE, createClaudeAgentMetadata, } from "./vendors/claude.js";
+import { bindCursorTranscriptSession, cursorTurnBoundary, latestCursorCompletion, observeCursorDone, cursorTranscriptText, assertCursorAuthenticationReady, assertCursorModelAvailable, buildCursorAgentCmd, createCursorAgentMetadata, cursorLaunchNote, cursorEffortNavigation, cursorTuiReady, CURSOR_COMPOSER_MARKER_RE, validateCursorModelEffort, } from "./vendors/cursor.js";
 import { resolveAgentBin, resolveThroughlineBin, runThroughlineHandoffContext, isWindowsNativeExecutable, agentBinForPaneShell, resolveWinPaneShell } from "./agent-resolver.js";
 export { AitermError } from "./errors.js";
 export { tmuxSpawnEnv } from "./tmux-runtime.js";
+export { agentHarness } from "./agent-shared.js";
 // 完了検出
 export const DEFAULT_TIMEOUT = 10.0;
 const POLL = 0.25;
@@ -202,11 +204,12 @@ function cleanupAgentState(name) {
                     f.endsWith(".claude-settings.json") ||
                     f.endsWith(".claude-mcp.json") ||
                     f.endsWith(".claude-result.json") ||
+                    f.endsWith(".cursor-result.json") ||
                     f.endsWith(".claude-operation.json") ||
                     f.endsWith(".claude-approval.json") ||
                     f.endsWith(".claude-dispatch"))
                     fs.unlinkSync(p);
-                else if (f.endsWith(".codex-home") || f.endsWith(".grok-home") || f.endsWith(".home")) {
+                else if (f.endsWith(".codex-home") || f.endsWith(".grok-home") || f.endsWith(".cursor-plugin") || f.endsWith(".home")) {
                     fs.rmSync(p, { recursive: true, force: true });
                 }
             }
@@ -651,10 +654,11 @@ export function send(name, text, o = {}) {
     assertInitialPromptNotPendingForSend(name, !!o.force);
     assertManagedClaudeCredentialCommandNotSent(name, text);
     text = prepareSendText(text, o);
+    let fg = "";
     if (o.mark) {
         // mark の sentinel は POSIX シェル構文。前面が fish/csh/tcsh 等の非 POSIX 対話シェルだと "$?" が
         // 壊れて sentinel が成立しない。黙って壊れた完了検出を作らず、明示エラーで until を促す（B8）。
-        const fg = paneCurrentCommand(name);
+        fg = paneCurrentCommand(name);
         if (NON_POSIX_MARK_SHELLS.has(fg)) {
             throw new AitermError(`mark は POSIX シェル(bash/sh/zsh/dash)前提です。前面が ${fg} のため sentinel の "$?" が` +
                 `正しく展開されません。until で完了パターンを指定してください。`, 2);
@@ -675,7 +679,7 @@ export function send(name, text, o = {}) {
         if (o.rtk && !o.force)
             assertNotDestructive(text, 3, "rtk 変換後: ");
         if (o.mark)
-            text = text + `; printf '\\n<<<AITERM_DONE rc=%d>>>\\n' "$?"`;
+            text = appendMarkSentinel(text, fg);
         assertSendTextSize(text, o.rtk || o.mark ? "変換後の送信文字列" : "送信文字列");
         const reportedText = text;
         if (!o.raw && text.includes("\n") && ATOMIC_MULTILINE_SHELLS.has(paneCurrentCommand(name))) {
@@ -922,6 +926,7 @@ export function listSessions() {
                 return line;
             const agent = [
                 `agent=${meta.kind}`,
+                `harness=${agentHarness(meta.kind)}`,
                 "agent_done=true",
                 meta.write_scope === undefined ? null : `write_scope=${JSON.stringify(meta.write_scope)}`,
                 meta.vendor_session_id ? `vendor_session_id=${meta.vendor_session_id}` : null,
@@ -1583,7 +1588,7 @@ function loadAgentMetadata(name) {
         throw new AitermError(`agent metadata を読めません: ${e.message}`, 2);
     }
     const m = raw;
-    if ((m.kind !== "claude" && m.kind !== "codex" && m.kind !== "grok" && m.kind !== "composer") ||
+    if ((m.kind !== "claude" && m.kind !== "codex" && m.kind !== "grok" && m.kind !== "composer" && m.kind !== "cursor") ||
         m.aiterm_session !== name ||
         typeof m.launch_id !== "string" ||
         !LAUNCH_ID_RE.test(m.launch_id)) {
@@ -1654,6 +1659,31 @@ function loadAgentMetadata(name) {
             codex_home: recordedHome,
         };
     }
+    if (m.kind === "cursor") {
+        const recordedHome = m.cursor_home;
+        if (m.hook_route !== "shared_cursor_home" ||
+            m.completion_route !== "cursor_transcript" ||
+            typeof recordedHome !== "string" ||
+            !path.isAbsolute(recordedHome)) {
+            throw new AitermError("agent metadata の cursor_home が不正です（絶対パスの記録が必要）", 2);
+        }
+        return {
+            kind: "cursor",
+            aiterm_session: name,
+            launch_id: m.launch_id,
+            event_file: expectedEvent,
+            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,
+            initial_prompt: normalizeInitialPromptState(m.initial_prompt),
+            hook_route: "shared_cursor_home",
+            completion_route: "cursor_transcript",
+            ...loadAgentLineageFields(m, true),
+            node_platform: process.platform,
+            cursor_home: recordedHome,
+        };
+    }
     // grok_home も codex_home と同じ理由で per-launch の記録値を正とする（席専用 GROK_HOME）。
     // 認証正本の照合も記録された home に対して行う——現在の env の home と比較すると、
     // 席専用 home で起動した session が別 instance から拒否される。
@@ -1790,6 +1820,15 @@ function bindCompletedInitialPrompt(meta) {
         setInitialPromptState(meta, "done");
         return;
     }
+    if (meta.kind === "cursor" && meta.completion_route === "cursor_transcript") {
+        const done = latestCursorCompletion(meta, readTranscriptLines);
+        if (!done) {
+            throw new AitermError(`agent session '${meta.aiterm_session}' は起動時 prompt の完了待ちです。${agentWaitGuide(meta.aiterm_session)}`, 2);
+        }
+        bindAgentVendorSession(meta, done);
+        setInitialPromptState(meta, "done");
+        return;
+    }
     if ((meta.kind === "grok" || meta.kind === "composer") && meta.completion_route === "grok_transcript") {
         if (!latestGrokCompletion(meta, readTranscriptLines)) {
             throw new AitermError(`agent session '${meta.aiterm_session}' は起動時 prompt の完了待ちです。${agentWaitGuide(meta.aiterm_session)}`, 2);
@@ -1827,6 +1866,9 @@ function tryLoadAgentMetadata(name) {
 function latestAgentDoneEvent(meta, expectedOperationId = null) {
     if (meta.kind === "codex")
         return latestCodexCompletion(meta, readTranscriptLines);
+    if (meta.kind === "cursor" && meta.completion_route === "cursor_transcript") {
+        return latestCursorCompletion(meta, readTranscriptLines);
+    }
     if ((meta.kind === "grok" || meta.kind === "composer") && meta.completion_route === "grok_transcript") {
         return latestGrokCompletion(meta, readTranscriptLines);
     }
@@ -1892,6 +1934,14 @@ function recoverAgentVendorSession(meta) {
             setInitialPromptState(meta, "done");
         return;
     }
+    if (meta.kind === "cursor") {
+        const transcript = bindCursorTranscriptSession(meta);
+        if (!transcript)
+            return;
+        if (meta.initial_prompt === "pending" && latestCursorCompletion(meta, readTranscriptLines))
+            setInitialPromptState(meta, "done");
+        return;
+    }
     const size = safeStatSize(meta.event_file);
     if (size === 0)
         return;
@@ -1915,6 +1965,10 @@ function agentCompletionCursor(meta) {
         const transcript = grokEventsTranscript(meta);
         return transcript ? safeStatSize(transcript) : 0;
     }
+    if (meta.kind === "cursor" && meta.completion_route === "cursor_transcript") {
+        bindCursorTranscriptSession(meta);
+        return cursorTurnBoundary(meta);
+    }
     if (meta.kind !== "codex")
         return safeStatSize(meta.event_file);
     const transcript = bindCodexTranscriptSession(meta);
@@ -1928,7 +1982,7 @@ function transcriptUnavailable() {
     throw new AitermError(`transcript がまだありません。ターン完了後に再取得してください。${agentWaitGuide()}`, 2);
 }
 function transcriptNotFound(vendor) {
-    throw new AitermError(`最終 assistant メッセージを特定できませんでした（vendor=${vendor}）。screen で確認してください。`, 2);
+    throw new AitermError(`最終 assistant メッセージを特定できませんでした（harness=${agentHarness(vendor)}, vendor=${vendor}）。screen で確認してください。`, 2);
 }
 function readTranscriptLines(file) {
     try {
@@ -2000,6 +2054,9 @@ export async function readAgentTranscript(name, o = {}) {
             transcriptUnavailable();
         text = readClaudeResultText(meta, done, operationId, transcriptUnavailable);
     }
+    else if (meta.kind === "cursor") {
+        text = cursorTranscriptText(meta, readTranscriptLines, transcriptUnavailable);
+    }
     else if (meta.kind === "codex") {
         text = codexTranscriptText(meta, turnId, readTranscriptLines, transcriptUnavailable);
     }
@@ -2016,6 +2073,7 @@ export async function readAgentTranscript(name, o = {}) {
         "agent_transcript",
         `vendor=${meta.kind}`,
         `turn_id=${turnId ?? "unknown"}`,
+        `harness=${agentHarness(meta.kind)}`,
         done?.operation_id ? `operation_id=${done.operation_id}` : null,
         `raw_chars=${rawChars}`,
     ].filter(Boolean).join(" ");
@@ -2053,6 +2111,7 @@ function agentReadMetadataSuffix(name, screen) {
     const bits = [
         "agent",
         `vendor=${meta.kind}`,
+        `harness=${agentHarness(meta.kind)}`,
         `initial_prompt=${meta.initial_prompt}`,
         `agent_event_seen=${ev ? "true" : "false"}`,
         "completion_attribution=none",
@@ -2144,7 +2203,7 @@ export function detectAgentRateLimit(kind, aitermSession) {
     return null;
 }
 // 外部waiterプロセス用の純リーダー観測。lock・PTY・metadata書込・dispatch状態には一切触れない。
-// Codexはrollout transcript、他vendorはevent fileを増分走査し、vendor_session_idのbind永続化を
+// Codex/Cursor/Grokは各harnessのtranscript、Claudeはevent fileを増分走査し、vendor_session_idのbind永続化を
 // 行わない（waiterは観測者であって所有者でない）。
 export async function observeAgentDone(name, o = {}) {
     const meta = loadAgentMetadata(name);
@@ -2153,12 +2212,15 @@ export async function observeAgentDone(name, o = {}) {
         throw new AitermError("operation_id はClaude agent sessionだけで使用できます", 2);
     }
     if (o.cursor != null && (!Number.isInteger(o.cursor) || o.cursor < 0)) {
-        throw new AitermError("cursor は0以上の整数byte offsetで指定してください", 2);
+        throw new AitermError("cursor は0以上の整数完了境界で指定してください", 2);
     }
     const timeout = o.timeout ?? DEFAULT_AGENT_DONE_TIMEOUT;
     if (meta.kind === "codex" && meta.completion_route === "codex_transcript") {
         return observeCodexDone(meta, timeout, o.cursor, detectAgentRateLimit);
     }
+    if (meta.kind === "cursor" && meta.completion_route === "cursor_transcript") {
+        return observeCursorDone(meta, timeout, o.cursor, detectAgentRateLimit);
+    }
     if ((meta.kind === "grok" || meta.kind === "composer") && meta.completion_route === "grok_transcript") {
         return observeGrokDone(meta, timeout, o.cursor, detectAgentRateLimit);
     }
@@ -2175,6 +2237,7 @@ export async function observeAgentDone(name, o = {}) {
         session_id: meta.aiterm_session,
         launch_id: meta.launch_id,
         vendor: meta.kind,
+        harness: agentHarness(meta.kind),
         outcome,
         operation_id: ev?.operation_id ?? operationId,
         vendor_session_id: ev?.vendor_session_id ?? meta.vendor_session_id ?? null,
@@ -2224,19 +2287,27 @@ function isAgentTuiReady(kind, screen) {
         return claudeTuiReady(screen);
     if (kind === "codex")
         return codexTuiReady(screen);
+    if (kind === "cursor")
+        return cursorTuiReady(screen);
     return grokTuiReady(screen);
 }
-// Codex/Claude は実行中に「(esc to interrupt)」を表示する（実機採取）。startup 側の処理
-// （MCP initialize 等）が走ったまま composer だけ描画されている画面は入力受付とみなさない。
+// Codex/Claude は実行中に「(esc to interrupt)」、Cursor は「Working」＋
+// 「ctrl+c to stop」を表示する（いずれも実機採取）。startup 側の処理（MCP initialize 等）が
+// 走ったまま古い composer がscrollbackに残る画面は入力受付とみなさない。
 // Grok/Composer は busy 表示文字列の実機根拠が未採取のため対象外（誤ブロックで起動不能にしない）。
-const AGENT_TUI_BUSY_KINDS = new Set(["codex", "claude"]);
-const AGENT_TUI_BUSY_RE = /esc to interrupt/i;
+function isAgentTuiBusy(kind, screen) {
+    if (kind === "cursor")
+        return /ctrl\+c to stop/i.test(screen);
+    if (kind === "codex" || kind === "claude")
+        return /esc to interrupt/i.test(screen);
+    return false;
+}
 // ready gate 用: 入力欄マーカーがあっても busy 表示中は ready と数えない。
 // frontend 推定（inferAgentFrontend）は「agent TUI が前面か」を見るだけなので isAgentTuiReady のまま。
 function isAgentTuiIdleReady(kind, screen) {
     if (!isAgentTuiReady(kind, screen))
         return false;
-    return !(AGENT_TUI_BUSY_KINDS.has(kind) && AGENT_TUI_BUSY_RE.test(screen));
+    return !isAgentTuiBusy(kind, screen);
 }
 async function waitAgentTuiReadyImpl(kind, sample, sleepFn, opts = {}) {
     const timeoutMs = opts.timeoutMs ?? AGENT_TUI_READY_TIMEOUT_MS;
@@ -2285,11 +2356,21 @@ function agentSubmitResidueTail(text) {
     return cps.slice(-AGENT_SUBMIT_RESIDUE_TAIL_CHARS).join("");
 }
 function agentSubmitResidueOnScreen(kind, screen, tail) {
+    // Cursorは送信成立後のactive turnで明示的な停止UIを出す。scrollbackに残った旧「>」を
+    // composerと誤認すると、実際には走っているpromptをsubmit座礁として報告してしまう。
+    if (kind === "cursor" && isAgentTuiBusy(kind, screen))
+        return false;
     const lines = screen.split("\n");
     // 入力欄マーカーは ready 判定と同じ記号を行頭基準で探す。submit 済みの transcript echo は
     // マーカー行より上に出るため、最後のマーカー行以降だけを composer 領域として見る。
     // grok/composer は Windows native 描画（`>`・実測 1.0.4）も ready 判定と同様に受ける。
-    const markerRe = kind === "codex" ? CODEX_COMPOSER_MARKER_RE : kind === "claude" ? CLAUDE_COMPOSER_MARKER_RE : GROK_COMPOSER_MARKER_RE;
+    const markerRe = kind === "codex"
+        ? CODEX_COMPOSER_MARKER_RE
+        : kind === "claude"
+            ? CLAUDE_COMPOSER_MARKER_RE
+            : kind === "cursor"
+                ? CURSOR_COMPOSER_MARKER_RE
+                : GROK_COMPOSER_MARKER_RE;
     let markerIdx = -1;
     for (let i = lines.length - 1; i >= 0; i--) {
         if (markerRe.test(lines[i])) {
@@ -2428,7 +2509,7 @@ export async function sendInitialAgentPrompt(name, text, o = {}) {
     const ready = await waitAgentTuiReady(name, meta, o.ready_timeout ?? AGENT_TUI_READY_TIMEOUT_MS);
     if (!ready.ready) {
         return {
-            text: `initial_prompt=not_sent vendor=${meta.kind} ready=false samples=${ready.samples}\n` +
+            text: `initial_prompt=not_sent vendor=${meta.kind} ready=false samples=${ready.samples} harness=${agentHarness(meta.kind)}\n` +
                 `agent session '${name}' の ${agentLabel(meta.kind)} TUI が入力受付状態になりません。prompt は送信していません。`,
             event_cursor: null,
             submit_residue: null,
@@ -2449,7 +2530,7 @@ export async function sendInitialAgentPrompt(name, text, o = {}) {
     }
     const residue = await detectAgentSubmitResidue(name, meta.kind, text);
     return {
-        text: `initial_prompt=pending vendor=${meta.kind} event_cursor=${startOffset}\n` +
+        text: `initial_prompt=pending vendor=${meta.kind} event_cursor=${startOffset} harness=${agentHarness(meta.kind)}\n` +
             `起動時 prompt を送信した。${agentDispatchGuide(name, startOffset)}` +
             agentSubmitResidueWarning(name, residue.residue),
         event_cursor: startOffset,
@@ -2542,6 +2623,48 @@ export async function configureAgent(name, opts) {
             schema: "aiterm.agent-configure-result.v1",
             session_id: name,
             provider: "claude",
+            harness: agentHarness("claude"),
+            model,
+            reasoning_effort: effort,
+        };
+    }
+    if (meta.kind === "cursor") {
+        validateCursorModelEffort(model, effort);
+        if (!model)
+            throw new AitermError("Cursorのreasoning_effort変更にはmodelも指定してください", 2);
+        const bin = resolveAgentBin("cursor");
+        if (!bin)
+            throw new AitermError("Cursor Agent CLI の CLI が見つかりません", 2);
+        assertCursorModelAvailable(bin, meta.cwd ?? process.cwd(), model, effort);
+        // Cursor TUIの `/model <base model>` はmodelを直接切り替える一方、flatten済みcatalog ID
+        // （例: gpt-5.6-luna-high）を渡すとno matchesのfilter画面へ入る。effortは標準model pickerの
+        // parameter editorで選び、同じsessionと会話contextを保つ。
+        await sendAgentPromptText(name, `/model ${model}`);
+        const modelReady = await waitAgentTuiReady(name, meta, AGENT_TUI_READY_TIMEOUT_MS);
+        if (!modelReady.ready)
+            throw new AitermError("Cursorのmodel変更完了を確認できません", 2);
+        if (effort) {
+            await sendAgentPromptText(name, "/model");
+            await waitForScreenText(name, "Available models");
+            sendMenuChoice(name, "Tab");
+            const parameterScreen = await waitForScreenText(name, "Edit Parameters");
+            const navigation = cursorEffortNavigation(parameterScreen, effort);
+            for (let i = 0; i < navigation.down; i++)
+                sendMenuChoice(name, "Down");
+            sendMenuChoice(name, "Enter");
+            await waitForScreenText(name, `${navigation.label} ✓`);
+            sendMenuChoice(name, "Escape");
+            await waitForScreenText(name, "Available models");
+            sendMenuChoice(name, "Enter");
+            const effortReady = await waitAgentTuiReady(name, meta, AGENT_TUI_READY_TIMEOUT_MS);
+            if (!effortReady.ready)
+                throw new AitermError("Cursorのreasoning effort変更完了を確認できません", 2);
+        }
+        return {
+            schema: "aiterm.agent-configure-result.v1",
+            session_id: name,
+            provider: "cursor",
+            harness: agentHarness("cursor"),
             model,
             reasoning_effort: effort,
         };
@@ -2563,6 +2686,7 @@ export async function configureAgent(name, opts) {
             schema: "aiterm.agent-configure-result.v1",
             session_id: name,
             provider: meta.kind,
+            harness: agentHarness(meta.kind),
             model,
             reasoning_effort: effort,
         };
@@ -2601,6 +2725,7 @@ export async function configureAgent(name, opts) {
         schema: "aiterm.agent-configure-result.v1",
         session_id: name,
         provider: "codex",
+        harness: agentHarness("codex"),
         model,
         reasoning_effort: effort,
     };
@@ -2635,6 +2760,11 @@ export async function dispatchAgentTurn(name, text, o = {}) {
         }
     }
     const startOffset = agentCompletionCursor(meta);
+    // promptなしで起動したCursorは、最初のdispatch時点ではtranscriptとの相関markerをまだ持たない。
+    // その1回だけlaunch contextを加え、以後はbind済みconversationへ通常textだけを送る。
+    const dispatchText = meta.kind === "cursor" && !meta.vendor_session_id
+        ? `${subagentInstruction(meta)}\n\n${text}`
+        : text;
     if (meta.kind === "claude") {
         // durable／anonymousを分岐する前に同じsend preflightを通す。拒否されるpromptの
         // receipt／active markerだけを残して、来ないStopを待つ状態を作らない。
@@ -2645,7 +2775,7 @@ export async function dispatchAgentTurn(name, text, o = {}) {
         else
             reserveAnonymousClaudeTurn(meta);
     }
-    send(name, text, {
+    send(name, dispatchText, {
         enter: false,
         force: o.force,
         raw: o.raw,
@@ -2657,12 +2787,13 @@ export async function dispatchAgentTurn(name, text, o = {}) {
     // Codex TUI は literal text 投入直後の Enter を取り落とすことがある。agent 経路だけ submit を分離する。
     await sleep(AGENT_SUBMIT_DELAY_MS);
     sendKey(name, "Enter", { preserveAgentOperation: meta.kind === "claude" });
-    const residue = await detectAgentSubmitResidue(name, meta.kind, text);
+    const residue = await detectAgentSubmitResidue(name, meta.kind, dispatchText);
     return {
         schema: "aiterm.agent-dispatch.v1",
         session_id: meta.aiterm_session,
         launch_id: meta.launch_id,
         vendor: meta.kind,
+        harness: agentHarness(meta.kind),
         event_cursor: startOffset,
         operation_id: operationId,
         submit_residue: residue.residue,
@@ -2776,6 +2907,8 @@ function buildAgentCmd(kind, bin, model, effort, prompt, meta = null) {
         return buildClaudeAgentCmd(bin, model, effort, prompt, meta);
     if (kind === "codex")
         return buildCodexAgentCmd(bin, model, effort, prompt, meta);
+    if (kind === "cursor")
+        return buildCursorAgentCmd(bin, model, effort, prompt, meta);
     return buildGrokAgentCmd(kind, bin, model, effort, prompt, meta);
 }
 function agentEnvPrefix(meta, sid, envVars = []) {
@@ -2798,7 +2931,7 @@ function agentEnvPrefix(meta, sid, envVars = []) {
             `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" || meta.kind === "codex")
+        if (meta.kind === "claude" || meta.kind === "codex" || meta.kind === "cursor")
             return common;
         return [...grokEnvTokens(meta), ...common];
     })();
@@ -2807,6 +2940,8 @@ function agentEnvPrefix(meta, sid, envVars = []) {
 function buildAgentLaunchNote(kind, model, effort, meta) {
     if (kind === "claude")
         return claudeLaunchNote(model, effort, meta);
+    if (kind === "cursor")
+        return cursorLaunchNote(model, effort, meta);
     if (kind !== "codex")
         return grokLaunchNote(kind, model, effort, meta);
     return codexLaunchNote(model, effort, meta);
@@ -2861,6 +2996,8 @@ export function openAgent(kind, opts = {}) {
     if (effort && kind === "claude" && !CLAUDE_EFFORTS.has(effort)) {
         throw new AitermError("Claude Code の reasoning_effort は low/medium/high/xhigh/max のいずれかです", 2);
     }
+    if (kind === "cursor")
+        validateCursorModelEffort(model, effort);
     const agentDone = !!opts.agent_done;
     const launchOperationId = opts.launch_operation_id == null
         ? null
@@ -2890,7 +3027,13 @@ export function openAgent(kind, opts = {}) {
         ownTelemetryFailure("AITERM.VENDOR_LAUNCHER_FAILED", error, 2);
     }
     if (!bin) {
-        const where = kind === "claude" ? "~/.local/bin/claude" : kind === "codex" ? "~/.local/bin/codex" : "~/.grok/bin/grok";
+        const where = kind === "claude"
+            ? "~/.local/bin/claude"
+            : kind === "codex"
+                ? "~/.local/bin/codex"
+                : kind === "cursor"
+                    ? "~/.local/bin/cursor-agent"
+                    : "~/.grok/bin/grok";
         ownTelemetryFailure("AITERM.VENDOR_LAUNCHER_FAILED", new AitermError(`${label} の CLI が見つかりません（${where} か PATH が必要）`, 2), 2);
     }
     // cwd 検証（session を作る前に。cd 失敗はシェル内で静かに死に「起動した」と偽成功を返すため）。
@@ -2930,6 +3073,8 @@ export function openAgent(kind, opts = {}) {
     }
     if (kind === "claude")
         assertClaudeAuthenticationReady(bin);
+    if (kind === "cursor")
+        assertCursorAuthenticationReady(bin);
     // Windows の起動コマンドは native psmux pane の Git Bash で走る（WSL 橋・/mnt/c 変換は
     // e3f5fc8 で全廃。bin/cwd は Windows パスの forward slash 形のまま渡す）。
     // 未検証リスク: npm グローバル導入の codex.cmd/.bat シムの対話 TUI 描画は実 Windows でしか確認
@@ -2951,6 +3096,9 @@ export function openAgent(kind, opts = {}) {
         if (requestedModel)
             assertGrokModelAvailable(bin, cwd ?? process.cwd(), requestedModel);
     }
+    if (kind === "cursor" && model) {
+        assertCursorModelAvailable(bin, cwd ?? process.cwd(), model, effort);
+    }
     let sid;
     let hint;
     try {
@@ -2971,7 +3119,9 @@ export function openAgent(kind, opts = {}) {
                 ? createClaudeAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", launchOperationId, launchRequestDigest, lineageContext, model, effort)
                 : kind === "codex"
                     ? createCodexAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", { model, effort }, writeScope, lineageContext)
-                    : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none", grokAuthPath, writeScope, lineageContext)
+                    : kind === "cursor"
+                        ? createCursorAgentMetadata(sid, cwd, opts.prompt ? "pending" : "none", writeScope, lineageContext)
+                        : createGrokAgentMetadata(kind, sid, cwd, opts.prompt ? "pending" : "none", grokAuthPath, writeScope, lineageContext)
             : null;
         if (meta)
             agentMetadataNegativeCache.delete(sid);
@@ -3002,7 +3152,7 @@ export function openAgent(kind, opts = {}) {
         }
         throw failure;
     }
-    const driveHint = agentDone && kind === "claude"
+    const driveHint = agentDone
         ? `TUI の描画には数秒かかる。少し置いてから pty_read(${sid}, screen:true) で画面を読み、` +
             `turnはpty_send(${sid}, "...")で送る（自動で非ブロックdispatch＝投げっぱなしでよい・完了通知はaiterm-wait）。中断はpty_key(${sid}, "C-c")、` +
             `Stopが来ない場合の解除はpty_close(${sid})を使う。`
@@ -3036,7 +3186,7 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
     }
     // v0.16.0: launcher は常に managed（Stop hook つき）で立つ。手動運転したい場合は
     // pty_open で素の PTY を開き、vendor CLI を自分で send する。
-    // 第3要素は「起動時点でturnが走っているか」の event_cursor: Grok/Composer の argv prompt は
+    // 第3要素は「起動時点でturnが走っているか」の event_cursor: Grok/Composer/Cursor の argv prompt は
     // event file 新規作成直後の起動＝境界0、prompt なしの起動は turn なし＝null。
     if (!prompt || (kind !== "codex" && kind !== "claude")) {
         const [sid, hint] = openAgent(kind, {
@@ -3050,7 +3200,7 @@ export async function openAgentWithInitialPrompt(kind, opts = {}) {
             write_scope: opts.write_scope,
             env_vars: opts.env_vars,
         });
-        // argv prompt（grok/composer）は composer を経由しないため submit 座礁観測の対象外。
+        // argv prompt（grok/composer/cursor）は composer を経由しないため submit 座礁観測の対象外。
         return [sid, hint, prompt ? 0 : null, null];
     }
     const [sid, hint] = openAgent(kind, {