@happier-dev/stack 0.2.1-preview.1775586714.26562 → 0.2.11

package/node_modules/@happier-dev/protocol/dist/actions/actionSpecs.js

@@ -4,13 +4,33 @@ import { ActionUiPlacementSchema } from './actionUiPlacements.js';
 import { ReviewStartInputSchema } from '../reviews/reviewStart.js';
 import { ActionInputPredicateSchema } from './actionInputPredicates.js';
 import { MemorySearchQueryV1Schema } from '../memory/memorySearch.js';
-import { ApprovalRequestCreatedBySchema } from '../approvals/approvalRequestV1.js';
+import { ApprovalRequestCreatedBySchema, ApprovalRequestOriginV1Schema } from '../approvals/approvalRequestV1.js';
 import { PromptRegistryConfiguredSourceV1Schema } from '../promptLibrary/promptRegistriesV1.js';
 import { PromptAssetInstallModeV1Schema, PromptAssetScopeV1Schema } from '../promptLibrary/promptAssetsV1.js';
-import { BackendTargetKeySchema, BackendTargetRefSchema, parseBackendTargetKey } from '../backendTargets/backendTargetRef.js';
+import { BackendTargetKeySchema, BackendTargetRefSchema, buildBackendTargetKey, parseBackendTargetKey } from '../backendTargets/backendTargetRef.js';
 import { ExecutionRunListRequestSchema } from '../executionRunListRequest.js';
 import { SessionRollbackTargetSchema } from '../sessionRollback.js';
+import { SessionForkRpcParamsSchema } from '../sessionFork.js';
+import { PendingFirstInputV1Schema } from '../spawnSession.js';
+import { SessionSpawnSourceContextV1Schema } from '../sessionSpawnSourceContextV1.js';
 import { SessionHandoffWorkspaceTransferSchema } from '../sessionControl/handoff/handoffSchemas.js';
