elanous 0.2.0 → 0.2.5

package/src/telegram.ts

@@ -25,6 +25,7 @@ import { randomUUID } from 'node:crypto';
 import { buildTurnOutputTextBlocks } from './input/turn-output-block.js';
 import { selectTurnOutputTextForSink } from './input/turn-output-sink-registry.js';
 import { debug } from './debug/log.js';
+import { resolveChannelBotToken } from './channel-bot-token.js';
 import type { TelegramVoiceAdapter } from './voice/channel-adapters/telegram-voice-adapter.js';
 import { createTelegramSurfaceHitl, type TelegramSurfaceHitl } from './hitl/telegram-surface-hitl.js';
 import { beginCancelableTurn, endCancelableTurn, cancelAcpTurn } from './acp/turn-runner.js';
@@ -63,6 +64,9 @@ import { selfToolArgHint } from './telegram-exec-footer.js';
 import { detectUrlRoute, type UrlRouteDecision } from './skills/url-router.js';
 import { observeDevRequestRouteFailSoft } from './skills/dev-request-router.js';
 import { runUrlRoute } from './skills/url-route-exec.js';
+import { recordRoutedLinkAbsorbed } from './intake-plane/link-ledger.js';
+import { classifyFrontInput } from './intake-plane/front-classifier.js';
+import { effectiveInstanceRoot } from './instance/resolve.js';
 
 export type TgAttachmentKind = 'photo' | 'voice' | 'audio' | 'document';
 
@@ -220,6 +224,7 @@ const DEFAULT_ERROR_BACKOFF = 5000;
 const DEFAULT_PER_CHAT_GAP_MS = 900;
 const DEFAULT_GLOBAL_MAX_PER_SEC = 28;
 const DEFAULT_STREAM_EDIT_GAP_MS = 1100;
+const EMPTY_ALLOWLIST_NOTICE_GAP_MS = 10 * 60 * 1000;
 // A turn slower than this delivers its result as FRESH messages (which
 // push-notify) instead of a silent placeholder edit — so a long /cc job
 // or HITL-approved task the user walked away from actually pings them.
@@ -280,6 +285,7 @@ export class TelegramBot {
    *  means no recent send. Telegram's documented limit is 1 msg/sec
    *  per chat — we enforce 900ms to leave jitter slack. */
   private readonly chatLastSentAt = new Map<number, number>();
+  private readonly emptyAllowlistNoticeAt = new Map<number, number>();
   /** T2-P6 — callback_query subscribers. When any is registered the
    *  getUpdates poller also asks for callback_query updates so
    *  inline-keyboard taps reach a handler. */
@@ -341,6 +347,33 @@ export class TelegramBot {
     }
   }
 
+  private isOwnerAllowed(userId: number): boolean {
+    return this.allowedUsers.size > 0 && this.allowedUsers.has(userId);
+  }
+
+  private async refuseMessage(ctx: TgIncoming): Promise<void> {
+    const empty = this.allowedUsers.size === 0;
+    debug.log('telegram.owner-gate', 'refused', {
+      kind: 'message', reason: empty ? 'empty-allowlist' : 'not-allowed', userId: ctx.userId,
+    });
+    if (!empty) this.log(`telegram: refusing unknown user ${ctx.userId}`);
+    if (empty) {
+      const now = this.nowImpl();
+      const previous = this.emptyAllowlistNoticeAt.get(ctx.chatId);
+      if (previous !== undefined && now - previous < EMPTY_ALLOWLIST_NOTICE_GAP_MS) return;
+      this.emptyAllowlistNoticeAt.set(ctx.chatId, now);
+    }
+    try {
+      await this.sendMessage(
+        ctx.chatId,
+        empty
+          ? `이 봇은 아직 소유자가 정해지지 않았습니다. 당신의 사용자 ID 는 ${ctx.userId} 입니다 — 기계에서 \`elanous config set telegram.allowedUsers '[${ctx.userId}]'\` 로 등록하면 쓸 수 있습니다.`
+          : 'This bot is private. Your user ID is not on the allowlist.',
+        { replyTo: ctx.messageId, threadId: ctx.threadId },
+      );
+    } catch { /* swallow — refusal must not enter the turn */ }
+  }
+
   private apiUrl(method: string): string {
     return `https://api.telegram.org/bot${this.token}/${method}`;
   }
