maka-agent 0.2.0-dev.14.20260902 → 0.2.0-dev.16.20260903

package/dist/runtime-host-setup-command.js

@@ -117,15 +117,7 @@ export async function runRuntimeHostSetupCli(options, overrides = {}) {
     }
 }
 async function resolveRuntimeHostSetupRootId(options) {
-    let legacyRootPath;
-    try {
-        legacyRootPath = (await readRuntimeHostManagedServiceConfig(resolveRuntimeHostManagedServiceConfigPath(options.clientDataRoot))).rootPath;
-    }
-    catch (error) {
-        if (!(error instanceof RuntimeHostServiceManagerError) || error.code !== 'not_installed') {
-            throw error;
-        }
-    }
+    const legacyRootPath = (await readOptionalLegacyServiceConfig(options.clientDataRoot))?.rootPath;
     const path = resolve(options.rootPath ??
         legacyRootPath ??
         options.expectedTarget?.rootPath ??
@@ -135,6 +127,17 @@ async function resolveRuntimeHostSetupRootId(options) {
     }
     return (await resolveStorageRoot({ path, kind: 'interactive' })).rootId;
 }
+async function readOptionalLegacyServiceConfig(clientDataRoot) {
+    try {
+        return await readRuntimeHostManagedServiceConfig(resolveRuntimeHostManagedServiceConfigPath(clientDataRoot));
+    }
+    catch (error) {
+        if (error instanceof RuntimeHostServiceManagerError && error.code === 'not_installed') {
+            return null;
+        }
+        throw error;
+    }
+}
 async function runRuntimeHostSetupLocked(options, deps, emit) {
     if (options.lifecycle === 'on_demand') {
         await runRuntimeHostOnDemandSetupLocked(options, deps, emit);
@@ -146,7 +149,10 @@ async function runRuntimeHostSetupLocked(options, deps, emit) {
 async function runRuntimeHostSupervisedSetupLocked(options, deps, emit) {
     emit({ kind: 'progress', phase: 'checking_environment' });
     const legacyServiceId = resolveRuntimeHostManagedServiceId(options.clientDataRoot);
-    const legacyBackend = deps.createBackend(legacyServiceId, options.clientDataRoot);
+    const legacyConfig = await readOptionalLegacyServiceConfig(options.clientDataRoot);
+    const legacyBackend = legacyConfig
+        ? deps.createBackend(legacyServiceId, options.clientDataRoot)
+        : undefined;
     const legacyCommon = {
         clientDataRoot: options.clientDataRoot,
         defaultRootPath: options.defaultRootPath,
@@ -156,8 +162,9 @@ async function runRuntimeHostSupervisedSetupLocked(options, deps, emit) {
             ? { expectedTarget: legacyManagedTarget(options.expectedTarget, legacyServiceId) }
             : {}),
     };
-    const legacyStatus = await deps.manageService({ ...legacyCommon, action: 'status' }, legacyBackend);
-    const legacyConfig = legacyStatus.service.config;
+    const legacyStatus = legacyBackend
+        ? await deps.manageService({ ...legacyCommon, action: 'status' }, legacyBackend)
+        : undefined;
     const capability = await resolveStorageRoot({
         path: resolve(options.rootPath ??
             legacyConfig?.rootPath ??
@@ -170,13 +177,13 @@ async function runRuntimeHostSupervisedSetupLocked(options, deps, emit) {
         convergeOperator: (currentConfig, desiredConfig) => deps.convergeOperator(currentConfig, desiredConfig),
         verifyOperator: deps.verifyOperator,
         resolveProvider: (provider) => deps.resolveLifecycleProvider(capability.rootId, provider),
-        ...(legacyConfig
+        ...(legacyConfig && legacyBackend
             ? legacyMigrationDeps(legacyConfig, legacyBackend, legacyServiceId, options.clientDataRoot)
             : {}),
     };
     const recovered = await resolveRecoverableRuntimeHostManagedDeployment(capability.rootId, lifecycleDeps, {
-        ...(legacyConfig ? { retirementSupervisor: legacyBackend } : {}),
-        ...(legacyConfig
+        ...(legacyBackend ? { retirementSupervisor: legacyBackend } : {}),
+        ...(legacyBackend
             ? {
                 activatePrevious: () => deps
                     .manageService({ ...legacyCommon, action: 'start' }, legacyBackend)
@@ -188,10 +195,11 @@ async function runRuntimeHostSupervisedSetupLocked(options, deps, emit) {
     const current = recovered.kind === 'active' ? recovered.config : undefined;
     assertExpectedDeploymentGeneration(options.expectedTarget, current);
     const legacyToMigrate = current ? null : legacyConfig;
-    if (current && legacyConfig)
+    if (current && legacyBackend)
         await assertLegacyArtifactsAbsent(legacyBackend);
-    if (legacyToMigrate)
+    if (legacyToMigrate && legacyStatus) {
         await assertCompatibleExistingVersion(legacyStatus, options.version);
+    }
     if (current && current.launch.package.version !== options.version && !options.updateExisting) {
         throw new RuntimeHostSetupError('version_change_requires_update', `Runtime Host ${current.launch.package.version} is already installed; changing to ${options.version} requires the update workflow`);
     }
@@ -227,7 +235,7 @@ async function runRuntimeHostSupervisedSetupLocked(options, deps, emit) {
                 throw new RuntimeHostSetupError('configuration_changed', 'Change an existing supervised Runtime Host through its explicit configure or update workflow');
             }
             emit({ kind: 'progress', phase: 'installing_service' });
-            if (legacyToMigrate) {
+            if (legacyToMigrate && legacyBackend) {
                 await legacyBackend.verifyDeployment(legacyToMigrate, {
                     acceptLegacyConfigLaunch: true,
                 });
@@ -244,8 +252,8 @@ async function runRuntimeHostSupervisedSetupLocked(options, deps, emit) {
                         : 'install',
                 ...(current ? { current } : {}),
                 desired,
-                ...(legacyToMigrate ? { retirementSupervisor: legacyBackend } : {}),
-                ...(legacyToMigrate
+                ...(legacyToMigrate && legacyBackend ? { retirementSupervisor: legacyBackend } : {}),
+                ...(legacyToMigrate && legacyBackend
                     ? {
                         activatePrevious: () => deps
                             .manageService({ ...legacyCommon, action: 'start' }, legacyBackend)
@@ -397,16 +405,7 @@ async function runRuntimeHostOnDemandSetupLocked(options, deps, emit) {
     }
     emit({ kind: 'progress', phase: 'checking_environment' });
     const legacyServiceId = resolveRuntimeHostManagedServiceId(options.clientDataRoot);
-    const legacyConfigPath = resolveRuntimeHostManagedServiceConfigPath(options.clientDataRoot);
-    let legacyConfig = null;
-    try {
-        legacyConfig = await readRuntimeHostManagedServiceConfig(legacyConfigPath);
-    }
-    catch (error) {
-        if (!(error instanceof RuntimeHostServiceManagerError) || error.code !== 'not_installed') {
-            throw error;
-        }
-    }
+    const legacyConfig = await readOptionalLegacyServiceConfig(options.clientDataRoot);
     const legacyBackend = legacyConfig
         ? deps.createBackend(legacyServiceId, options.clientDataRoot)
         : undefined;
@@ -589,7 +588,7 @@ async function runRuntimeHostOnDemandSetupLocked(options, deps, emit) {
         throw new RuntimeHostSetupError('deployment_failed', 'Setup did not install an operator');
     activation = await deps.activateManaged({ rootId: capability.rootId });
     if (legacyConfig) {
-        await removeRuntimeHostServiceFile(legacyConfigPath, 'legacy service config');
+        await removeRuntimeHostServiceFile(resolveRuntimeHostManagedServiceConfigPath(options.clientDataRoot), 'legacy service config');
         if (legacyConfig.managedDeploymentRoot &&
             resolve(legacyConfig.managedDeploymentRoot) !== resolve(config.deploymentRoot)) {
             await removeRuntimeHostManagedDeployment(legacyConfig.managedDeploymentRoot, legacyServiceId);

package/dist/tui-context-refresh.js

@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * How full the context is right now, re-asked mid-turn (#4545).
+ *
+ * The statusline ctx segment historically moved once per turn, when the
+ * end-of-turn `token_usage` event landed — a long agentic turn burned context
+ * for minutes with the indicator frozen at the previous turn's value. The Host
+ * already commits a latest-context snapshot at every settled provider request
+ * (the desktop inspector's data source), so the TUI pulls it on the same
+ * signal desktop uses instead of growing a parallel push event.
+ */
+/**
+ * When a live session's context snapshot is worth re-reading. Mirrors the
+ * desktop inspector's TRACE_RELEVANT_EVENT_TYPES
+ * (apps/desktop/src/renderer/session-trace-refresh.ts): the snapshot is
+ * committed at each settled provider request, so the events that follow one —
+ * tool boundaries above all — are the moments the answer can have changed.
+ * That is deliberately not "every event": a streaming turn emits text deltas
+ * continuously, and none of them moves the snapshot.
+ */
+const CTX_REFRESH_EVENT_TYPES = new Set([
+    'tool_start',
+    'tool_result',
+    'token_usage',
+    'provider_retry',
+    'error',
+    'complete',
+    'abort',
+]);
+export function isCtxRefreshRelevantEvent(event) {
+    return CTX_REFRESH_EVENT_TYPES.has(event.type);
+}
+/**
+ * Long enough to absorb a step boundary's event burst, short enough to feel
+ * live. Same value and rationale as the desktop inspector's
+ * TRACE_REFRESH_DEBOUNCE_MS.
+ */
+export const CTX_REFRESH_DEBOUNCE_MS = 400;
+/**
+ * Coalesces a burst of refresh-worthy events into one query, and lets only
+ * the latest issued query apply. A query that resolves after a newer one was
+ * issued — or after `cancel` retired it — is dropped: the answer a slow read
+ * brings back describes an older snapshot than the one already shown, and a
+ * torn-down session is not owed an update at all. A failed query leaves the
+ * last value standing: it is still the newest answer anyone has.
+ *
+ * The scheduler is injected so the policy is testable without a wall clock,
+ * and follows the CLI's ticker convention: schedule returns the cancel.
+ */
+export function createCtxRefresher(input) {
+    let cancelScheduled;
+    let revision = 0;
+    const dropScheduled = () => {
+        cancelScheduled?.();
+        cancelScheduled = undefined;
+    };
+    const run = () => {
+        cancelScheduled = undefined;
+        const requestRevision = ++revision;
+        void input.query().then((result) => {
+            if (requestRevision !== revision)
+                return;
+            input.apply(result);
+        }, () => { });
+    };
+    return {
+        observe(event) {
+            if (!isCtxRefreshRelevantEvent(event))
+                return;
+            // Restart rather than stack: the last event of a burst is the one whose
+            // snapshot the reader wants, and an earlier timer would read before it.
+            dropScheduled();
+            cancelScheduled = input.schedule(run, input.delayMs);
+        },
+        cancel() {
+            dropScheduled();
+            revision += 1;
+        },
+    };
+}
+/** Default one-shot timer; unref'd so a pending refresh never holds the CLI open. */
+export function scheduleCtxRefreshTimeout(callback, delayMs) {
+    const handle = setTimeout(callback, delayMs);
+    handle.unref();
+    return () => clearTimeout(handle);
+}

package/dist/tui-copy-catalog.js

@@ -237,6 +237,60 @@ export const TUI_COPY_RESOURCES = {
             },
         },
     },
+    'form-interaction': {
+        en: {
+            requestedBy: 'Requested by {detail}',
+            sensitiveWarning: 'Do not enter passwords, API keys, access tokens, or payment details.',
+            required: 'required',
+            optional: 'optional',
+            omitted: 'omitted',
+            empty: 'empty',
+            invalid: "Value does not meet this field's constraints",
+            minimumLength: 'At least {minimum} characters',
+            maximumLength: 'At most {maximum} characters',
+            lengthRange: '{minimum}–{maximum} characters',
+            minimumValue: 'Minimum {minimum}',
+            maximumValue: 'Maximum {maximum}',
+            valueRange: 'Range {minimum}–{maximum}',
+            minimumItems: 'Select at least {minimum}',
+            maximumItems: 'Select at most {maximum}',
+            itemRange: 'Select {minimum}–{maximum}',
+            format: 'Format: {format}',
+            reviewHint: '↑↓ field · Enter edit · Space include/omit · s submit · d decline · Esc cancel',
+            textHint: 'Type a value · Enter review · Esc review',
+            choiceHint: '↑↓ select · Enter review · Esc review',
+            multiHint: '↑↓ move · Space toggle · Enter review · Esc review',
+            trueValue: 'true',
+            falseValue: 'false',
+            selectedCount: '{count} selected',
+        },
+        zh: {
+            requestedBy: '由 {detail} 请求',
+            sensitiveWarning: '请勿输入密码、API 密钥、访问令牌或支付信息。',
+            required: '必填',
+            optional: '选填',
+            omitted: '未提供',
+            empty: '空',
+            invalid: '该值不符合字段约束',
+            minimumLength: '至少 {minimum} 个字符',
+            maximumLength: '最多 {maximum} 个字符',
+            lengthRange: '长度 {minimum}–{maximum} 个字符',
+            minimumValue: '最小值 {minimum}',
+            maximumValue: '最大值 {maximum}',
+            valueRange: '范围 {minimum}–{maximum}',
+            minimumItems: '至少选择 {minimum} 项',
+            maximumItems: '最多选择 {maximum} 项',
+            itemRange: '选择 {minimum}–{maximum} 项',
+            format: '格式：{format}',
+            reviewHint: '↑↓ 选择字段 · Enter 编辑 · Space 提供/省略 · s 提交 · d 拒绝 · Esc 取消',
+            textHint: '输入值 · Enter 返回检查 · Esc 返回检查',
+            choiceHint: '↑↓ 选择 · Enter 返回检查 · Esc 返回检查',
+            multiHint: '↑↓ 移动 · Space 切换 · Enter 返回检查 · Esc 返回检查',
+            trueValue: '是',
+            falseValue: '否',
+            selectedCount: '已选择 {count} 项',
+        },
+    },
     pickers: {
         en: {
             modelPickerTitle: 'Select Model',
@@ -263,6 +317,11 @@ export const TUI_COPY_RESOURCES = {
             setupTitle: 'Set Up Provider',
             baseUrlLabel: 'Base URL',
             apiKeyLabel: 'API key',
+            connectionNameLabel: 'Name',
+            connectionSlugLabel: 'Slug',
+            identityHint: 'Name this connection, or keep the defaults to auto-assign · Enter continues · Esc returns',
+            identitySlugInvalid: 'Slug must be 2–64 characters: lowercase letters, digits, and hyphens',
+            identityNameTooLong: 'Name must be 256 characters or fewer',
             onboardingUnavailable: 'Onboarding is unavailable: this environment does not provide a setup surface.',
             onboardingRequestFailed: 'Could not reach the Runtime Host. Try again.',
             onboardingRejections: {
@@ -272,6 +331,7 @@ export const TUI_COPY_RESOURCES = {
                 base_url_not_configured: 'A Base URL is required for this provider.',
                 catalog_full: 'The connection catalog is full.',
                 model_unavailable: 'A selected model is no longer available. Verify and select again.',
+                slug_taken: 'That slug is already taken. Pick another, or clear it to auto-assign.',
                 superseded: 'This connection changed. Reopen /setup and try again.',
             },
             onboardingFailures: {
@@ -301,10 +361,14 @@ export const TUI_COPY_RESOURCES = {
                 reuse: {
                     baseUrl: 'Leave blank to reuse the saved key, or enter a new key to rotate it · Esc returns to Base URL',
                     provider: 'Leave blank to reuse the saved key, or enter a new key to rotate it · Esc returns to provider selection',
+                    // The identity step only exists for create targets, so a `reuse`
+                    // hint never lands here; the provider text keeps the record total.
+                    identity: 'Leave blank to reuse the saved key, or enter a new key to rotate it · Esc returns to provider selection',
                 },
                 enter: {
                     baseUrl: 'Enter an API key · stored only on this machine · Esc returns to Base URL',
                     provider: 'Enter an API key · stored only on this machine · Esc returns to provider selection',
+                    identity: 'Enter an API key · stored only on this machine · Esc returns to connection naming',
                 },
             },
             submitAction: 'Enter to submit',
@@ -343,6 +407,11 @@ export const TUI_COPY_RESOURCES = {
             setupTitle: '配置模型提供商',
             baseUrlLabel: 'Base URL',
             apiKeyLabel: 'API key',
+            connectionNameLabel: '名称',
+            connectionSlugLabel: '标识（slug）',
+            identityHint: '为该连接起名，或保留默认值自动分配 · Enter 继续 · Esc 返回',
+            identitySlugInvalid: '标识需为 2–64 位小写字母、数字或连字符',
+            identityNameTooLong: '名称不能超过 256 个字符',
             onboardingUnavailable: 'Onboarding 不可用：当前运行环境未提供配置入口。',
             onboardingRequestFailed: '无法连接 Runtime Host，请重试。',
             onboardingRejections: {
@@ -352,6 +421,7 @@ export const TUI_COPY_RESOURCES = {
                 base_url_not_configured: '该服务商需要填写 Base URL。',
                 catalog_full: '连接目录已满。',
                 model_unavailable: '所选模型已不可用，请重新验证并选择。',
+                slug_taken: '该标识已被占用。请更换，或清空后自动分配。',
                 superseded: '该连接已发生变化，请重新打开 /setup 后重试。',
             },
             onboardingFailures: {
@@ -381,10 +451,13 @@ export const TUI_COPY_RESOURCES = {
                 reuse: {
                     baseUrl: '留空复用已保存的 key，或输入新 key 轮换 · Esc 返回 Base URL',
                     provider: '留空复用已保存的 key，或输入新 key 轮换 · Esc 返回选择服务商',
+                    // identity 步骤只存在于新建流程，reuse 不会落到这里；沿用 provider 文案保持记录完整。
+                    identity: '留空复用已保存的 key，或输入新 key 轮换 · Esc 返回选择服务商',
                 },
                 enter: {
                     baseUrl: '输入 API key · 仅本机存储 · Esc 返回 Base URL',
                     provider: '输入 API key · 仅本机存储 · Esc 返回选择服务商',
+                    identity: '输入 API key · 仅本机存储 · Esc 返回命名连接',
                 },
             },
             submitAction: 'Enter 提交',

package/node_modules/@maka/core/dist/chat-model-choice.js

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { declaredContextWindow } from './model-thinking.js';
 import { offerableCatalogEntries, providerDefaultsOf, providerMenuLabel, } from './llm-connections.js';
 export function buildChatModelChoices(connections) {
     const choices = [];
@@ -24,6 +25,7 @@ export function buildChatModelChoices(connections) {
         if (!provider)
             continue;
         for (const entry of offerableCatalogEntries(connection)) {
+            const declaredWindow = declaredContextWindow(connection, entry.id);
             choices.push({
                 connectionId: connection.connectionId,
                 connectionSlug: connection.slug,
@@ -37,6 +39,8 @@ export function buildChatModelChoices(connections) {
                 isDefault: entry.isDefault,
                 thinkingLevels: entry.thinkingLevels,
                 supportsVision: entry.supportsVision,
+                ...(entry.contextWindow !== undefined ? { contextWindow: entry.contextWindow } : {}),
+                ...(declaredWindow !== undefined ? { declaredContextWindow: declaredWindow } : {}),
             });
         }
     }

package/node_modules/@maka/core/dist/computer-use.js

@@ -80,26 +80,7 @@ export const COMPUTER_USE_ERROR_CODES = [
 export function isComputerUseErrorCode(value) {
     return (typeof value === 'string' && COMPUTER_USE_ERROR_CODES.includes(value));
 }
-export const CU_SCROLL_DIRECTIONS = ['up', 'down', 'left', 'right'];
-export const CU_ACTION_TYPES = [
-    'screenshot',
-    'cursor_position',
-    'mouse_move',
-    'left_click',
-    'right_click',
-    'middle_click',
-    'double_click',
-    'triple_click',
-    'left_mouse_down',
-    'left_mouse_up',
-    'left_click_drag',
-    'type',
-    'key',
-    'hold_key',
-    'scroll',
-    'wait',
-    'zoom',
-];
+export const CU_ACTION_TYPES = ['screenshot', 'type', 'key', 'wait'];
 export const COMPUTER_USE_ACTION_TYPES = CU_ACTION_TYPES;
 /**
  * The semantic actions, which name an element rather than a pixel. They are not
@@ -120,9 +101,7 @@ export const CU_SEMANTIC_ACTION_TYPES = [
     'press_key',
 ];
 /**
- * Every action name the tool schema spells out itself, as it spells them —
- * that is, every name that is not one of the `CU_ACTION_TYPES` coordinate
- * actions folded into `CU_TOOL_ACTION_TYPES` below.
+ * Every semantic action name the tool schema spells out itself.
  *
  * This list used to be hand-written beside a schema that already listed the
  * same names, and it drifted: `window_action` was added to the strict union and
@@ -151,13 +130,8 @@ export const COMPUTER_USE_SEMANTIC_ACTIONS = [
     ...CU_SEMANTIC_ACTION_TYPES,
 ];
 /**
- * Every action name the `maka_computer` tool accepts, in wire order.
- *
- * One list, so that adding an action cannot leave a consumer silently matching
- * nothing. This has already cost us once: an offline analyser restated the
- * vocabulary as two regexes, neither of which matched a single coordinate
- * action after the surface moved, and it reported clean runs for trajectories
- * made entirely of blind clicks.
+ * Every action name the `maka_computer` tool accepts from a model, in wire
+ * order.
  */
 export const CU_TOOL_ACTION_TYPES = [...COMPUTER_USE_SEMANTIC_ACTIONS, ...CU_ACTION_TYPES];
 /**
@@ -166,13 +140,7 @@ export const CU_TOOL_ACTION_TYPES = [...COMPUTER_USE_SEMANTIC_ACTIONS, ...CU_ACT
  * mutating — including any action added later, which fails loud in an analyser
  * rather than silently dropping out of the counts.
  */
-export const CU_OBSERVING_ACTION_TYPES = [
-    'list_apps',
-    'observe',
-    'screenshot',
-    'cursor_position',
-    'wait',
-];
+export const CU_OBSERVING_ACTION_TYPES = ['list_apps', 'observe', 'screenshot', 'wait'];
 const OBSERVING_ACTION_SET = new Set(CU_OBSERVING_ACTION_TYPES);
 const TOOL_ACTION_SET = new Set(CU_TOOL_ACTION_TYPES);
 export const CU_MUTATING_ACTION_TYPES = CU_TOOL_ACTION_TYPES.filter((action) => !OBSERVING_ACTION_SET.has(action));
@@ -199,7 +167,6 @@ export const COMPUTER_USE_EFFECTS = ['confirmed', 'unverifiable', 'suspected_noo
 export const COMPUTER_USE_APPROVAL_CLASSES = [
     'metadata_read',
     'screenshot_read',
-    'pointer_mutation',
     'keyboard_mutation',
     'semantic_mutation',
 ];
@@ -235,14 +202,14 @@ const MODEL_CALL_NAMED_ARGS = new Set([
  * Arguments whose value is the model's own choice from a fixed set, a number,
  * or a word it wrote itself — nothing here comes off the screen.
  *
- * Keyed by action, not by argument name, because `text` is six arguments
- * wearing one name. It carries the key for `press_key`, `key` and `hold_key`,
+ * Keyed by action, not by argument name, because `text` is five arguments
+ * wearing one name. It carries the key for `press_key` and `key`,
  * the element action name for `secondary_action`, the substring to select for
  * `select_text`, and whatever a person asked to be typed for `type`. Two of
- * those come off the screen or out of a person's head; four are a name the
+ * those come off the screen or out of a person's head; three are a name the
  * model picked from a set the executor publishes.
  *
- * Keying on the name meant excluding all six, which is right for `type` and
+ * Keying on the name meant excluding all five, which is right for `type` and
  * wrong for the rest — and the wrong half is the one that motivated this
  * projection: the model read back `press_key ... text: <text>` and could not
  * see which key it had pressed.
@@ -268,11 +235,9 @@ const MODEL_CALL_PLAIN_VALUES = new Map([
     // `query` and `menu` name what to look at, not what was found there.
     ['observe', new Set(['include_screenshot', 'query', 'menu'])],
     ['screenshot', new Set(['include_screenshot'])],
-    ['scroll', new Set(['scroll_direction', 'scroll_amount'])],
-    // The semantic twin of `scroll`, added after this map was written.
     ['scroll_element', new Set(['scroll_direction', 'scroll_amount'])],
     // The verb, from the enum the schema publishes. `position` and `size` are
-    // geometry and are handled by MODEL_CALL_GEOMETRY_ARGS below.
+    // semantic window geometry and are handled below.
     ['window_action', new Set(['window_action'])],
     // The text a wait is waiting for is a prediction about the screen, written
     // before the screen shows it.
@@ -280,7 +245,6 @@ const MODEL_CALL_PLAIN_VALUES = new Map([
     // The key name, from the set of key names the executor accepts.
     ['press_key', new Set(['text'])],
     ['key', new Set(['text'])],
-    ['hold_key', new Set(['text', 'duration'])],
     // The element action name, from the closed set the observation lists.
     ['secondary_action', new Set(['text'])],
 ]);
@@ -294,26 +258,15 @@ const MODEL_CALL_PLAIN_VALUES = new Map([
  */
 const MODEL_CALL_PLAIN_STEP_MEMBERS = new Set(['do', 'role']);
 /**
- * Geometry the model itself chose, projected verbatim.
- *
- * Independent of action, because these names mean the same thing wherever they
- * appear and none of them ever holds screen content: a coordinate, the drag
- * origin, the zoom rectangle, and the place and size a window was asked to take
- * are numbers the model wrote into the call. A model that clicked a point and
- * missed has to be able to see which point, or its next call is the same call.
+ * Semantic window geometry the model itself chose, projected verbatim.
  *
- * `position` and `size` joined late, with `window_action`. Reduced to
- * `"<point>"` they were a string where the schema wants a tuple, so a replayed
- * window move was rejected off the wire.
+ * `position` and `size` belong to `window_action`; they place or resize the
+ * observed window and never address a control by pixel. Reduced to `"<point>"`
+ * they become strings where the schema requires tuples, so replaying the
+ * model's own call would be rejected before execution.
  */
-const MODEL_CALL_GEOMETRY_ARGS = new Set([
-    'coordinate',
-    'start_coordinate',
-    'region',
-    'position',
-    'size',
-]);
-/** Integers only, so a mistyped `coordinate` still degrades to a shape. */
+const MODEL_CALL_GEOMETRY_ARGS = new Set(['position', 'size']);
+/** Integers only, so malformed window geometry still degrades to a shape. */
 function integerTuple(value) {
     if (!Array.isArray(value) || value.length === 0 || value.length > 4)
         return undefined;
@@ -460,28 +413,14 @@ export function computerUseModelCallArgs(args) {
         ...rest,
     };
 }
-const POINTER_ACTIONS = new Set([
-    'mouse_move',
-    'left_click',
-    'right_click',
-    'middle_click',
-    'double_click',
-    'triple_click',
-    'left_mouse_down',
-    'left_mouse_up',
-    'left_click_drag',
-    'scroll',
-    'zoom',
-]);
-const KEYBOARD_ACTIONS = new Set(['type', 'key', 'hold_key', 'press_key']);
+const KEYBOARD_ACTIONS = new Set(['type', 'key', 'press_key']);
 const SEMANTIC_ACTIONS = new Set([
     'click_element',
     'set_value',
     'select_text',
     'secondary_action',
-    // Scrolling an element moves what is on screen without changing any value.
-    // It is still a mutation of the target's state, and it is the semantic twin
-    // of the coordinate `scroll` that already sits in POINTER_ACTIONS.
+    // Scrolling an element moves what is on screen without changing any value,
+    // but it still mutates the target's UI state.
     'scroll_element',
     // A sequence of element actions is still element actions: same class, same
     // approval, one call.
@@ -504,7 +443,7 @@ export function computerUseApprovalSummary(args) {
     // screenshot-by-default contract: an omitted flag is metadata_read, and only
     // an explicit true requires Screen Recording approval.
     const includeScreenshot = ownDataProperty(record, 'include_screenshot') === true;
-    const approvalClass = action === 'list_apps' || action === 'cursor_position' || action === 'wait'
+    const approvalClass = action === 'list_apps' || action === 'wait'
         ? 'metadata_read'
         : action === 'observe'
             ? includeScreenshot
@@ -512,13 +451,11 @@ export function computerUseApprovalSummary(args) {
                 : 'metadata_read'
             : action === 'screenshot'
                 ? 'screenshot_read'
-                : POINTER_ACTIONS.has(action)
-                    ? 'pointer_mutation'
-                    : KEYBOARD_ACTIONS.has(action)
-                        ? 'keyboard_mutation'
-                        : SEMANTIC_ACTIONS.has(action)
-                            ? 'semantic_mutation'
-                            : 'semantic_mutation';
+                : KEYBOARD_ACTIONS.has(action)
+                    ? 'keyboard_mutation'
+                    : SEMANTIC_ACTIONS.has(action)
+                        ? 'semantic_mutation'
+                        : 'semantic_mutation';
     const rawApp = ownDataProperty(record, 'app');
     const rawWindowId = ownDataProperty(record, 'window_id');
     const rawObservationId = ownDataProperty(record, 'observation_id');
@@ -532,9 +469,7 @@ export function computerUseApprovalSummary(args) {
     const explicitTarget = exactApp !== undefined || windowId !== undefined;
     const targetBound = action === 'list_apps' ||
         ((action === 'observe' || action === 'screenshot') && explicitTarget) ||
-        ((POINTER_ACTIONS.has(action) ||
-            KEYBOARD_ACTIONS.has(action) ||
-            SEMANTIC_ACTIONS.has(action)) &&
+        ((KEYBOARD_ACTIONS.has(action) || SEMANTIC_ACTIONS.has(action)) &&
             exactObservationId !== undefined &&
             explicitTarget);
     const rememberForTurnAllowed = knownAction && targetBound;