+import { ActionApprovalSchema } from './actionApprovalMetadata.js';
+import { SessionUsageLimitCheckNowRequestV1Schema, SessionUsageLimitConsumeResetCreditRequestV1Schema, SessionUsageLimitWaitResumeCancelRequestV1Schema, SessionUsageLimitWaitResumeEnableRequestV1Schema, } from '../sessionWorkState/sessionWorkStateRpc.js';
+import { SessionTerminalComposerClearRequestV1Schema } from '../sessionControl/sessionTerminalComposerClearV1.js';
+import { SessionPendingInputInterruptAndRunRequestV1Schema } from '../sessionControl/sessionPendingInputInterruptAndRunV1.js';
+import { PendingRequestedActionV1Schema } from '../sessionMessages/pendingRequestedActionV1.js';
+import { SessionWorkStateStatusV1Schema } from '../sessionWorkState/sessionWorkStateV1.js';
+import { STRUCTURED_QUESTION_LIMITS } from '../tools/structuredQuestionAnswersV1.js';
+import { AcpConfigOptionOverridesV1Schema } from '../sessionMetadata/metadataOverridesV1.js';
+import { SessionPermissionModeInputSchema } from '../sessionMetadata/sessionPermissionModes.js';
+import { AgentRuntimeDescriptorV1Schema } from '../sessionMetadata/agentRuntimeDescriptorV1.js';
+import { SessionMcpSelectionV1Schema } from '../mcpServers/sessionSelectionV1.js';
+import { ConnectedServiceBindingsV1Schema } from '../connect/connectedServiceBindings.js';
+import { SpawnConfigOptionValueSchema, findSpawnConfigOptionAliasConflicts, } from './sessionSpawnConfigOptions.js';
+import { EXECUTION_RUN_ACTION_PERMISSION_MODES, EXECUTION_RUN_ACTION_PERMISSION_MODE_DESCRIPTION, ExecutionRunActionPermissionModeSchema, } from './executionRunActionPermissionMode.js';
+import { ActionOperationDeclarationV1Schema, } from './operations/actionOperationDeclarationV1.js';
+export { ActionApprovalFlowSchema, ActionApprovalResultSchema, ActionApprovalSchema, resolveActionApprovalFlow, } from './actionApprovalMetadata.js';
+export { ActionOperationDeclarationV1Schema, } from './operations/actionOperationDeclarationV1.js';
 const ZodSchemaLike = z.custom((value) => {
     if (!value || typeof value !== 'object')
         return false;
@@ -26,6 +46,21 @@ export const ActionSurfaceSchema = z.object({
     mcp: z.boolean(),
     cli: z.boolean(),
 }).strict();
+export const ActionToolExposureModeSchema = z.enum(['direct', 'discoverable_only']);
+export const ActionToolExposureSurfaceSchema = z.enum(['session_agent', 'mcp', 'cli']);
+export const ActionToolExposureSchema = z.object({
+    session_agent: ActionToolExposureModeSchema.optional(),
+    mcp: ActionToolExposureModeSchema.optional(),
+    cli: ActionToolExposureModeSchema.optional(),
+}).strict();
+export const ActionContextualDefaultSourceSchema = z.enum([
+    'current_session',
+    'current_session_machine',
+]);
+export const ActionContextualDefaultsSchema = z.object({
+    sessionId: ActionContextualDefaultSourceSchema.optional(),
+    machineId: ActionContextualDefaultSourceSchema.optional(),
+}).strict();
 export const ActionSafetySchema = z.enum(['safe', 'danger']);
 export const ActionInputWidgetSchema = z.enum(['text', 'textarea', 'text_list', 'select', 'multiselect', 'toggle', 'checkbox']);
 export const ActionInputOptionSchema = z
@@ -139,6 +174,10 @@ export const ActionSpecSchema = z.object({
         .passthrough()
         .optional(),
     prompting: ActionPromptingSchema.optional(),
+    operation: ActionOperationDeclarationV1Schema.optional(),
+    toolExposure: ActionToolExposureSchema.optional(),
+    contextualDefaults: ActionContextualDefaultsSchema.optional(),
+    approval: ActionApprovalSchema,
     surfaces: ActionSurfaceSchema,
     inputSchema: ZodSchemaLike,
     inputHints: ActionInputHintsSchema.optional(),
@@ -160,7 +199,7 @@ const SessionPermissionModeSetInputSchema = z.object({
 }).passthrough();
 const SessionModelSetInputSchema = z.object({
     sessionId: z.string().min(1),
-    modelId: z.string().trim().min(1),
+    modelId: z.string().refine((value) => value.trim().length > 0, { message: 'Model ID must not be blank' }),
 }).passthrough();
 const SessionStatusGetInputSchema = z.object({
     sessionId: z.string().min(1),
@@ -173,33 +212,99 @@ const SessionHistoryGetInputSchema = z.object({
     includeMeta: z.boolean().optional(),
     includeStructuredPayload: z.boolean().optional(),
 }).passthrough();
+const SessionTranscriptRoleSchema = z.enum(['user', 'assistant']);
+const SessionTranscriptScopeSchema = z.enum(['main', 'sidechain', 'all']);
+const SessionTranscriptDirectionSchema = z.enum(['before', 'after']);
+export const SessionTranscriptGetInputSchema = z.object({
+    sessionId: z.string().min(1),
+    limit: z.number().int().min(1).max(100).optional(),
+    cursor: z.string().min(1).nullable().optional(),
+    direction: SessionTranscriptDirectionSchema.optional(),
+    scope: SessionTranscriptScopeSchema.optional(),
+    sidechainId: z.string().min(1).nullable().optional(),
+    roles: z.array(SessionTranscriptRoleSchema).optional(),
+    includeTools: z.boolean().optional(),
+    includeReasoning: z.boolean().optional(),
+    includeEvents: z.boolean().optional(),
+    includeMeta: z.boolean().optional(),
+    includeStructuredPayload: z.boolean().optional(),
+    includeRaw: z.boolean().optional(),
+    maxCharsPerMessage: z.number().int().min(0).max(50_000).nullable().optional(),
+    maxRawPayloadChars: z.number().int().min(0).max(32768).nullable().optional(),
+}).passthrough();
+const SessionEventRoleSchema = z.enum(['event', 'agent', 'user', 'unknown']);
+export const SessionEventsGetInputSchema = z.object({
+    sessionId: z.string().min(1),
+    limit: z.number().int().min(1).max(200).optional(),
+    cursor: z.string().min(1).nullable().optional(),
+    direction: SessionTranscriptDirectionSchema.optional(),
+    scope: SessionTranscriptScopeSchema.optional(),
+    sidechainId: z.string().min(1).nullable().optional(),
+    roles: z.array(SessionEventRoleSchema).optional(),
+    kinds: z.array(z.string().min(1)).optional(),
+    format: z.enum(['compact', 'raw']).optional(),
+    includeMeta: z.boolean().optional(),
+    includeStructuredPayload: z.boolean().optional(),
+    includeRaw: z.boolean().optional(),
+    maxTextChars: z.number().int().min(0).max(4000).optional(),
+    maxPayloadChars: z.number().int().min(0).max(32768).optional(),
+}).passthrough();
 const SessionWaitIdleInputSchema = z.object({
     sessionId: z.string().min(1),
     timeoutSeconds: z.number().int().min(1).max(3600).optional(),
 }).passthrough();
+const SessionGoalSetInputSchema = z.object({
+    sessionId: z.string().min(1),
+    objective: z.string().trim().min(1).max(4000).optional(),
+    status: SessionWorkStateStatusV1Schema.optional(),
+    tokenBudget: z.number().finite().positive().nullable().optional(),
+}).passthrough().refine((value) => (typeof value.objective === 'string'
+    || typeof value.status === 'string'
+    || Object.prototype.hasOwnProperty.call(value, 'tokenBudget')), { message: 'At least one goal mutation field is required' });
+const SessionCatalogListInputSchema = z.object({
+    sessionId: z.string().min(1),
+    cwd: z.string().min(1).optional(),
+}).passthrough();
 const IntentStartCommonSchema = z.object({
     sessionId: z.string().min(1).optional(),
     backendTargetKeys: z.array(BackendTargetKeySchema).min(1),
     instructions: z.string().trim().min(1),
-    permissionMode: z.string().min(1).optional(),
+    permissionMode: ExecutionRunActionPermissionModeSchema.optional(),
     retentionPolicy: z.enum(['ephemeral', 'resumable']).optional(),
     runClass: z.enum(['bounded', 'long_lived']).optional(),
     ioMode: z.enum(['request_response', 'streaming']).optional(),
+    // Optional model selection for every fanned-out run, using the SAME canonical shape as
+    // session spawn (`session.spawn_new`'s `modelId`). Omit to use each backend's default model.
+    modelId: z.string().min(1).optional(),
+    // Optional config-option overrides applied to every fanned-out run, using the SAME canonical
+    // vocabulary as session spawn. Reasoning effort is the `reasoning_effort` option. Provide either
+    // the canonical `sessionConfigOptionOverrides` object or the agent-friendly `configOptions`
+    // shorthand (e.g. { reasoning_effort: "high" }); they are merged at the action boundary and a
+    // conflicting value in both forms is a typed rejection.
+    sessionConfigOptionOverrides: AcpConfigOptionOverridesV1Schema.optional(),
+    configOptions: z.record(z.string().min(1), SpawnConfigOptionValueSchema).optional(),
+    // Optional connected-services selection applied to every fanned-out target. Accepts the simple
+    // string form (e.g. "openai-codex:group:happier" or "openai-codex:team") or a full bindings
+    // object; normalized at the action boundary. Omit to use each account's default.
+    connectedServices: z.unknown().optional(),
+    // Optional per-target override keyed by backend target key (e.g. { "agent:codex": "openai-codex:team" }).
+    // A per-target entry wins over the blanket `connectedServices` for that target.
+    connectedServicesByBackendTargetKey: z.record(z.string().min(1), z.unknown()).optional(),
 }).passthrough();
 const PlanStartInputSchema = IntentStartCommonSchema.extend({
-    permissionMode: z.string().min(1).default('read_only'),
+    permissionMode: ExecutionRunActionPermissionModeSchema.default('read_only'),
     retentionPolicy: z.enum(['ephemeral', 'resumable']).default('ephemeral'),
     runClass: z.enum(['bounded', 'long_lived']).default('bounded'),
     ioMode: z.enum(['request_response', 'streaming']).default('request_response'),
 }).passthrough();
 const DelegateStartInputSchema = IntentStartCommonSchema.extend({
-    permissionMode: z.string().min(1).default('workspace_write'),
+    permissionMode: ExecutionRunActionPermissionModeSchema.default('workspace_write'),
     retentionPolicy: z.enum(['ephemeral', 'resumable']).default('ephemeral'),
     runClass: z.enum(['bounded', 'long_lived']).default('bounded'),
     ioMode: z.enum(['request_response', 'streaming']).default('request_response'),
 }).passthrough();
 const VoiceAgentStartInputSchema = IntentStartCommonSchema.extend({
-    permissionMode: z.string().min(1).default('read_only'),
+    permissionMode: ExecutionRunActionPermissionModeSchema.default('read_only'),
     retentionPolicy: z.enum(['ephemeral', 'resumable']).default('ephemeral'),
     runClass: z.enum(['bounded', 'long_lived']).default('long_lived'),
     ioMode: z.enum(['request_response', 'streaming']).default('streaming'),
@@ -219,8 +324,23 @@ const ExecutionRunStartInputSchema = z.object({
     runClass: z.enum(['bounded', 'long_lived']),
     ioMode: z.enum(['request_response', 'streaming']),
     initialContextMode: z.enum(['bootstrap', 'first_turn']).optional(),
+    // Optional model selection for the run's backend — SAME canonical shape as session spawn's
+    // `modelId`. Omit to use the backend's default model.
+    modelId: z.string().min(1).optional(),
+    // Optional config-option overrides for the run, using the SAME canonical vocabulary as session
+    // spawn. Reasoning effort is the `reasoning_effort` option. Provide either the canonical
+    // `sessionConfigOptionOverrides` object or the `configOptions` shorthand; they are merged at the
+    // action boundary and a conflicting value in both forms is a typed rejection.
+    sessionConfigOptionOverrides: AcpConfigOptionOverridesV1Schema.optional(),
+    configOptions: z.record(z.string().min(1), SpawnConfigOptionValueSchema).optional(),
     resumeHandle: z.unknown().nullable().optional(),
     replay: z.unknown().optional(),
+    // Optional connected-services selection binding the run's backend to a specific account/pool
+    // instead of the runner's inherited account. Accepts the simple string form
+    // (e.g. "openai-codex:group:happier" or "openai-codex:team") or a full bindings object; normalized
+    // at the action boundary. Omit to use the account's configured default exactly as stored (literal:
+    // a profile default binds to that profile, a pool default binds to that pool — no silent upgrade).
+    connectedServices: z.unknown().optional(),
 }).passthrough();
 const ExecutionRunGetInputSchema = ExecutionRunIdInputSchema.extend({
     includeStructured: z.boolean().optional(),
@@ -234,7 +354,7 @@ const ExecutionRunActionInputSchema = ExecutionRunIdInputSchema.extend({
     input: z.unknown().optional(),
 }).passthrough();
 const ExecutionRunWaitInputSchema = ExecutionRunIdInputSchema.extend({
-    timeoutSeconds: z.number().int().min(1).max(3600).optional(),
+    timeoutSeconds: z.number().int().min(1).optional(),
     pollIntervalMs: z.number().int().min(100).max(60_000).optional(),
 }).passthrough();
 const SessionOpenInputSchema = z.object({
@@ -249,9 +369,16 @@ const SessionOpenInputSchema = z.object({
         });
     }
 });
-const SessionForkInputSchema = z.object({
-    sessionId: z.string().min(1).optional(),
-}).passthrough();
+/**
+ * Action-facing fork recipe. The transport's parent session id is resolved from
+ * the action input/context, while legacy callers may continue to omit a fork
+ * point and let their host adapter apply its existing default.
+ */
+export const SessionForkActionInputSchema = SessionForkRpcParamsSchema
+    .omit({ v: true, parentSessionId: true })
+    .partial()
+    .extend({ sessionId: z.string().min(1).optional() })
+    .passthrough();
 const SessionRollbackInputSchema = z.object({
     sessionId: z.string().min(1).optional(),
     target: SessionRollbackTargetSchema.optional(),
@@ -259,19 +386,154 @@ const SessionRollbackInputSchema = z.object({
 const SessionHandoffInputSchema = z.object({
     sessionId: z.string().min(1).optional(),
     targetMachineId: z.string().min(1).optional(),
+    targetPath: z.string().min(1).optional(),
     targetSessionStorageMode: z.enum(['direct', 'persisted']).optional(),
     workspaceTransfer: SessionHandoffWorkspaceTransferSchema.optional(),
 }).passthrough();
-const SessionSpawnNewInputSchema = z.object({
+const SessionSpawnTerminalInputSchema = z.object({
+    mode: z.enum(['plain', 'tmux', 'windows_terminal', 'windows_console']).optional(),
+    tmux: z.object({
+        sessionName: z.string().optional(),
+        isolated: z.boolean().optional(),
+        tmpDir: z.string().nullable().optional(),
+    }).strict().optional(),
+}).strict();
+function normalizeSpawnTargetAlias(value) {
+    const trimmed = value.trim();
+    if (BackendTargetKeySchema.safeParse(trimmed).success)
+        return trimmed;
+    return trimmed === 'customAcp' ? trimmed : `agent:${trimmed}`;
+}
+const SessionSpawnAttemptIdentifierSchema = z.string().refine((value) => value.trim().length > 0, {
+    message: 'Spawn attempt identifier must not be blank',
+});
+export const SessionSpawnNewInputSchema = z.object({
     tag: z.string().min(1).optional(),
-    agentId: z.string().min(1).optional(),
+    tags: z.array(z.string().min(1)).optional(),
+    agentId: z.string().trim().min(1).optional(),
+    backend: z.string().trim().min(1).optional(),
+    target: z.string().trim().min(1).optional(),
     modelId: z.string().min(1).optional(),
-    backendTargetKey: z.string().min(1).optional(),
+    backendTargetKey: BackendTargetKeySchema.optional(),
+    backendTarget: BackendTargetRefSchema.optional(),
     title: z.string().min(1).optional(),
     path: z.string().min(1).optional(),
+    directory: z.string().min(1).optional(),
+    approvedNewDirectoryCreation: z.boolean().optional(),
     host: z.string().min(1).optional(),
+    machineId: z.string().min(1).optional(),
+    spawnNonce: SessionSpawnAttemptIdentifierSchema.optional(),
+    userAttemptId: SessionSpawnAttemptIdentifierSchema.optional(),
+    firstTurnLocalId: SessionSpawnAttemptIdentifierSchema.optional(),
+    attachmentMessageLocalId: SessionSpawnAttemptIdentifierSchema.optional(),
+    pendingFirstInput: PendingFirstInputV1Schema.optional(),
+    prompt: z.string().min(1).optional(),
+    initialPrompt: z.string().min(1).optional(),
     initialMessage: z.string().min(1).optional(),
-}).passthrough();
+    permissionMode: SessionPermissionModeInputSchema.optional(),
+    permissionModeUpdatedAt: z.number().int().optional(),
+    agentModeId: z.string().min(1).optional(),
+    agentModeUpdatedAt: z.number().int().optional(),
+    modelUpdatedAt: z.number().int().optional(),
+    sessionConfigOptionOverrides: AcpConfigOptionOverridesV1Schema.optional(),
+    configOptions: z.record(z.string().min(1), SpawnConfigOptionValueSchema).optional(),
+    profileId: z.string().min(1).optional(),
+    resume: z.string().trim().min(1).optional(),
+    environmentVariables: z.record(z.string().min(1), z.string()).optional(),
+    connectedServices: ConnectedServiceBindingsV1Schema.optional(),
+    connectedServicesUpdatedAt: z.number().int().optional(),
+    mcpSelection: SessionMcpSelectionV1Schema.optional(),
+    transcriptStorage: z.enum(['persisted', 'direct']).optional(),
+    terminal: SessionSpawnTerminalInputSchema.optional(),
+    windowsRemoteSessionLaunchMode: z.enum(['hidden', 'windows_terminal', 'console']).optional(),
+    windowsRemoteSessionConsole: z.enum(['hidden', 'visible']).optional(),
+    windowsTerminalWindowName: z.string().min(1).optional(),
+    experimentalCodexAcp: z.boolean().optional(),
+    codexBackendMode: z.enum(['mcp', 'acp', 'appServer']).optional(),
+    agentRuntimeDescriptorV1: AgentRuntimeDescriptorV1Schema.optional(),
+    /**
+     * Typed source recipe for a configurable Replay-seeded child Session.
+     *
+     * When present this is required semantics: the daemon resolves the source
+     * transcript and Replay seed before creating the child, and a failure creates
+     * no child. This schema is `.strict()`, so a daemon that predates the field
+     * rejects the whole request rather than silently creating an ordinary child.
+     * This is required semantics on the Action input, not an inspection-negotiated
+     * capability.
+     */
+    sourceContext: SessionSpawnSourceContextV1Schema.optional(),
+}).strict().superRefine((value, ctx) => {
+    const record = value;
+    const rejectConflictingAliases = (fields) => {
+        const defined = fields
+            .map((field) => ({ field, value: record[field] }))
+            .filter((entry) => typeof entry.value === 'string');
+        if (defined.length < 2)
+            return;
+        const first = defined[0]?.value;
+        if (defined.every((entry) => entry.value === first))
+            return;
+        for (const entry of defined) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `${fields.join('/')} aliases must agree`,
+                path: [entry.field],
+            });
+        }
+    };
+    const rejectConflictingTargetAliases = () => {
+        const aliases = [];
+        if (typeof value.agentId === 'string')
+            aliases.push({ field: 'agentId', value: normalizeSpawnTargetAlias(value.agentId) });
+        if (typeof value.backend === 'string')
+            aliases.push({ field: 'backend', value: normalizeSpawnTargetAlias(value.backend) });
+        if (typeof value.target === 'string')
+            aliases.push({ field: 'target', value: normalizeSpawnTargetAlias(value.target) });
+        if (typeof value.backendTargetKey === 'string') {
+            aliases.push({ field: 'backendTargetKey', value: value.backendTargetKey });
+        }
+        if (value.backendTarget) {
+            aliases.push({ field: 'backendTarget', value: buildBackendTargetKey(value.backendTarget) });
+        }
+        const concreteValues = aliases.map((alias) => alias.value).filter((alias) => alias !== 'customAcp');
+        const hasCustomAcpAlias = aliases.some((alias) => alias.value === 'customAcp');
+        if (aliases.length < 2 && !hasCustomAcpAlias)
+            return;
+        const hasConflictingConcreteTargets = new Set(concreteValues).size > 1;
+        const hasBuiltInTarget = concreteValues.some((alias) => alias.startsWith('agent:'));
+        const hasConcreteAcpTarget = concreteValues.some((alias) => alias.startsWith('acpBackend:'));
+        if (!hasConflictingConcreteTargets && !(hasCustomAcpAlias && hasBuiltInTarget) && !(hasCustomAcpAlias && !hasConcreteAcpTarget))
+            return;
+        for (const alias of aliases) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'spawn target aliases must agree',
+                path: [alias.field],
+            });
+        }
+    };
+    const rejectConflictingConfigAliases = () => {
+        for (const conflict of findSpawnConfigOptionAliasConflicts({
+            sessionConfigOptionOverrides: value.sessionConfigOptionOverrides,
+            configOptions: value.configOptions,
+        })) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'configOptions must agree with sessionConfigOptionOverrides',
+                path: ['configOptions', conflict.optionId],
+            });
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'sessionConfigOptionOverrides must agree with configOptions',
+                path: ['sessionConfigOptionOverrides', 'overrides', conflict.optionId, 'value'],
+            });
+        }
+    };
+    rejectConflictingAliases(['path', 'directory']);
+    rejectConflictingAliases(['prompt', 'initialPrompt', 'initialMessage']);
+    rejectConflictingTargetAliases();
+    rejectConflictingConfigAliases();
+});
 const SessionSpawnPickerInputSchema = z.object({
     tag: z.string().min(1).optional(),
     agentId: z.string().min(1).optional(),
@@ -328,6 +590,59 @@ const AgentsModelsListInputSchema = z.object({
         }
     }
 });
+const AgentsSessionModesListInputSchema = AgentsModelsListInputSchema;
+const AgentsConfigOptionsListInputSchema = AgentsModelsListInputSchema;
+const SpawnDiscoveryAgentContextInputSchema = z.object({
+    agentId: z.string().min(1).optional(),
+    backendTargetKey: BackendTargetKeySchema.optional(),
+    includeDisabled: z.boolean().optional(),
+    includeUnavailable: z.boolean().optional(),
+    limit: z.number().int().min(1).max(200).optional(),
+}).passthrough().superRefine((value, ctx) => {
+    if (value.agentId && value.backendTargetKey) {
+        const parsedTarget = parseBackendTargetKey(value.backendTargetKey);
+        const derivedAgentId = parsedTarget.kind === 'builtInAgent' ? parsedTarget.agentId : 'customAcp';
+        if (value.agentId !== derivedAgentId) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'agentId must match backendTargetKey when both are provided',
+                path: ['agentId'],
+            });
+        }
+    }
+});
+const SessionsSpawnProfilesListInputSchema = SpawnDiscoveryAgentContextInputSchema;
+const SessionsSpawnConnectedServicesListInputSchema = SpawnDiscoveryAgentContextInputSchema;
+const SessionsSpawnMcpServersPreviewInputSchema = z.object({
+    agentId: z.string().min(1).optional(),
+    backendTargetKey: BackendTargetKeySchema.optional(),
+    machineId: z.string().min(1).optional(),
+    serverId: z.string().min(1).optional(),
+    path: z.string().min(1).optional(),
+    directory: z.string().min(1).optional(),
+    mcpSelection: SessionMcpSelectionV1Schema.optional(),
+    selection: SessionMcpSelectionV1Schema.optional(),
+    limit: z.number().int().min(1).max(200).optional(),
+}).passthrough().superRefine((value, ctx) => {
+    if (value.agentId && value.backendTargetKey) {
+        const parsedTarget = parseBackendTargetKey(value.backendTargetKey);
+        const derivedAgentId = parsedTarget.kind === 'builtInAgent' ? parsedTarget.agentId : 'customAcp';
+        if (value.agentId !== derivedAgentId) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'agentId must match backendTargetKey when both are provided',
+                path: ['agentId'],
+            });
+        }
+    }
+    if (value.path && value.directory && value.path !== value.directory) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'path and directory aliases must agree',
+            path: ['directory'],
+        });
+    }
+});
 const ActionSpecSearchInputSchema = z.object({
     query: z.string().trim().optional(),
     limit: z.number().int().min(1).max(100).optional(),
@@ -357,8 +672,12 @@ const ActionOptionsResolveInputSchema = z.object({
 const SessionSendMessageInputSchema = z.object({
     sessionId: z.string().min(1).optional(),
     message: z.string().min(1),
+    requestedAction: PendingRequestedActionV1Schema.optional(),
     permissionModeOverride: z.string().trim().min(1).optional(),
-    modelOverride: z.union([z.string().trim().min(1), z.null()]).optional(),
+    modelOverride: z.union([
+        z.string().refine((value) => value.trim().length > 0, { message: 'Model override must not be blank' }),
+        z.null(),
+    ]).optional(),
     wait: z.boolean().optional(),
     timeoutSeconds: z.number().int().min(1).max(3600).optional(),
 }).passthrough();
@@ -368,19 +687,49 @@ const SessionPermissionRespondInputSchema = z.object({
     requestId: z.string().min(1).optional(),
 }).passthrough();
 const SessionUserActionAnswerItemSchema = z.object({
-    question: z.string().trim().min(1),
-    answer: z.string().trim().min(1),
-}).strict();
+    question: z.string()
+        .min(1)
+        .max(STRUCTURED_QUESTION_LIMITS.maxStringLength)
+        .refine((value) => value.trim().length > 0, { message: 'question must not be blank' }),
+    values: z.array(z.string().max(STRUCTURED_QUESTION_LIMITS.maxStringLength))
+        .min(1)
+        .max(STRUCTURED_QUESTION_LIMITS.maxAnswersPerQuestion)
+        .optional(),
+    answer: z.string().min(1).max(STRUCTURED_QUESTION_LIMITS.maxStringLength).optional(),
+}).strict().superRefine((value, ctx) => {
+    if (value.answer !== undefined && value.values !== undefined) {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'answer and values cannot both be provided' });
+    }
+    if (value.answer === undefined && value.values === undefined) {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'answer or values is required' });
+    }
+});
 const SessionUserActionAnswerInputSchema = z.object({
     sessionId: z.string().min(1).optional(),
     requestId: z.string().min(1).optional(),
     decision: z.enum(['approve', 'reject', 'request_changes']).optional(),
     reason: z.string().trim().min(1).optional(),
-    answers: z.array(SessionUserActionAnswerItemSchema).min(1).optional(),
+    answers: z.array(SessionUserActionAnswerItemSchema)
+        .min(1)
+        .max(STRUCTURED_QUESTION_LIMITS.maxQuestions)
+        .optional(),
     updatedPermissions: z.unknown().optional(),
 }).passthrough().superRefine((value, ctx) => {
     const hasAnswers = Array.isArray(value.answers) && value.answers.length > 0;
+    const seenQuestions = new Set();
+    for (const [index, entry] of (value.answers ?? []).entries()) {
+        if (seenQuestions.has(entry.question)) {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'duplicate question', path: ['answers', index, 'question'] });
+        }
+        seenQuestions.add(entry.question);
+        if (entry.values && new Set(entry.values).size !== entry.values.length) {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'duplicate answer value', path: ['answers', index, 'values'] });
+        }
+    }
     const decision = typeof value.decision === 'string' ? value.decision : null;