@@ -564,7 +597,7 @@ export class TelegramBot {
     });
   }
 
-  /** §C5-enh reactions-as-status — 사용자 메시지에 이모지 리액션(👀 큐 → ✅/❌). 편집보다 저비용
+  /** §C5-enh reactions-as-status — 사용자 메시지에 이모지 리액션(👀 큐 → 👍/👎). 편집보다 저비용
    *  상태채널(hermes/openclaw 선례). emoji=null 이면 리액션 제거. Bot API 7.0+ setMessageReaction.
    *  fail-soft(리액션 실패가 배달을 막지 않음). */
   async setMessageReaction(chatId: number, messageId: number, emoji: string | null): Promise<void> {
@@ -919,7 +952,7 @@ export class TelegramBot {
    *  slash command resolves the capture with `null` (cancel). */
   private tryConsumeTextCapture(ctx: TgIncoming): boolean {
     if (!ctx.text || ctx.attachments.length > 0) return false;
-    if (this.allowedUsers.size > 0 && !this.allowedUsers.has(ctx.userId)) return false;
+    if (!this.isOwnerAllowed(ctx.userId)) return false;
     const key = `${ctx.chatId}:${ctx.threadId ?? ''}`;
     const capture = this.pendingTextCaptures.get(key);
     if (!capture) return false;
@@ -1034,6 +1067,7 @@ export class TelegramBot {
   async start(): Promise<void> {
     this.running = true;
     this.log(`telegram bot starting (allowlist size ${this.allowedUsers.size})`);
+    if (this.allowedUsers.size === 0) this.log('telegram.owner-gate empty-allowlist');
 
     // Publish the slash-command menu to Telegram. Clients pick up the
     // update automatically next time they open the chat — no user-side
@@ -1091,6 +1125,13 @@ export class TelegramBot {
           // parser.
           if (u.callback_query) {
             const cq = u.callback_query;
+            if (!this.isOwnerAllowed(cq.from.id)) {
+              debug.log('telegram.owner-gate', 'refused', {
+                kind: 'callback', reason: this.allowedUsers.size === 0 ? 'empty-allowlist' : 'not-allowed', userId: cq.from.id,
+              });
+              await this.answerCallbackQuery(cq.id, { text: '권한이 없습니다' });
+              continue;
+            }
             const payload: TgCallbackQuery = {
               id: cq.id,
               userId: cq.from.id,
@@ -1110,6 +1151,13 @@ export class TelegramBot {
           // (UX 에이전트 NORMALIZE). No `message`/`text`, so handle before the parser.
           if (u.message_reaction) {
             const mr = u.message_reaction;
+            // 리액션도 미션 카드 흐름을 앞으로 민다(ux-reaction-router) — 소유자 것만 받는다. 익명(user 없음)은 거절.
+            if (!mr.user || !this.isOwnerAllowed(mr.user.id)) {
+              debug.log('telegram.owner-gate', 'refused', {
+                kind: 'reaction', reason: this.allowedUsers.size === 0 ? 'empty-allowlist' : mr.user ? 'not-allowed' : 'anonymous', userId: mr.user?.id,
+              });
+              continue;
+            }
             const payload: TgMessageReaction = {
               chatId: mr.chat.id,
               messageId: mr.message_id,
@@ -1129,6 +1177,10 @@ export class TelegramBot {
           // scoped per channel — a private chat's chatId is the same user
           // id across every bot, so without this two bots' DMs merge.
           incoming.botId = this.botId;
+          if (!this.isOwnerAllowed(incoming.userId)) {
+            await this.refuseMessage(incoming);
+            continue;
+          }
           // HITL "Other" free-text: consume inline (before the turn
           // chain) so it isn't queued behind the turn awaiting it.
           if (this.tryConsumeTextCapture(incoming)) continue;
@@ -1250,10 +1302,19 @@ export class TelegramBot {
     const typingTimer = setInterval(typing, 4000);
 
     let posted = 0;
+    let recorded = false;
     let result: Awaited<ReturnType<typeof runUrlRoute>>;
     try {
       result = await runUrlRoute(dec, {
-        onStageDone: async (_kind, text) => {
+        onStageDone: async (kind, text, meta) => {
+          if (!recorded && (kind === 'detailed' || kind === 'absorb') && meta.obsidianPath) {
+            recorded = true;
+            try {
+              recordRoutedLinkAbsorbed(effectiveInstanceRoot(), {
+                source: 'telegram-bot', url: dec.url, notePath: meta.obsidianPath,
+              });
+            } catch { /* instance root lookup is best-effort too */ }
+          }
           const t = (text ?? '').trim();
           if (!t) return;
           // ★ 공개 URL → 클릭 가능한 링크. legacy markdown 은 URL 내 `_` 를 이탤릭으로 파싱해 raw URL 이
@@ -1287,6 +1348,10 @@ export class TelegramBot {
   }
 
   private async handleIncoming(ctx: TgIncoming): Promise<void> {
+    if (!this.isOwnerAllowed(ctx.userId)) {
+      await this.refuseMessage(ctx);
+      return;
+    }
     // Cascade-zyu U2 — capture utterance intent at update ingress.
     try {
       const { userIntentLogger } = await import('./user-intent/index.js');
@@ -1301,18 +1366,6 @@ export class TelegramBot {
       });
     } catch { /* logging must never break the chat path */ }
 
-    if (this.allowedUsers.size > 0 && !this.allowedUsers.has(ctx.userId)) {
-      this.log(`telegram: refusing unknown user ${ctx.userId}`);
-      try {
-        await this.sendMessage(
-          ctx.chatId,
-          'This bot is private. Your user ID is not on the allowlist.',
-          { replyTo: ctx.messageId, threadId: ctx.threadId },
-        );
-      } catch { /* swallow — we already logged */ }
-      return;
-    }
-
     // ★ 미션 언급 추적(맥락-인지 revise·대표 2026-07-14) — 이 메시지가 apm_id 를 언급하면 이 방의
     //   "최근 논의 미션"으로 기록. 이후 id 없는 "개정해줘"가 이 미션을 recency 보다 우선 채택하도록.
     if (ctx.text && ctx.text.includes('apm_')) {
@@ -1322,6 +1375,19 @@ export class TelegramBot {
       } catch { /* fail-soft */ }
     }
 
+    // Explicit directive ingress precedes mission/HITL text interceptors.
+    if (ctx.text.startsWith('지시:') || ctx.text.startsWith('/directive ')) {
+      try {
+        const { addDirective } = await import('./steward/directive.js');
+        const text = ctx.text.startsWith('지시:') ? ctx.text.slice('지시:'.length) : ctx.text.slice('/directive '.length);
+        const result = await addDirective(text, { source: 'telegram' });
+        await this.sendMessage(ctx.chatId, `${result.issue}: ${result.status}`, { replyTo: ctx.messageId, threadId: ctx.threadId });
+      } catch {
+        await this.sendMessage(ctx.chatId, '지시 등록 실패 — Linear 연결과 자격을 확인하세요.', { replyTo: ctx.messageId, threadId: ctx.threadId });
+      }
+      return;
+    }
+
     // ★ 미션 정정 답장 가로채기(force_reply·대표 2026-07-12) — reply_to 가 정정요청이면
     //   runTurn(Q&A) 대신 재분해로. dynamic import 로 autopilot 결합 최소·fail-soft.
     if (ctx.replyToText && ctx.text.trim()) {
@@ -1632,6 +1698,9 @@ export class TelegramBot {
         ? getActiveDelegation(delegationChatKey(this.botId, ctx.chatId, ctx.threadId))
         : null;
       if (!activeDeleg) {
+        try {
+          classifyFrontInput({ text: ctx.text, surface: 'telegram' }, { urlRouting: getUserConfig().skills.urlRouting });
+        } catch { /* observation must not interrupt URL routing */ }
         const urlDec = detectUrlRoute(ctx.text, getUserConfig().skills.urlRouting);
         if (urlDec) {
           const handled = await this.runUrlRouteReply(ctx, urlDec);
@@ -1656,8 +1725,9 @@ export class TelegramBot {
     debug.log('telegram.deliver', 'route', {
       chatId: ctx.chatId, path: streamingFlip ? 'flip-fanout' : 'legacy', streamingCfgOn, daemonBound: daemonBoundForFlip,
     });
-    // §C5-enh reactions-as-status — 턴 시작 👀(저비용 상태채널). 완료 ✅ / 실패 ❌ 는 아래. fail-soft.
-    const reactionsOn = getUserConfig().sessionFabric?.telegram?.reactions === true;
+    // §C5-enh reactions-as-status — 턴 시작 👀(저비용 상태채널). 종료 👍/👎는 Bot API 허용 집합에 따른다.
+    // https://core.telegram.org/bots/api#reactiontypeemoji — ✅/❌는 ReactionTypeEmoji에 없다.
+    const reactionsOn = true;
     debug.log('telegram.deliver', 'reaction', { chatId: ctx.chatId, phase: 'start', emoji: '👀', on: reactionsOn });
     if (reactionsOn && ctx.messageId != null) void this.setMessageReaction(ctx.chatId, ctx.messageId, '👀');
 
@@ -1835,15 +1905,14 @@ export class TelegramBot {
       } else {
         debug.log('telegram.deliver', 'flip-suppress-legacy', { chatId: ctx.chatId, chars: reply.length });
       }
-      // §C5-enh reactions — 완료 👍. ⚠️ 텔레그램은 리액션 이모지가 제한 세트(✅/❌ 불가·REACTION_INVALID)
-      // → 유효 이모지(👀/👍/👎/🎉/😢…) 사용. fail-soft.
+      // §C5-enh reactions — 완료 👍 (Bot API ReactionTypeEmoji). fail-soft.
       debug.log('telegram.deliver', 'reaction', { chatId: ctx.chatId, phase: 'done', emoji: '👍', on: reactionsOn });
       if (reactionsOn && ctx.messageId != null) void this.setMessageReaction(ctx.chatId, ctx.messageId, '👍');
       recordStreamingSlashHandled('completed');
     } catch (err: any) {
       streamer?.flushCancel();
       recordStreamingSlashHandled(streamingSlashResult ?? 'post-processing-failed');
-      // §C5-enh reactions — 실패 👎(텔레그램 유효 세트).
+      // §C5-enh reactions — 실패 👎 (Bot API ReactionTypeEmoji).
       debug.log('telegram.deliver', 'reaction', { chatId: ctx.chatId, phase: 'fail', emoji: '👎', on: reactionsOn });
       if (reactionsOn && ctx.messageId != null) void this.setMessageReaction(ctx.chatId, ctx.messageId, '👎');
       this.log(`telegram handler error: ${err?.message ?? String(err)}`);
@@ -2302,7 +2371,8 @@ export interface BotDaemonBridge {
 export function botFromConfig(opts: BotFromConfigOpts): TelegramBot {
   const tg = opts.userConfig.telegram;
   if (!tg.enabled) throw new Error('telegram disabled in user-config');
-  if (!tg.botToken) throw new Error('telegram.botToken missing in user-config');
+  const botToken = opts.telegramBotOpts?.token ?? resolveChannelBotToken('telegram', opts.userConfig)?.token;
+  if (!botToken) throw new Error('telegram.botToken missing in user-config');
   const log = opts.log ?? (() => {});
   const cap = opts.maxAttachments ?? 8;
   const runTurnImpl = opts.runTurnImpl ?? runTurn;
@@ -2603,7 +2673,7 @@ export function botFromConfig(opts: BotFromConfigOpts): TelegramBot {
   const voiceAdapter = buildTelegramVoiceAdapterFromConfig(opts.userConfig, opts.log);
 
   botRef = new TelegramBot({
-    token: tg.botToken,
+    token: botToken,
     allowedUsers: tg.allowedUsers,
     homeChannel: tg.homeChannel,
     onMessage: handler,

package/src/tool-runtime/acp-session-runtime.ts

@@ -38,7 +38,17 @@ import {
   type AcpPlanThenExecuteArgs,
   type AcpSessionStatusArgs,
 } from '../skills/tools/acp-session.js';
-import type { ToolRuntime } from './types.js';
+import type { ToolRuntime, ToolRuntimeContext } from './types.js';
+import { assertClaudeSubscriptionAllowed } from '../policy/claude-subscription-guard.js';
+
+function assertBackendAllowed(backendId: string, ctx: ToolRuntimeContext): void {
+  assertClaudeSubscriptionAllowed({ origin: ctx.requestOrigin ?? 'owner', backendId, surface: ctx.surface });
+}
+
+function assertSessionAllowed(sessionId: string, ctx: ToolRuntimeContext): void {
+  const backendId = /^acp-cli:([^:]+):/.exec(sessionId)?.[1];
+  if (backendId) assertBackendAllowed(backendId, ctx);
+}
 
 // Output types are widened to `any` the way other multi-field runtimes
 // (context-runtime, control-runtime, ...) do — ToolRunResult's union
@@ -49,7 +59,9 @@ import type { ToolRuntime } from './types.js';
 export const acpSessionCreateRuntime: ToolRuntime<AcpSessionCreateArgs, any> = {
   id: 'acp_session_create',
   spec: buildAcpSessionCreateTool(),
-  async run(req) {
+  async run(req, ctx) {
+    assertBackendAllowed(req.brand, ctx);
+    if (req.parentSessionId) assertSessionAllowed(req.parentSessionId, ctx);
     return dispatchAcpSessionCreate(req);
   },
 };
@@ -57,7 +69,8 @@ export const acpSessionCreateRuntime: ToolRuntime<AcpSessionCreateArgs, any> = {
 export const acpSessionSendRuntime: ToolRuntime<AcpSessionSendArgs, any> = {
   id: 'acp_session_send',
   spec: buildAcpSessionSendTool(),
-  async run(req) {
+  async run(req, ctx) {
+    assertSessionAllowed(req.sessionId, ctx);
     return dispatchAcpSessionSend(req);
   },
 };
@@ -82,7 +95,8 @@ export const acpSessionListRuntime: ToolRuntime<AcpSessionListArgs, any> = {
 export const acpSessionResumeRuntime: ToolRuntime<AcpSessionResumeArgs, any> = {
   id: 'acp_session_resume',
   spec: buildAcpSessionResumeTool(),
-  async run(req) {
+  async run(req, ctx) {
+    assertSessionAllowed(req.sessionId, ctx);
     return dispatchAcpSessionResume(req);
   },
 };
@@ -91,7 +105,9 @@ export const acpSessionResumeRuntime: ToolRuntime<AcpSessionResumeArgs, any> = {
 export const acpSessionSpawnSubRuntime: ToolRuntime<AcpSessionSpawnSubArgs, any> = {
   id: 'acp_session_spawn_sub',
   spec: buildAcpSessionSpawnSubTool(),
-  async run(req) {
+  async run(req, ctx) {
+    assertBackendAllowed(req.brand, ctx);
+    assertSessionAllowed(req.parentSessionId, ctx);
     return dispatchAcpSessionSpawnSub(req);
   },
 };
@@ -100,7 +116,10 @@ export const acpSessionSpawnSubRuntime: ToolRuntime<AcpSessionSpawnSubArgs, any>
 export const acpPlanThenExecuteRuntime: ToolRuntime<AcpPlanThenExecuteArgs, any> = {
   id: 'acp_plan_then_execute',
   spec: buildAcpPlanThenExecuteTool(),
-  async run(req) {
+  async run(req, ctx) {
+    assertBackendAllowed(req.brand, ctx);
+    assertBackendAllowed(req.executeBrand ?? req.brand, ctx);
+    assertSessionAllowed(req.parentSessionId, ctx);
     return dispatchAcpPlanThenExecute(req);
   },
 };
@@ -109,7 +128,9 @@ export const acpPlanThenExecuteRuntime: ToolRuntime<AcpPlanThenExecuteArgs, any>
 export const acpSessionStartBackgroundRuntime: ToolRuntime<AcpSessionStartBackgroundArgs, any> = {
   id: 'acp_session_start_background',
   spec: buildAcpSessionStartBackgroundTool(),
-  async run(req) {
+  async run(req, ctx) {
+    assertBackendAllowed(req.brand, ctx);
+    if (req.parentSessionId) assertSessionAllowed(req.parentSessionId, ctx);
     return dispatchAcpSessionStartBackground(req);
   },
 };

package/src/tool-runtime/agent-runtime.ts

@@ -10,6 +10,7 @@ export const agentRuntime: ToolRuntime<Record<string, unknown>, AgentToolResult>
   spec: buildAgentTool(),
   async run(req, ctx) {
     return await dispatchAgent(req, {
+      ...(ctx.agentCwd ? { cwd: ctx.agentCwd } : {}),
       hostTools: ctx.agentHostTools,
       dispatchTool: ctx.agentDispatchTool,
       buildChildToolCatalog: ctx.buildChildToolCatalog,

package/src/tool-runtime/context-runtime.ts

@@ -4,20 +4,13 @@
 // filtering (skill vs dashboard vs mcp) and approval gating stay per-
 // tool. All read-only → no approver slot used.
 //
-// Shared deps (cwd/remoteHost, window-registry getter, session getter,
-// pane-capture) flow through a DI record set at dashboard boot — skills
-// call this with {} and still receive useful answers for workspace/
-// tools/ptys/events which don't need dashboard state.
-//
-// Surface-unification v2.2 V2.2-5 (2026-05-11) — scheduler getter slot
-// retired with the `context.jobs.list` tool (scheduler view 폐기).
+// Shared deps (cwd/remoteHost, session getter) flow through a DI record
+// set at dashboard boot. Skills call this with {} and still receive
+// useful answers from ambient workspace/tools/ptys/events state.
 
 import {
   buildContextTools,
   dispatchContextWorkspace,
-  dispatchContextWindowsList,
-  dispatchContextWindowDetail,
-  dispatchContextPaneDetail,
   dispatchContextPtysList,
   dispatchContextPtyDetail,
   dispatchContextSessionsList,
@@ -32,50 +25,40 @@ import type { ToolRuntime } from './types.js';
 
 let deps: ContextDeps = {};
 
-/** Dashboard boot wires cwd/remote/window-registry/session/scheduler
- *  here so `context.*` tools see the live rig. Skills call this with
- *  {} and still get useful answers for workspace/tools/ptys/events. */
+/** Dashboard boot wires cwd/remote/session here so context tools see
+ *  the live rig. Skills still get ambient workspace/tools/ptys/events. */
 export function setContextRuntimeDeps(next: ContextDeps): void {
   deps = { ...next };
 }
 
 function asRuntime<Req extends Record<string, unknown>>(
   id: string,
-  specIdx: number,
+  name: string,
   fn: (req: Req, deps?: ContextDeps) => Promise<unknown>,
 ): ToolRuntime<Req, any> {
-  const specs = buildContextTools();
+  const spec = buildContextTools().find(tool => tool.name === name);
+  if (!spec) throw new Error(`missing context tool spec: ${name}`);
   return {
     id,
-    spec: specs[specIdx]!,
+    spec,
     async run(req) {
       return fn(req, deps) as Promise<any>;
     },
   };
 }
 
-// Tool index mirrors buildContextTools() order — keep in sync.
-export const contextWorkspaceRuntime     = asRuntime('context_workspace',       0,  dispatchContextWorkspace);
-export const contextWindowsListRuntime   = asRuntime('context_windows_list',    1,  dispatchContextWindowsList);
-export const contextWindowDetailRuntime  = asRuntime('context_window_detail',   2,  dispatchContextWindowDetail);
-export const contextPaneDetailRuntime    = asRuntime('context_pane_detail',     3,  dispatchContextPaneDetail);
-export const contextPtysListRuntime      = asRuntime('context_ptys_list',       4,  dispatchContextPtysList);
-export const contextPtyDetailRuntime     = asRuntime('context_pty_detail',      5,  dispatchContextPtyDetail);
-export const contextSessionsListRuntime  = asRuntime('context_sessions_list',   6,  dispatchContextSessionsList);
-// Surface-unification v2.2 V2.2-5 (2026-05-11) — `contextJobsListRuntime`
-// retired (scheduler view 폐기 · spec idx 7 자리 빈 슬롯이 아니라 후속
-// runtime 들이 한 칸씩 위로 시프트).
-export const contextWidgetsListRuntime   = asRuntime('context_widgets_list',    7,  dispatchContextWidgetsList);
-export const contextPluginsListRuntime   = asRuntime('context_plugins_list',    8,  dispatchContextPluginsList);
-export const contextToolsListRuntime     = asRuntime('context_tools_list',      9,  dispatchContextToolsList);
-export const contextEventsTailRuntime    = asRuntime('context_events_tail',    10,  dispatchContextEventsTail);
-export const contextBootstrapRuntime     = asRuntime('context_bootstrap',      11,  dispatchContextBootstrap);
+export const contextWorkspaceRuntime    = asRuntime('context_workspace',     'ContextWorkspace',     dispatchContextWorkspace);
+export const contextPtysListRuntime     = asRuntime('context_ptys_list',     'ContextPtysList',      dispatchContextPtysList);
+export const contextPtyDetailRuntime    = asRuntime('context_pty_detail',    'ContextPtyDetail',      dispatchContextPtyDetail);
+export const contextSessionsListRuntime = asRuntime('context_sessions_list', 'ContextSessionsList',   dispatchContextSessionsList);
+export const contextWidgetsListRuntime  = asRuntime('context_widgets_list',  'ContextWidgetsList',    dispatchContextWidgetsList);
+export const contextPluginsListRuntime  = asRuntime('context_plugins_list',  'ContextPluginsList',    dispatchContextPluginsList);
+export const contextToolsListRuntime    = asRuntime('context_tools_list',    'ContextToolsList',      dispatchContextToolsList);
+export const contextEventsTailRuntime   = asRuntime('context_events_tail',   'ContextEventsTail',     dispatchContextEventsTail);
+export const contextBootstrapRuntime    = asRuntime('context_bootstrap',     'ContextBootstrap',      dispatchContextBootstrap);
 
 export const ALL_CONTEXT_RUNTIMES: ToolRuntime<any, any>[] = [
   contextWorkspaceRuntime,
-  contextWindowsListRuntime,
-  contextWindowDetailRuntime,
-  contextPaneDetailRuntime,
   contextPtysListRuntime,
   contextPtyDetailRuntime,
   contextSessionsListRuntime,

package/src/tool-runtime/control-runtime.ts

@@ -1,15 +1,7 @@
-// ── Control tool runtimes — Phase D wiring ──
-//
-// Five mutation tools sit next to the existing virtual-window /
-// PTY-shell surfaces rather than replacing them. Each is exposed via
-// `skill` + `dashboard` surfaces; none on `mcp` by default (mutating
-// — add per-tool when an external flow needs it).
+// ── Control tool runtimes ──
 
 import {
   buildControlTools,
-  dispatchControlWindowResize,
-  dispatchControlPaneResize,
-  dispatchControlPaneLayout,
   dispatchControlToolToggle,
   dispatchControlPromptAppend,
   dispatchControlPromptClear,
@@ -18,30 +10,25 @@ import type { ToolRuntime } from './types.js';
 
 function asRuntime<Req extends Record<string, unknown>>(
   id: string,
-  specIdx: number,
+  name: string,
   fn: (req: Req) => Promise<unknown>,
 ): ToolRuntime<Req, any> {
-  const specs = buildControlTools();
+  const spec = buildControlTools().find(tool => tool.name === name);
+  if (!spec) throw new Error(`missing control tool spec: ${name}`);
   return {
     id,
-    spec: specs[specIdx]!,
+    spec,
     async run(req) {
       return fn(req) as Promise<any>;
     },
   };
 }
 
-export const controlWindowResizeRuntime  = asRuntime('control_window_resize',  0, dispatchControlWindowResize);
-export const controlPaneResizeRuntime    = asRuntime('control_pane_resize',    1, dispatchControlPaneResize);
-export const controlPaneLayoutRuntime    = asRuntime('control_pane_layout',    2, dispatchControlPaneLayout);
-export const controlToolToggleRuntime    = asRuntime('control_tool_toggle',    3, dispatchControlToolToggle);
-export const controlPromptAppendRuntime  = asRuntime('control_prompt_append',  4, dispatchControlPromptAppend);
-export const controlPromptClearRuntime   = asRuntime('control_prompt_clear',   5, dispatchControlPromptClear);
+export const controlToolToggleRuntime   = asRuntime('control_tool_toggle',   'ControlToolToggle',   dispatchControlToolToggle);
+export const controlPromptAppendRuntime = asRuntime('control_prompt_append', 'ControlPromptAppend', dispatchControlPromptAppend);
+export const controlPromptClearRuntime  = asRuntime('control_prompt_clear',  'ControlPromptClear',  dispatchControlPromptClear);
 
 export const ALL_CONTROL_RUNTIMES: ToolRuntime<any, any>[] = [
-  controlWindowResizeRuntime,
-  controlPaneResizeRuntime,
-  controlPaneLayoutRuntime,
   controlToolToggleRuntime,
   controlPromptAppendRuntime,
   controlPromptClearRuntime,

package/src/tool-runtime/dashboard-state-runtime.ts

@@ -63,18 +63,14 @@ export const dashboardStateRuntime: ToolRuntime<Record<string, unknown>, Dashboa
     const recentTerminalMouseIntents = (() => {
       try { return terminalMouseIntentsGetter?.() ?? []; } catch { return []; }
     })();
-    const includeVirtualWindows =
-      typeof req.includeVirtualWindows === 'boolean' ? req.includeVirtualWindows : undefined;
     const result = await dispatchGetDashboardState(req, {
       terminalSessions,
       dashboardToolNames,
       recentTerminalMouseIntents,
-      includeVirtualWindows,
     });
     const stableStateHash = createHash('sha1')
       .update(JSON.stringify({
         workspace: result.snapshot.workspace,
-        windows: result.snapshot.windows,
         ptys: result.snapshot.ptys,
         tools: result.snapshot.tools,
         terminalSessions: result.snapshot.terminalSessions,
@@ -91,7 +87,7 @@ export const dashboardStateRuntime: ToolRuntime<Record<string, unknown>, Dashboa
           `[DUPLICATE CALL — state unchanged]\n` +
           `GetDashboardState\n` +
           `Dashboard state is unchanged from ${secondsAgo}s ago. ` +
-          `Use the previous tool_result already in history unless an intervening action changed layout, sessions, cwd, or tool exposure.`,
+          `Use the previous tool_result already in history unless an intervening action changed sessions, cwd, or tool exposure.`,
       };
     }