+    if (hasAnswers && decision && decision !== 'approve') {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'answers cannot accompany a rejecting decision', path: ['decision'] });
+    }
     if (!hasAnswers && !decision) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -425,6 +774,7 @@ const SessionListInputSchema = z.object({
     archivedOnly: z.boolean().optional(),
     includeSystem: z.boolean().optional(),
     resumableOnly: z.boolean().optional(),
+    includeRows: z.boolean().optional(),
 }).passthrough();
 const SessionActivityInputSchema = z.object({
     sessionId: z.string().min(1),
@@ -461,6 +811,7 @@ const ApprovalRequestCreateInputSchema = z.object({
     actionArgs: z.unknown(),
     summary: z.string().min(1),
     createdBy: ApprovalRequestCreatedBySchema,
+    origin: ApprovalRequestOriginV1Schema.optional(),
     preview: z.unknown().optional(),
 }).passthrough();
 const ApprovalRequestDecideInputSchema = z.object({
@@ -514,12 +865,16 @@ const PromptRegistryInstallInputSchema = z.object({
         installMode: PromptAssetInstallModeV1Schema.optional(),
     }).optional(),
 }).passthrough();
+const APPROVAL_RESULT_REQUIRED = Object.freeze({ result: 'required' });
+const APPROVAL_RESULT_NONE = Object.freeze({ result: 'none' });
+const APPROVAL_RESULT_OPTIONAL_DEFERRED = Object.freeze({ result: 'optional', flow: 'deferred' });
 export const ACTION_SPECS = Object.freeze([
     {
         id: 'action.spec.search',
         title: 'Search action specs',
         description: 'Search available Happier action specs by name, description, bindings, and field hints.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'searchActionSpecs', mcpToolName: 'action_spec_search' },
@@ -530,7 +885,7 @@ export const ACTION_SPECS = Object.freeze([
             ui_button: false,
             ui_slash_command: false,
             voice_tool: true,
-            voice_action_block: true,
+            voice_action_block: false,
             session_agent: true,
             mcp: true,
             cli: false,
@@ -550,6 +905,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Get action spec',
         description: 'Get one Happier action spec with input hints and examples.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'getActionSpec', mcpToolName: 'action_spec_get' },
@@ -578,6 +934,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Resolve action options',
         description: 'Resolve valid options for an action field, including dynamic options sources.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'resolveActionOptions', mcpToolName: 'action_options_resolve' },
@@ -611,6 +968,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'review.start',
         title: 'Start review',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['agent_input_chips', 'session_action_menu', 'command_palette', 'slash_command', 'voice_panel'],
         prompting: { voiceHotPath: true },
         slash: { tokens: ['/review', '/h.review'] },
@@ -633,7 +991,6 @@ export const ACTION_SPECS = Object.freeze([
                     title: 'Instructions',
                     description: 'What you want the reviewers to focus on.',
                     widget: 'textarea',
-                    required: true,
                 },
                 {
                     path: 'changeType',
@@ -703,18 +1060,19 @@ export const ACTION_SPECS = Object.freeze([
         id: 'subagents.plan.start',
         title: 'Start plan run',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['agent_input_chips', 'session_action_menu', 'command_palette', 'slash_command', 'voice_panel'],
         prompting: { voiceHotPath: true },
         slash: { tokens: ['/h.plan'] },
         bindings: { voiceClientToolName: 'startPlan', mcpToolName: 'subagents_plan_start' },
         inputHints: {
             title: 'Start a planning run',
-            description: 'Start one or more parallel planning runs using selected backends.',
+            description: 'Start Happier-managed planning runs using explicit agent provider/backend targets.',
             fields: [
                 {
                     path: 'backendTargetKeys',
-                    title: 'Backends',
-                    description: 'Select one or more backends. Each backend runs as its own execution run.',
+                    title: 'Provider/backend targets',
+                    description: 'Select the agent provider/backend targets to use. These choose agent implementations, not parallelism capacity slots.',
                     widget: 'multiselect',
                     required: true,
                     optionsSourceId: 'execution.backends.enabled',
@@ -726,6 +1084,33 @@ export const ACTION_SPECS = Object.freeze([
                     widget: 'textarea',
                     required: true,
                 },
+                {
+                    path: 'modelId',
+                    title: 'Model',
+                    description: 'Optional. Model id for the run(s), using the SAME shape as session spawn. Applies to every target; omit to use each backend\'s default model. Enumerate valid ids with the agents.models.available options source.',
+                    widget: 'text',
+                    optionsSourceId: 'agents.models.available',
+                },
+                {
+                    path: 'configOptions',
+                    title: 'Config options (e.g. reasoning effort)',
+                    description: 'Optional. Per-run config options using the SAME vocabulary as session spawn, e.g. { "reasoning_effort": "high" }. Reasoning effort is the reasoning_effort option (values are backend-specific, e.g. Codex low|medium|high|xhigh). Merged with sessionConfigOptionOverrides; a conflicting value in both forms is rejected.',
+                    widget: 'text',
+                },
+                {
+                    path: 'connectedServices',
+                    title: 'Connected services (account/pool)',
+                    description: 'Optional. Bind these runs to a connected account or pool instead of the runner\'s inherited account. Simple form: "openai-codex:group:<poolId>" (a pool — auto-rotates when autoSwitch is enabled), "openai-codex:<profileId>" (a single account), "openai-codex:native" (opt out), or a full { v:1, bindingsByServiceId } object. Applies to every target; omit to use each account\'s configured default exactly as stored (literal: a profile default binds to that profile, a pool default to that pool — no silent upgrade; to rotate, store a pool default or pass a pool selection).',
+                    widget: 'text',
+                    optionsSourceId: 'execution.runs.connected_services.available',
+                },
+                {
+                    path: 'connectedServicesByBackendTargetKey',
+                    title: 'Connected services per target',
+                    description: 'Optional per-target override, e.g. { "agent:codex": "openai-codex:group:<poolId>" }. A per-target entry wins over connectedServices for that target.',
+                    widget: 'text',
+                    optionsSourceId: 'execution.runs.connected_services.available',
+                },
             ],
         },
         examples: {
@@ -746,18 +1131,19 @@ export const ACTION_SPECS = Object.freeze([
         id: 'subagents.delegate.start',
         title: 'Start delegate run',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['agent_input_chips', 'session_action_menu', 'command_palette', 'slash_command', 'voice_panel'],
         prompting: { voiceHotPath: true },
         slash: { tokens: ['/h.delegate'] },
         bindings: { voiceClientToolName: 'startDelegate', mcpToolName: 'subagents_delegate_start' },
         inputHints: {
             title: 'Start a delegation run',
-            description: 'Start one or more parallel delegation runs using selected backends.',
+            description: 'Start Happier-managed delegation runs using explicit agent provider/backend targets.',
             fields: [
                 {
                     path: 'backendTargetKeys',
-                    title: 'Backends',
-                    description: 'Select one or more backends. Each backend runs as its own execution run.',
+                    title: 'Provider/backend targets',
+                    description: 'Select the agent provider/backend targets to use. These choose agent implementations, not parallelism capacity slots.',
                     widget: 'multiselect',
                     required: true,
                     optionsSourceId: 'execution.backends.enabled',
@@ -769,6 +1155,40 @@ export const ACTION_SPECS = Object.freeze([
                     widget: 'textarea',
                     required: true,
                 },
+                {
+                    path: 'permissionMode',
+                    title: 'Permission mode',
+                    description: EXECUTION_RUN_ACTION_PERMISSION_MODE_DESCRIPTION,
+                    widget: 'select',
+                    options: EXECUTION_RUN_ACTION_PERMISSION_MODES.map((value) => ({ value, label: value })),
+                },
+                {
+                    path: 'modelId',
+                    title: 'Model',
+                    description: 'Optional. Model id for the run(s), using the SAME shape as session spawn. Applies to every target; omit to use each backend\'s default model. Enumerate valid ids with the agents.models.available options source.',
+                    widget: 'text',
+                    optionsSourceId: 'agents.models.available',
+                },
+                {
+                    path: 'configOptions',
+                    title: 'Config options (e.g. reasoning effort)',
+                    description: 'Optional. Per-run config options using the SAME vocabulary as session spawn, e.g. { "reasoning_effort": "high" }. Reasoning effort is the reasoning_effort option (values are backend-specific, e.g. Codex low|medium|high|xhigh). Merged with sessionConfigOptionOverrides; a conflicting value in both forms is rejected.',
+                    widget: 'text',
+                },
+                {
+                    path: 'connectedServices',
+                    title: 'Connected services (account/pool)',
+                    description: 'Optional. Bind these runs to a connected account or pool instead of the runner\'s inherited account. Simple form: "openai-codex:group:<poolId>" (a pool — auto-rotates when autoSwitch is enabled), "openai-codex:<profileId>" (a single account), "openai-codex:native" (opt out), or a full { v:1, bindingsByServiceId } object. Applies to every target; omit to use each account\'s configured default exactly as stored (literal: a profile default binds to that profile, a pool default to that pool — no silent upgrade; to rotate, store a pool default or pass a pool selection).',
+                    widget: 'text',
+                    optionsSourceId: 'execution.runs.connected_services.available',
+                },
+                {
+                    path: 'connectedServicesByBackendTargetKey',
+                    title: 'Connected services per target',
+                    description: 'Optional per-target override, e.g. { "agent:codex": "openai-codex:group:<poolId>" }. A per-target entry wins over connectedServices for that target.',
+                    widget: 'text',
+                    optionsSourceId: 'execution.runs.connected_services.available',
+                },
             ],
         },
         examples: {
@@ -789,6 +1209,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'voice_agent.start',
         title: 'Start voice agent run',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         slash: { tokens: ['/h.voice'] },
         bindings: { voiceClientToolName: 'startVoiceAgentRun', mcpToolName: 'voice_agent_start' },
@@ -798,8 +1219,8 @@ export const ACTION_SPECS = Object.freeze([
             fields: [
                 {
                     path: 'backendTargetKeys',
-                    title: 'Backends',
-                    description: 'Select one or more backends.',
+                    title: 'Provider/backend targets',
+                    description: 'Select the agent provider/backend targets to use for the voice agent run.',
                     widget: 'multiselect',
                     required: true,
                     optionsSourceId: 'execution.backends.enabled',
@@ -811,6 +1232,20 @@ export const ACTION_SPECS = Object.freeze([
                     widget: 'textarea',
                     required: true,
                 },
+                {
+                    path: 'connectedServices',
+                    title: 'Connected services (account/pool)',
+                    description: 'Optional. Bind the run to a connected account or pool instead of the runner\'s inherited account. Simple form: "openai-codex:group:<poolId>" (a pool — auto-rotates when autoSwitch is enabled), "openai-codex:<profileId>" (a single account), "openai-codex:native" (opt out), or a full { v:1, bindingsByServiceId } object. Omit to use the account\'s configured default exactly as stored (literal: a profile default binds to that profile, a pool default to that pool — no silent upgrade; to rotate, store a pool default or pass a pool selection).',
+                    widget: 'text',
+                    optionsSourceId: 'execution.runs.connected_services.available',
+                },
+                {
+                    path: 'connectedServicesByBackendTargetKey',
+                    title: 'Connected services per target',
+                    description: 'Optional per-target override, e.g. { "agent:codex": "openai-codex:group:<poolId>" }. A per-target entry wins over connectedServices for that target.',
+                    widget: 'text',
+                    optionsSourceId: 'execution.runs.connected_services.available',
+                },
             ],
         },
         examples: {
@@ -821,7 +1256,7 @@ export const ACTION_SPECS = Object.freeze([
             ui_slash_command: false,
             voice_tool: true,
             voice_action_block: true,
-            session_agent: true,
+            session_agent: false,
             mcp: true,
             cli: true,
         },
@@ -832,6 +1267,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Start execution run',
         description: 'Start a new execution run within a session.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: [],
         bindings: { mcpToolName: 'execution_run_start' },
         examples: {
@@ -860,6 +1296,32 @@ export const ACTION_SPECS = Object.freeze([
                 { path: 'runClass', title: 'Run class', widget: 'text', required: true },
                 { path: 'ioMode', title: 'IO mode', widget: 'text', required: true },
                 { path: 'initialContextMode', title: 'Initial context mode', widget: 'text' },
+                {
+                    path: 'modelId',
+                    title: 'Model',
+                    description: 'Optional. Model id for the run\'s backend, using the SAME shape as session spawn. Omit to use the backend\'s default model. Enumerate valid ids with the agents.models.available options source.',
+                    widget: 'text',
+                    optionsSourceId: 'agents.models.available',
+                },
+                {
+                    path: 'configOptions',
+                    title: 'Config options (e.g. reasoning effort)',
+                    description: 'Optional. Per-run config options using the SAME vocabulary as session spawn, e.g. { "reasoning_effort": "high" }. Reasoning effort is the reasoning_effort option (values are backend-specific, e.g. Codex low|medium|high|xhigh). Merged with sessionConfigOptionOverrides; a conflicting value in both forms is rejected.',
+                    widget: 'text',
+                },
+                {
+                    path: 'sessionConfigOptionOverrides',
+                    title: 'Config option overrides (canonical json)',
+                    description: 'Optional. Canonical AcpConfigOptionOverridesV1 object (same shape session spawn uses). Prefer the configOptions shorthand for simple cases like reasoning effort.',
+                    widget: 'textarea',
+                },
+                {
+                    path: 'connectedServices',
+                    title: 'Connected services (account/pool)',
+                    description: 'Optional. Bind the run to a connected account or pool instead of the runner\'s inherited account. Simple form: "openai-codex:group:<poolId>" (a pool — auto-rotates when autoSwitch is enabled), "openai-codex:<profileId>" (a single account), "openai-codex:native" (opt out), or a full { v:1, bindingsByServiceId } object. Omit to use the account\'s configured default exactly as stored (literal: a profile default binds to that profile, a pool default to that pool — no silent upgrade; to rotate, store a pool default or pass a pool selection).',
+                    widget: 'text',
+                    optionsSourceId: 'execution.runs.connected_services.available',
+                },
             ],
         },
         inputSchema: ExecutionRunStartInputSchema,
@@ -868,6 +1330,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'execution.run.list',
         title: 'List execution runs',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['run_list', 'command_palette', 'slash_command', 'voice_panel'],
         prompting: { voiceHotPath: true },
         slash: { tokens: ['/h.runs'] },
@@ -912,6 +1375,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'execution.run.get',
         title: 'Get execution run',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['run_list', 'run_card', 'command_palette'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'getExecutionRun', mcpToolName: 'execution_run_get' },
@@ -923,7 +1387,7 @@ export const ACTION_SPECS = Object.freeze([
             ui_slash_command: false,
             voice_tool: true,
             voice_action_block: true,
-            session_agent: true,
+            session_agent: false,
             mcp: true,
             cli: true,
         },
@@ -940,6 +1404,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'execution.run.send',
         title: 'Send to execution run',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['run_card'],
         bindings: { voiceClientToolName: 'sendExecutionRunMessage', mcpToolName: 'execution_run_send' },
         examples: {
@@ -968,6 +1433,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'execution.run.stop',
         title: 'Stop execution run',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['run_card', 'run_list'],
         bindings: { voiceClientToolName: 'stopExecutionRun', mcpToolName: 'execution_run_stop' },
         examples: {
@@ -992,6 +1458,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'execution.run.action',
         title: 'Apply execution run action',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['run_card'],
         bindings: { voiceClientToolName: 'actionExecutionRun', mcpToolName: 'execution_run_action' },
         examples: {
@@ -1019,12 +1486,13 @@ export const ACTION_SPECS = Object.freeze([
     {
         id: 'execution.run.wait',
         title: 'Wait for execution run',
-        description: 'Wait until an execution run reaches a terminal status (succeeded/failed/cancelled/timeout).',
+        description: 'Wait until an execution run reaches a terminal status. Pass timeoutSeconds to bound the wait; omit it for no Happier-side deadline.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: [],
         bindings: { mcpToolName: 'execution_run_wait' },
         examples: {
-            mcp: { argsExample: '{"sessionId":"{{sessionId}}","runId":"run_123","timeoutSeconds":300}' },
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","runId":"run_123"}' },
         },
         surfaces: {
             ui_button: false,
@@ -1040,7 +1508,7 @@ export const ACTION_SPECS = Object.freeze([
             fields: [
                 { path: 'sessionId', title: 'Session id', widget: 'text' },
                 { path: 'runId', title: 'Run id', widget: 'text', required: true },
-                { path: 'timeoutSeconds', title: 'Timeout seconds', widget: 'text' },
+                { path: 'timeoutSeconds', title: 'Timeout seconds (optional)', widget: 'text' },
                 { path: 'pollIntervalMs', title: 'Poll interval (ms)', widget: 'text' },
             ],
         },
@@ -1050,6 +1518,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'session.open',
         title: 'Open session',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['command_palette', 'session_info', 'voice_panel'],
         bindings: { voiceClientToolName: 'openSession' },
         examples: {
@@ -1078,6 +1547,8 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Fork session',
         description: 'Create a new session from the latest state of the selected session.',
         safety: 'safe',
+        operation: { version: 1, visibility: 'activity', progress: 'indeterminate' },
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['session_action_menu', 'session_info', 'command_palette', 'slash_command', 'voice_panel', 'agent_input_chips'],
         slash: { tokens: ['fork'] },
         bindings: { voiceClientToolName: 'forkSession' },
@@ -1098,13 +1569,14 @@ export const ACTION_SPECS = Object.freeze([
             description: 'Forks from the latest message in the session.',
             fields: [{ path: 'sessionId', title: 'Session id', widget: 'text' }],
         },
-        inputSchema: SessionForkInputSchema,
+        inputSchema: SessionForkActionInputSchema,
     },
     {
         id: 'session.rollback',
         title: 'Rollback conversation',
         description: 'Roll back conversation state in the selected session.',
         safety: 'danger',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['session_action_menu', 'session_info'],
         surfaces: {
             ui_button: true,
@@ -1127,6 +1599,8 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Hand off session',
         description: 'Move the current session to another machine while keeping the same session id.',
         safety: 'safe',
+        operation: { version: 1, visibility: 'activity', progress: 'reported' },
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['session_action_menu', 'session_info'],
         examples: {
             voice: { argsExample: '{"sessionId":"{{sessionId}}","targetMachineId":"{{machineId}}"}' },
@@ -1154,6 +1628,8 @@ export const ACTION_SPECS = Object.freeze([
         id: 'session.spawn_new',
         title: 'Create session',
         safety: 'safe',
+        operation: { version: 1, visibility: 'activity', progress: 'reported' },
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['command_palette', 'session_info', 'voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'spawnSession', mcpToolName: 'session_spawn_new' },
@@ -1165,7 +1641,7 @@ export const ACTION_SPECS = Object.freeze([
             ui_slash_command: false,
             voice_tool: true,
             voice_action_block: true,
-            session_agent: false,
+            session_agent: true,
             mcp: true,
             cli: true,
         },
@@ -1174,11 +1650,18 @@ export const ACTION_SPECS = Object.freeze([
             fields: [
                 { path: 'tag', title: 'Tag', widget: 'text' },
                 { path: 'agentId', title: 'Agent id', widget: 'text' },
-                { path: 'modelId', title: 'Model id', widget: 'text' },
-                { path: 'backendTargetKey', title: 'Backend target key', widget: 'text' },
+                { path: 'modelId', title: 'Model id', widget: 'text', optionsSourceId: 'agents.models.available' },
+                { path: 'backendTargetKey', title: 'Backend target key', widget: 'text', optionsSourceId: 'agents.backends.enabled' },
                 { path: 'title', title: 'Title', widget: 'text' },
-                { path: 'path', title: 'Path', widget: 'text' },
+                { path: 'path', title: 'Path', widget: 'text', optionsSourceId: 'sessions.spawn.paths.recent' },
+                { path: 'machineId', title: 'Machine id', widget: 'text', optionsSourceId: 'sessions.spawn.machines.available' },
                 { path: 'host', title: 'Host', widget: 'text' },
+                { path: 'permissionMode', title: 'Permission mode', widget: 'text' },
+                { path: 'agentModeId', title: 'Agent mode id', widget: 'text', optionsSourceId: 'agents.session_modes.available' },
+                { path: 'sessionConfigOptionOverrides', title: 'Config option overrides', widget: 'text', optionsSourceId: 'agents.config_options.available' },
+                { path: 'profileId', title: 'Profile id', widget: 'text', optionsSourceId: 'sessions.spawn.profiles.available' },
+                { path: 'connectedServices', title: 'Connected services', widget: 'text', optionsSourceId: 'sessions.spawn.connected_services.available' },
+                { path: 'mcpSelection', title: 'MCP selection', widget: 'text', optionsSourceId: 'sessions.spawn.mcp_servers.preview' },
                 { path: 'initialMessage', title: 'Initial message', widget: 'textarea' },
             ],
         },
@@ -1189,6 +1672,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Create session (picker)',
         description: 'Open the in-app machine + directory picker and create a new session from the user selection.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'spawnSessionPicker' },
@@ -1220,6 +1704,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'List recent paths',
         description: 'List recent workspace directory handles (optionally filtered to a machine).',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'listRecentPaths' },
         examples: {
@@ -1230,7 +1715,7 @@ export const ACTION_SPECS = Object.freeze([
             ui_slash_command: false,
             voice_tool: true,
             voice_action_block: true,
-            session_agent: false,
+            session_agent: true,
             mcp: true,
             cli: true,
         },
@@ -1248,6 +1733,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'List machines',
         description: 'List machines available on the active server scope.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'listMachines' },
         examples: {
@@ -1258,9 +1744,9 @@ export const ACTION_SPECS = Object.freeze([
             ui_slash_command: false,
             voice_tool: true,
             voice_action_block: true,
-            session_agent: false,
-            mcp: false,
-            cli: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
         },
         inputHints: {
             title: 'List machines',
@@ -1273,6 +1759,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'List servers',
         description: 'List servers configured in the client.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'listServers' },
         examples: {
@@ -1283,9 +1770,9 @@ export const ACTION_SPECS = Object.freeze([
             ui_slash_command: false,
             voice_tool: true,
             voice_action_block: true,
-            session_agent: false,
-            mcp: false,
-            cli: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
         },
         inputHints: {
             title: 'List servers',
@@ -1298,6 +1785,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'List review engines',
         description: 'List review engines currently available for the active session.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'listReviewEngines' },
         examples: {
@@ -1326,6 +1814,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'List agent backends',
         description: 'List available agent backends (providers) for spawning sessions.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'listAgentBackends', mcpToolName: 'agents_backends_list' },
@@ -1355,6 +1844,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'List agent models',
         description: 'List available models for an agent backend.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'listAgentModels', mcpToolName: 'agents_models_list' },
@@ -1382,15 +1872,16 @@ export const ACTION_SPECS = Object.freeze([
         inputSchema: AgentsModelsListInputSchema,
     },
     {
-        id: 'session.message.send',
-        title: 'Send a message to a session',
-        description: 'Send a user message to the AI coding assistant inside the specified session.',
+        id: 'agents.session_modes.list',
+        title: 'List agent session modes',
+        description: 'List available session modes for an agent backend.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
-        bindings: { voiceClientToolName: 'sendSessionMessage', mcpToolName: 'session_message_send' },
+        bindings: { voiceClientToolName: 'listAgentSessionModes', mcpToolName: 'agents_session_modes_list' },
         examples: {
-            voice: { argsExample: '{"sessionId":"{{sessionId}}","message":"Please inspect the latest changes."}' },
+            voice: { argsExample: '{"backendTargetKey":"agent:claude","limit":10}' },
         },
         surfaces: {
             ui_button: false,
@@ -1402,108 +1893,546 @@ export const ACTION_SPECS = Object.freeze([
             cli: true,
         },
         inputHints: {
-            title: 'Send a message',
+            title: 'List agent session modes',
             fields: [
-                { path: 'sessionId', title: 'Session id', widget: 'text' },
-                { path: 'message', title: 'Message', widget: 'textarea', required: true },
-                { path: 'permissionModeOverride', title: 'Permission mode override (optional)', widget: 'text' },
-                { path: 'modelOverride', title: 'Model override (optional)', widget: 'text' },
-                { path: 'wait', title: 'Wait for idle (optional)', widget: 'toggle' },
-                { path: 'timeoutSeconds', title: 'Timeout seconds (optional)', widget: 'text' },
+                { path: 'agentId', title: 'Agent id', widget: 'text' },
+                { path: 'backendTargetKey', title: 'Backend target key', widget: 'text' },
+                { path: 'machineId', title: 'Machine id (optional)', widget: 'text' },
+                { path: 'limit', title: 'Max results', widget: 'text' },
             ],
         },
-        inputSchema: SessionSendMessageInputSchema,
+        inputSchema: AgentsSessionModesListInputSchema,
     },
     {
-        id: 'session.stop',
-        title: 'Stop session',
-        description: 'Request that the local daemon stops the specified session.',
+        id: 'agents.config_options.list',
+        title: 'List agent config options',
+        description: 'List configurable session options for an agent backend without exposing secret values.',
         safety: 'safe',
-        placements: [],
-        bindings: { mcpToolName: 'session_stop' },
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: ['voice_panel'],
+        prompting: { voiceHotPath: true },
+        bindings: { voiceClientToolName: 'listAgentConfigOptions', mcpToolName: 'agents_config_options_list' },
         examples: {
-            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+            voice: { argsExample: '{"backendTargetKey":"agent:claude","limit":10}' },
         },
         surfaces: {
             ui_button: false,
             ui_slash_command: false,
-            voice_tool: false,
-            voice_action_block: false,
+            voice_tool: true,
+            voice_action_block: true,
             session_agent: true,
             mcp: true,
             cli: true,
         },
         inputHints: {
-            title: 'Stop a session',
-            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+            title: 'List agent config options',
+            fields: [
+                { path: 'agentId', title: 'Agent id', widget: 'text' },
+                { path: 'backendTargetKey', title: 'Backend target key', widget: 'text' },
+                { path: 'machineId', title: 'Machine id (optional)', widget: 'text' },
+                { path: 'limit', title: 'Max results', widget: 'text' },
+            ],
         },
-        inputSchema: SessionIdRequiredInputSchema,
+        inputSchema: AgentsConfigOptionsListInputSchema,
     },
     {
-        id: 'session.title.set',
-        title: 'Set session title',
-        description: 'Set the title (summary text) shown for a session.',
+        id: 'sessions.spawn.profiles.list',
+        title: 'List spawn profiles',
+        description: 'List backend profiles available for creating a new session without exposing environment values or secret bindings.',
         safety: 'safe',
-        placements: [],
-        bindings: { mcpToolName: 'session_title_set' },
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: ['voice_panel'],
+        prompting: { voiceHotPath: true },
+        bindings: { voiceClientToolName: 'listSpawnProfiles', mcpToolName: 'sessions_spawn_profiles_list' },
         examples: {
-            voice: { argsExample: '{"sessionId":"{{sessionId}}","title":"Fix flaky tests"}' },
+            voice: { argsExample: '{"backendTargetKey":"agent:claude","limit":10}' },
         },
         surfaces: {
             ui_button: false,
             ui_slash_command: false,
-            voice_tool: false,
-            voice_action_block: false,
+            voice_tool: true,
+            voice_action_block: true,
             session_agent: true,
             mcp: true,
             cli: true,
         },
         inputHints: {
-            title: 'Set title',
+            title: 'List spawn profiles',
             fields: [
-                { path: 'sessionId', title: 'Session id', widget: 'text' },
-                { path: 'title', title: 'Title', widget: 'text', required: true },
+                { path: 'agentId', title: 'Agent id', widget: 'text' },
+                { path: 'backendTargetKey', title: 'Backend target key', widget: 'text' },
+                { path: 'includeDisabled', title: 'Include incompatible', widget: 'toggle' },
+                { path: 'limit', title: 'Max results', widget: 'text' },
             ],
         },
-        inputSchema: SessionTitleSetInputSchema,
+        inputSchema: SessionsSpawnProfilesListInputSchema,
     },
     {
-        id: 'session.permission_mode.set',
-        title: 'Set session permission mode',
-        description: 'Update the permission intent (read_only/workspace_write/etc) for the specified session.',
+        id: 'sessions.spawn.connected_services.list',
+        title: 'List spawn connected services',
+        description: 'List non-secret connected-service profile and group choices available for creating a new session.',
         safety: 'safe',
-        placements: [],
-        bindings: { mcpToolName: 'session_permission_mode_set' },
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: ['voice_panel'],
+        prompting: { voiceHotPath: true },
+        bindings: { voiceClientToolName: 'listSpawnConnectedServices', mcpToolName: 'sessions_spawn_connected_services_list' },
         examples: {
-            mcp: { argsExample: '{"sessionId":"{{sessionId}}","permissionMode":"read_only"}' },
+            voice: { argsExample: '{"backendTargetKey":"agent:claude","includeUnavailable":false}' },
         },
         surfaces: {
             ui_button: false,
             ui_slash_command: false,
-            voice_tool: false,
-            voice_action_block: false,
+            voice_tool: true,
+            voice_action_block: true,
             session_agent: true,
             mcp: true,
             cli: true,
         },
         inputHints: {
-            title: 'Set permission mode',
+            title: 'List spawn connected services',
             fields: [
-                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
-                { path: 'permissionMode', title: 'Permission mode', widget: 'text', required: true },
-            ],
-        },
+                { path: 'agentId', title: 'Agent id', widget: 'text' },
+                { path: 'backendTargetKey', title: 'Backend target key', widget: 'text' },
+                { path: 'includeUnavailable', title: 'Include unavailable', widget: 'toggle' },
+                { path: 'limit', title: 'Max results', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionsSpawnConnectedServicesListInputSchema,
+    },
+    {
+        id: 'sessions.spawn.mcp_servers.preview',
+        title: 'Preview spawn MCP servers',
+        description: 'Preview the sanitized MCP server set that would be available to a new session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: ['voice_panel'],
+        prompting: { voiceHotPath: true },
+        bindings: { voiceClientToolName: 'previewSpawnMcpServers', mcpToolName: 'sessions_spawn_mcp_servers_preview' },
+        examples: {
+            voice: { argsExample: '{"agentId":"claude","machineId":"{{machineId}}","path":"{{path}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: true,
+            voice_action_block: true,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Preview spawn MCP servers',
+            fields: [
+                { path: 'agentId', title: 'Agent id', widget: 'text' },
+                { path: 'backendTargetKey', title: 'Backend target key', widget: 'text' },
+                { path: 'machineId', title: 'Machine id', widget: 'text' },
+                { path: 'serverId', title: 'Server id', widget: 'text' },
+                { path: 'path', title: 'Path', widget: 'text' },
+                { path: 'mcpSelection', title: 'MCP selection', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionsSpawnMcpServersPreviewInputSchema,
+    },
+    {
+        id: 'session.message.send',
+        title: 'Send a message to a session',
+        description: 'Send a user message to the AI coding assistant inside the specified session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
+        placements: ['voice_panel'],
+        prompting: { voiceHotPath: true },
+        bindings: { voiceClientToolName: 'sendSessionMessage', mcpToolName: 'session_message_send' },
+        examples: {
+            voice: { argsExample: '{"sessionId":"{{sessionId}}","message":"Please inspect the latest changes."}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: true,
+            voice_action_block: true,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Send a message',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text' },
+                { path: 'message', title: 'Message', widget: 'textarea', required: true },
+                { path: 'permissionModeOverride', title: 'Permission mode override (optional)', widget: 'text' },
+                { path: 'modelOverride', title: 'Model override (optional)', widget: 'text' },
+                { path: 'wait', title: 'Wait for idle (optional)', widget: 'toggle' },
+                { path: 'timeoutSeconds', title: 'Timeout seconds (optional)', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionSendMessageInputSchema,
+    },
+    {
+        id: 'session.stop',
+        title: 'Stop session',
+        description: 'Request that the local daemon stops the specified session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_stop' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Stop a session',
+            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+        },
+        inputSchema: SessionIdRequiredInputSchema,
+    },
+    {
+        id: 'session.title.set',
+        title: 'Set session title',
+        description: 'Set the title (summary text) shown for a session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_title_set' },
+        examples: {
+            voice: { argsExample: '{"sessionId":"{{sessionId}}","title":"Fix flaky tests"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        contextualDefaults: { sessionId: 'current_session' },
+        inputHints: {
+            title: 'Set title',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text' },
+                { path: 'title', title: 'Title', widget: 'text', required: true },
+            ],
+        },
+        inputSchema: SessionTitleSetInputSchema,
+    },
+    {
+        id: 'session.permission_mode.set',
+        title: 'Set session permission mode',
+        description: 'Update the permission intent (read_only/workspace_write/etc) for the specified session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_permission_mode_set' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","permissionMode":"read_only"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Set permission mode',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'permissionMode', title: 'Permission mode', widget: 'text', required: true },
+            ],
+        },
         inputSchema: SessionPermissionModeSetInputSchema,
     },
     {
-        id: 'session.model.set',
-        title: 'Set session model',
-        description: 'Set the model override for the specified session.',
+        id: 'session.model.set',
+        title: 'Set session model',
+        description: 'Set the model override for the specified session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_model_set' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","modelId":"default"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Set session model',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'modelId', title: 'Model id', widget: 'text', required: true },
+            ],
+        },
+        inputSchema: SessionModelSetInputSchema,
+    },
+    {
+        id: 'session.archive',
+        title: 'Archive session',
+        description: 'Archive the specified session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_archive' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Archive a session',
+            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+        },
+        inputSchema: SessionIdRequiredInputSchema,
+    },
+    {
+        id: 'session.unarchive',
+        title: 'Unarchive session',
+        description: 'Unarchive the specified session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_unarchive' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Unarchive a session',
+            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+        },
+        inputSchema: SessionIdRequiredInputSchema,
+    },
+    {
+        id: 'session.status.get',
+        title: 'Get session status',
+        description: 'Get summary status for a session, optionally refreshing live agent state.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        bindings: { mcpToolName: 'session_status_get' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","live":true}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        contextualDefaults: { sessionId: 'current_session' },
+        inputHints: {
+            title: 'Get session status',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'live', title: 'Live', widget: 'toggle' },
+            ],
+        },
+        inputSchema: SessionStatusGetInputSchema,
+    },
+    {
+        id: 'session.work_state.get',
+        title: 'Get session work state',
+        description: 'Get the normalized current goal, task, and todo snapshot for a session.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        bindings: { mcpToolName: 'session_work_state_get' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Get session work state',
+            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+        },
+        inputSchema: SessionIdRequiredInputSchema,
+    },
+    {
+        id: 'session.goal.get',
+        title: 'Get session goal',
+        description: 'Get the editable session goal when the provider supports native goals.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        bindings: { mcpToolName: 'session_goal_get' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Get session goal',
+            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+        },
+        inputSchema: SessionIdRequiredInputSchema,
+    },
+    {
+        id: 'session.goal.set',
+        title: 'Set session goal',
+        description: 'Set or update the native session goal.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_goal_set' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","objective":"Ship goal controls"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Set session goal',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'objective', title: 'Objective', widget: 'textarea' },
+                { path: 'status', title: 'Status', widget: 'text' },
+                { path: 'tokenBudget', title: 'Token budget', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionGoalSetInputSchema,
+    },
+    {
+        id: 'session.goal.clear',
+        title: 'Clear session goal',
+        description: 'Clear the native session goal.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: [],
+        bindings: { mcpToolName: 'session_goal_clear' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Clear session goal',
+            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+        },
+        inputSchema: SessionIdRequiredInputSchema,
+    },
+    {
+        id: 'session.terminalComposer.clear',
+        title: 'Clear terminal composer',
+        description: 'Clear a live terminal composer draft after explicit user authorization.',
+        safety: 'danger',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        surfaces: {
+            ui_button: true,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: false,
+            mcp: false,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Clear terminal composer',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'expectedStateAtMs', title: 'Expected state timestamp', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionTerminalComposerClearRequestV1Schema,
+    },
+    {
+        id: 'session.pendingInput.interruptAndRun',
+        title: 'Interrupt and run now',
+        description: 'Interrupt the live provider turn so its exact native queued prompt can run now.',
+        safety: 'danger',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        surfaces: {
+            ui_button: true,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: false,
+            mcp: false,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Interrupt and run now',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'localId', title: 'Pending message local id', widget: 'text', required: true },
+                { path: 'expectedStateAtMs', title: 'Expected state timestamp', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionPendingInputInterruptAndRunRequestV1Schema,
+    },
+    {
+        id: 'session.usageLimit.waitResume.enable',
+        title: 'Enable usage-limit wait/resume',
+        description: 'Arm a durable intent to continue a session when a provider usage limit is lifted.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
-        bindings: { mcpToolName: 'session_model_set' },
+        bindings: { mcpToolName: 'session_usage_limit_wait_resume_enable' },
         examples: {
-            mcp: { argsExample: '{"sessionId":"{{sessionId}}","modelId":"default"}' },
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","issueFingerprint":"usage-limit:s1:123"}' },
         },
         surfaces: {
             ui_button: false,
@@ -1515,21 +2444,57 @@ export const ACTION_SPECS = Object.freeze([
             cli: true,
         },
         inputHints: {
-            title: 'Set session model',
+            title: 'Continue after usage limit',
             fields: [
                 { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
-                { path: 'modelId', title: 'Model id', widget: 'text', required: true },
+                { path: 'issueFingerprint', title: 'Issue fingerprint', widget: 'text' },
+                { path: 'remember', title: 'Remember preference', widget: 'toggle' },
+                { path: 'resumePromptMode', title: 'Resume prompt mode', widget: 'text' },
             ],
         },
-        inputSchema: SessionModelSetInputSchema,
+        inputSchema: SessionUsageLimitWaitResumeEnableRequestV1Schema,
     },
     {
-        id: 'session.archive',
-        title: 'Archive session',
-        description: 'Archive the specified session.',
+        id: 'session.usageLimit.waitResume.cancel',
+        title: 'Cancel usage-limit wait/resume',
+        description: 'Cancel the active usage-limit wait/resume intent for a session.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
-        bindings: { mcpToolName: 'session_archive' },
+        bindings: { mcpToolName: 'session_usage_limit_wait_resume_cancel' },
+        examples: {
+            mcp: {
+                argsExample: '{"sessionId":"{{sessionId}}","issueFingerprint":"{{issueFingerprint}}","armedAtMs":1700000000000,"runtimeAuthRecoveryAttemptId":"{{runtimeAuthRecoveryAttemptId}}"}',
+            },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Cancel usage-limit recovery',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'issueFingerprint', title: 'Issue fingerprint', widget: 'text' },
+                { path: 'armedAtMs', title: 'Recovery armed timestamp', widget: 'text' },
+                { path: 'runtimeAuthRecoveryAttemptId', title: 'Runtime recovery attempt id', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionUsageLimitWaitResumeCancelRequestV1Schema,
+    },
+    {
+        id: 'session.usageLimit.checkNow',
+        title: 'Check usage-limit recovery now',
+        description: 'Ask the session runtime to perform a safe provider-owned usage-limit recovery check.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        bindings: { mcpToolName: 'session_usage_limit_check_now' },
         examples: {
             mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
         },
@@ -1543,18 +2508,90 @@ export const ACTION_SPECS = Object.freeze([
             cli: true,
         },
         inputHints: {
-            title: 'Archive a session',
-            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+            title: 'Check usage limit',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                {
+                    path: 'provider',
+                    title: 'Provider',
+                    description: 'Optional provider/backend id used to match the active usage-limit issue.',
+                    widget: 'text',
+                },
+                {
+                    path: 'operation',
+                    title: 'Operation',
+                    widget: 'select',
+                    options: [
+                        { value: 'check_now', label: 'Check now' },
+                        { value: 'switch_account_now', label: 'Switch account now' },
+                    ],
+                },
+                {
+                    path: 'resumePromptMode',
+                    title: 'Resume prompt mode',
+                    widget: 'select',
+                    options: [
+                        { value: 'standard', label: 'Standard' },
+                        { value: 'off', label: 'Off' },
+                        { value: 'custom', label: 'Custom' },
+                    ],
+                },
+            ],
         },
-        inputSchema: SessionIdRequiredInputSchema,
+        inputSchema: SessionUsageLimitCheckNowRequestV1Schema,
     },
     {
-        id: 'session.unarchive',
-        title: 'Unarchive session',
-        description: 'Unarchive the specified session.',
+        id: 'session.usageLimit.consumeResetCredit',
+        title: 'Apply usage-limit reset credit',
+        description: 'Ask the session runtime to spend a connected-service reset credit for usage-limit recovery.',
+        safety: 'danger',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        bindings: { mcpToolName: 'session_usage_limit_consume_reset_credit' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Apply reset credit',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                {
+                    path: 'provider',
+                    title: 'Provider',
+                    description: 'Optional provider/backend id used to match the active usage-limit issue.',
+                    widget: 'text',
+                },
+                {
+                    path: 'resumePromptMode',
+                    title: 'Resume prompt mode',
+                    widget: 'select',
+                    options: [
+                        { value: 'standard', label: 'Standard' },
+                        { value: 'off', label: 'Off' },
+                        { value: 'custom', label: 'Custom' },
+                    ],
+                },
+            ],
+        },
+        inputSchema: SessionUsageLimitConsumeResetCreditRequestV1Schema,
+    },
+    {
+        id: 'session.vendor_plugin_catalog.list',
+        title: 'List session vendor plugins',
+        description: 'List provider-owned vendor plugins available to the session.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: [],
-        bindings: { mcpToolName: 'session_unarchive' },
+        bindings: { mcpToolName: 'session_vendor_plugin_catalog_list' },
         examples: {
             mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
         },
@@ -1568,20 +2605,24 @@ export const ACTION_SPECS = Object.freeze([
             cli: true,
         },
         inputHints: {
-            title: 'Unarchive a session',
-            fields: [{ path: 'sessionId', title: 'Session id', widget: 'text', required: true }],
+            title: 'List vendor plugins',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'cwd', title: 'Working directory', widget: 'text' },
+            ],
         },
-        inputSchema: SessionIdRequiredInputSchema,
+        inputSchema: SessionCatalogListInputSchema,
     },
     {
-        id: 'session.status.get',
-        title: 'Get session status',
-        description: 'Get summary status for a session, optionally refreshing live agent state.',
+        id: 'session.skill_catalog.list',
+        title: 'List session skills',
+        description: 'List provider-visible skills available to the session.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: [],
-        bindings: { mcpToolName: 'session_status_get' },
+        bindings: { mcpToolName: 'session_skill_catalog_list' },
         examples: {
-            mcp: { argsExample: '{"sessionId":"{{sessionId}}","live":true}' },
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}"}' },
         },
         surfaces: {
             ui_button: false,
@@ -1593,19 +2634,20 @@ export const ACTION_SPECS = Object.freeze([
             cli: true,
         },
         inputHints: {
-            title: 'Get session status',
+            title: 'List skills',
             fields: [
                 { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
-                { path: 'live', title: 'Live', widget: 'toggle' },
+                { path: 'cwd', title: 'Working directory', widget: 'text' },
             ],
         },
-        inputSchema: SessionStatusGetInputSchema,
+        inputSchema: SessionCatalogListInputSchema,
     },
     {
         id: 'session.history.get',
         title: 'Get session history',
-        description: 'Fetch a slice of session history/transcript records.',
+        description: 'Read visible session history as compact transcript rows or raw persisted rows for compatibility. Use session_transcript_get for semantic transcript pagination and session_events_get for diagnostics.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: [],
         bindings: { mcpToolName: 'session_history_get' },
         examples: {
@@ -1640,11 +2682,161 @@ export const ACTION_SPECS = Object.freeze([
         },
         inputSchema: SessionHistoryGetInputSchema,
     },
+    {
+        id: 'session.transcript.get',
+        title: 'Get session transcript',
+        description: 'Read the semantic transcript for a session as clean user/assistant messages with optional tool/reasoning/event flags.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: ['voice_panel'],
+        bindings: { voiceClientToolName: 'getSessionTranscript', mcpToolName: 'session_transcript_get' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","limit":20,"roles":["user","assistant"],"maxCharsPerMessage":null}' },
+            voice: { argsExample: '{"sessionId":"{{sessionId}}","limit":20,"roles":["user","assistant"],"maxCharsPerMessage":null}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: true,
+            voice_action_block: true,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Get session transcript',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'limit', title: 'Limit', widget: 'text' },
+                { path: 'cursor', title: 'Cursor', widget: 'text' },
+                {
+                    path: 'direction',
+                    title: 'Direction',
+                    widget: 'select',
+                    options: [
+                        { value: 'before', label: 'Before' },
+                        { value: 'after', label: 'After' },
+                    ],
+                },
+                {
+                    path: 'scope',
+                    title: 'Scope',
+                    widget: 'select',
+                    options: [
+                        { value: 'main', label: 'Main' },
+                        { value: 'sidechain', label: 'Sidechain' },
+                        { value: 'all', label: 'All' },
+                    ],
+                },
+                { path: 'sidechainId', title: 'Sidechain id', widget: 'text' },
+                {
+                    path: 'roles',
+                    title: 'Roles',
+                    widget: 'multiselect',
+                    options: [
+                        { value: 'user', label: 'User' },
+                        { value: 'assistant', label: 'Assistant' },
+                    ],
+                },
+                { path: 'includeTools', title: 'Include tools', widget: 'toggle' },
+                { path: 'includeReasoning', title: 'Include reasoning', widget: 'toggle' },
+                { path: 'includeEvents', title: 'Include events', widget: 'toggle' },
+                { path: 'includeMeta', title: 'Include meta', widget: 'toggle' },
+                { path: 'includeStructuredPayload', title: 'Include structured payload', widget: 'toggle' },
+                { path: 'includeRaw', title: 'Include raw', widget: 'toggle' },
+                {
+                    path: 'maxCharsPerMessage',
+                    title: 'Message truncation chars',
+                    description: 'Optional per-message truncation budget. Omit or pass null for full message text.',
+                    widget: 'text',
+                },
+                { path: 'maxRawPayloadChars', title: 'Max raw payload chars', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionTranscriptGetInputSchema,
+    },
+    {
+        id: 'session.events.get',
+        title: 'Get session events',
+        description: 'Inspect raw session events (tool calls, tool results, token counts, lifecycle, permission, stream, session events) for diagnostics. Use session_transcript_get for normal transcript reading.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
+        placements: [],
+        bindings: { mcpToolName: 'session_events_get' },
+        examples: {
+            mcp: { argsExample: '{"sessionId":"{{sessionId}}","limit":50,"kinds":["tool_call","tool_result"]}' },
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: false,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: true,
+            mcp: true,
+            cli: true,
+        },
+        inputHints: {
+            title: 'Get session events',
+            fields: [
+                { path: 'sessionId', title: 'Session id', widget: 'text', required: true },
+                { path: 'limit', title: 'Limit', widget: 'text' },
+                { path: 'cursor', title: 'Cursor', widget: 'text' },
+                {
+                    path: 'direction',
+                    title: 'Direction',
+                    widget: 'select',
+                    options: [
+                        { value: 'before', label: 'Before' },
+                        { value: 'after', label: 'After' },
+                    ],
+                },
+                {
+                    path: 'scope',
+                    title: 'Scope',
+                    widget: 'select',
+                    options: [
+                        { value: 'main', label: 'Main' },
+                        { value: 'sidechain', label: 'Sidechain' },
+                        { value: 'all', label: 'All' },
+                    ],
+                },
+                { path: 'sidechainId', title: 'Sidechain id', widget: 'text' },
+                {
+                    path: 'roles',
+                    title: 'Roles',
+                    widget: 'multiselect',
+                    options: [
+                        { value: 'event', label: 'Event' },
+                        { value: 'agent', label: 'Agent' },
+                        { value: 'user', label: 'User' },
+                        { value: 'unknown', label: 'Unknown' },
+                    ],
+                },
+                { path: 'kinds', title: 'Kinds', widget: 'text_list', listSeparator: 'comma' },
+                {
+                    path: 'format',
+                    title: 'Format',
+                    widget: 'select',
+                    options: [
+                        { value: 'compact', label: 'Compact' },
+                        { value: 'raw', label: 'Raw' },
+                    ],
+                },
+                { path: 'includeMeta', title: 'Include meta', widget: 'toggle' },
+                { path: 'includeStructuredPayload', title: 'Include structured payload', widget: 'toggle' },
+                { path: 'includeRaw', title: 'Include raw', widget: 'toggle' },
+                { path: 'maxTextChars', title: 'Max text chars', widget: 'text' },
+                { path: 'maxPayloadChars', title: 'Max payload chars', widget: 'text' },
+            ],
+        },
+        inputSchema: SessionEventsGetInputSchema,
+    },
     {
         id: 'session.wait.idle',
         title: 'Wait for session idle',
         description: 'Wait until the session becomes idle or the timeout elapses.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: [],
         bindings: { mcpToolName: 'session_wait_idle' },
         examples: {
@@ -1673,6 +2865,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Respond to permission request',
         description: 'Approve or deny an active permission request in a session.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'processPermissionRequest', mcpToolName: 'session_permission_respond' },
@@ -1712,12 +2905,13 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Respond to user-action request',
         description: 'Approve, reject, request changes, or provide structured answers for an active user-action request.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'answerUserActionRequest', mcpToolName: 'session_user_action_answer' },
         examples: {
             voice: {
-                argsExample: '{"sessionId":"{{sessionId}}","answers":[{"question":"Continue?","answer":"Yes"}]}',
+                argsExample: '{"sessionId":"{{sessionId}}","answers":[{"question":"Continue?","values":["Yes"]}]}',
             },
         },
         surfaces: {
@@ -1771,9 +2965,9 @@ export const ACTION_SPECS = Object.freeze([
                     required: true,
                 },
                 {
-                    path: 'answers.[].answer',
-                    title: 'Answer',
-                    description: 'The answer text to send back for that question.',
+                    path: 'answers.[].values',
+                    title: 'Answer values',
+                    description: 'The exact ordered answer values to send back for that question.',
                     widget: 'text',
                     required: true,
                 },
@@ -1786,6 +2980,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Set session mode',
         description: 'Request a new ACP session mode for the current session when the active provider supports session modes.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'setSessionMode' },
@@ -1822,6 +3017,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Set primary action session',
         description: 'Set which session the voice assistant should target by default.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'setPrimaryActionSession', mcpToolName: 'session_target_primary_set' },
@@ -1851,6 +3047,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Set tracked sessions',
         description: 'Set which sessions should be treated as tracked for updates/snippets.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'setTrackedSessions', mcpToolName: 'session_target_tracked_set' },
         examples: {
@@ -1876,11 +3073,12 @@ export const ACTION_SPECS = Object.freeze([
         title: 'List sessions',
         description: 'List recent sessions the user can target.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'listSessions', mcpToolName: 'session_list' },
         examples: {
-            voice: { argsExample: '{"limit":20,"cursor":null,"includeLastMessagePreview":true}' },
+            voice: { argsExample: '{"limit":20,"cursor":null}' },
         },
         surfaces: {
             ui_button: false,
@@ -1897,6 +3095,7 @@ export const ACTION_SPECS = Object.freeze([
                 { path: 'limit', title: 'Limit', widget: 'text' },
                 { path: 'cursor', title: 'Cursor', widget: 'text' },
                 { path: 'includeLastMessagePreview', title: 'Include last message preview', widget: 'toggle' },
+                { path: 'includeRows', title: 'Include rows', widget: 'toggle' },
             ],
         },
         inputSchema: SessionListInputSchema,
@@ -1906,6 +3105,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Get session activity',
         description: 'Get a short activity digest for a session without transcript content.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'getSessionActivity', mcpToolName: 'session_activity_get' },
         examples: {
@@ -1932,8 +3132,9 @@ export const ACTION_SPECS = Object.freeze([
     {
         id: 'session.messages.recent.get',
         title: 'Get recent messages',
-        description: 'Get a small slice of recent messages for a session (privacy guarded).',
+        description: 'DEPRECATED: use session_transcript_get. Returns semantic transcript items with cleaner pagination.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'getSessionRecentMessages', mcpToolName: 'session_messages_recent_get' },
         examples: {
@@ -1942,8 +3143,8 @@ export const ACTION_SPECS = Object.freeze([
         surfaces: {
             ui_button: false,
             ui_slash_command: false,
-            voice_tool: true,
-            voice_action_block: true,
+            voice_tool: false,
+            voice_action_block: false,
             session_agent: true,
             mcp: true,
             cli: true,
@@ -1964,6 +3165,7 @@ export const ACTION_SPECS = Object.freeze([
         id: 'ui.voice_global.reset',
         title: 'Reset voice agent',
         safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
         placements: ['voice_panel', 'command_palette', 'slash_command'],
         slash: { tokens: ['/h.voice.reset'] },
         bindings: { voiceClientToolName: 'resetGlobalVoiceAgent' },
@@ -1986,11 +3188,36 @@ export const ACTION_SPECS = Object.freeze([
         },
         inputSchema: EmptyObjectSchema,
     },
+    {
+        id: 'ui.pet.choose',
+        title: 'Choose pet',
+        description: 'Open pet settings so the user can choose or manage their companion.',
+        safety: 'safe',
+        approval: APPROVAL_RESULT_NONE,
+        placements: ['slash_command'],
+        slash: { tokens: ['/pet', '/h.pet'] },
+        inputHints: {
+            title: 'Choose pet',
+            description: 'Open pet settings.',
+            fields: [],
+        },
+        surfaces: {
+            ui_button: false,
+            ui_slash_command: true,
+            voice_tool: false,
+            voice_action_block: false,
+            session_agent: false,
+            mcp: false,
+            cli: false,
+        },
+        inputSchema: EmptyObjectSchema,
+    },
     {
         id: 'ui.voice_agent.teleport',
         title: 'Teleport voice agent to session root',
         description: 'Move the daemon-backed voice agent into the current or specified session root.',
         safety: 'safe',
+        approval: APPROVAL_RESULT_OPTIONAL_DEFERRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'teleportVoiceAgentToSessionRoot' },
         inputHints: {
@@ -2017,6 +3244,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Search memory',
         description: 'Search the local daemon memory index (opt-in).',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel', 'command_palette'],
         prompting: { voiceHotPath: true },
         bindings: { voiceClientToolName: 'memorySearch', mcpToolName: 'memory_search' },
@@ -2065,6 +3293,7 @@ export const ACTION_SPECS = Object.freeze([
             mcp: false,
             cli: false,
         },
+        contextualDefaults: { machineId: 'current_session_machine' },
         inputSchema: MemorySearchInputSchema,
     },
     {
@@ -2072,6 +3301,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Get memory window',
         description: 'Fetch and decrypt a transcript window (used to verify/quote a memory hit).',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'memoryGetWindow', mcpToolName: 'memory_get_window' },
         inputHints: {
@@ -2093,6 +3323,7 @@ export const ACTION_SPECS = Object.freeze([
             mcp: false,
             cli: false,
         },
+        contextualDefaults: { machineId: 'current_session_machine' },
         examples: {
             voice: { argsExample: '{"machineId":"{{machineId}}","sessionId":"{{sessionId}}","seqFrom":120,"seqTo":124}' },
             mcp: { argsExample: '{"machineId":"{{machineId}}","sessionId":"{{sessionId}}","seqFrom":120,"seqTo":124}' },
@@ -2104,6 +3335,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Ensure memory up to date',
         description: 'Trigger the daemon to sync memory hints for a session (or all active sessions).',
         safety: 'safe',
+        approval: APPROVAL_RESULT_REQUIRED,
         placements: ['voice_panel'],
         bindings: { voiceClientToolName: 'memoryEnsureUpToDate', mcpToolName: 'memory_ensure_up_to_date' },
         inputHints: {
@@ -2134,6 +3366,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Update prompt document',
         description: 'Update a prompt document stored in the Happier prompt library.',
         safety: 'danger',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
         surfaces: {
             ui_button: false,
@@ -2161,6 +3394,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Update prompt bundle',
         description: 'Update a skill bundle stored in the Happier prompt library.',
         safety: 'danger',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
         surfaces: {
             ui_button: false,
@@ -2188,6 +3422,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Export prompt asset',
         description: 'Export a prompt doc or skill bundle from the Happier library to a provider-native asset.',
         safety: 'danger',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
         surfaces: {
             ui_button: false,
@@ -2235,6 +3470,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Install prompt registry skill',
         description: 'Import a skill bundle from a registry and optionally export it to an external skills location.',
         safety: 'danger',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
         surfaces: {
             ui_button: false,
@@ -2282,6 +3518,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Create approval request',
         description: 'Create an approval request for another action to run.',
         safety: 'danger',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
         surfaces: {
             ui_button: false,
@@ -2308,6 +3545,7 @@ export const ACTION_SPECS = Object.freeze([
         title: 'Decide approval request',
         description: 'Approve or reject an approval request.',
         safety: 'danger',
+        approval: APPROVAL_RESULT_NONE,
         placements: [],
         surfaces: {
             ui_button: true,