@oh-my-pi/pi-coding-agent 17.2.5 → 17.2.7

package/dist/types/edit/hashline/params.d.ts

@@ -1,4 +1,6 @@
-export declare const hashlineEditParamsSchema: import("arktype/internal/variants/object.ts").ObjectType<{
+export declare const hashlineEditParamsSchema: import("@oh-my-pi/omptype").FluentType<{
     input: string;
-}, {}>;
+}, {
+    input: string;
+}>;
 export type HashlineParams = typeof hashlineEditParamsSchema.infer;

package/dist/types/edit/modes/apply-patch.d.ts

@@ -8,9 +8,11 @@
  * the `patch` mode.
  */
 import type { PatchEditEntry } from "./patch.js";
-export declare const applyPatchSchema: import("arktype/internal/variants/object.ts").ObjectType<{
+export declare const applyPatchSchema: import("@oh-my-pi/omptype").FluentType<{
     input: string;
-}, {}>;
+}, {
+    input: string;
+}>;
 export type ApplyPatchParams = typeof applyPatchSchema.infer;
 export type ApplyPatchEntry = PatchEditEntry & {
     path: string;

package/dist/types/edit/modes/patch.d.ts

@@ -69,20 +69,31 @@ export declare function computePatchDiff(input: PatchInput, cwd: string, options
 } | {
     error: string;
 }>;
-export declare const patchEditEntrySchema: import("arktype/internal/variants/object.ts").ObjectType<{
+export declare const patchEditEntrySchema: import("@oh-my-pi/omptype").FluentType<{
+    diff?: string | undefined;
     op?: "create" | "delete" | "update" | undefined;
     rename?: string | undefined;
+}, {
     diff?: string | undefined;
-}, {}>;
+    op?: "create" | "delete" | "update" | undefined;
+    rename?: string | undefined;
+}>;
 export type PatchEditEntry = typeof patchEditEntrySchema.infer;
-export declare const patchEditSchema: import("arktype/internal/variants/object.ts").ObjectType<{
-    path: string;
+export declare const patchEditSchema: import("@oh-my-pi/omptype").FluentType<{
     edits: {
+        diff?: string | undefined;
         op?: "create" | "delete" | "update" | undefined;
         rename?: string | undefined;
+    }[];
+    path: string;
+}, {
+    edits: {
         diff?: string | undefined;
+        op?: "create" | "delete" | "update" | undefined;
+        rename?: string | undefined;
     }[];
-}, {}>;
+    path: string;
+}>;
 export type PatchParams = typeof patchEditSchema.infer;
 export interface ExecutePatchSingleOptions {
     session: ToolSession;

package/dist/types/edit/modes/replace.d.ts

@@ -116,12 +116,17 @@ export declare function findContextLine(lines: string[], context: string, startF
     allowFuzzy?: boolean;
     skipFunctionFallback?: boolean;
 }): ContextLineResult;
-export declare const replaceEditSchema: import("arktype/internal/variants/object.ts").ObjectType<{
-    path: string;
+export declare const replaceEditSchema: import("@oh-my-pi/omptype").FluentType<{
+    new_string: string;
     old_string: string;
+    path: string;
+    replace_all?: boolean | undefined;
+}, {
     new_string: string;
+    old_string: string;
+    path: string;
     replace_all?: boolean | undefined;
-}, {}>;
+}>;
 export type ReplaceParams = typeof replaceEditSchema.infer;
 /**
  * Internal batch form of {@link ReplaceParams}, produced only by the Cursor

package/dist/types/eval/bridge-timeout.d.ts

@@ -23,8 +23,11 @@ export declare function isEvalTimeoutControlEvent(event: JsStatusEvent): boolean
 /** Optional behavior for a timeout pause around a host bridge call. */
 export interface BridgeTimeoutPauseOptions {
     /**
-     * Marks the pause as an `agent()` call whose already-started work must finish
-     * before an external eval abort reaches the kernel.
+     * Holds an external eval abort back from the *kernel* until this bridge call
+     * settles, so the runtime is never torn down mid-phase (`agent()` isolation
+     * worktree setup and merge/cherry-pick). It does not shield the delegated
+     * work itself: the bridge hands subagents the caller's real signal, so a
+     * turn cancel still stops them immediately.
      */
     deferExternalAbort?: boolean;
 }

package/dist/types/eval/completion-bridge.d.ts

@@ -1,3 +1,16 @@
+/**
+ * Host-side handler for the eval `completion()` helper.
+ *
+ * Both eval runtimes (JS worker + Python kernel) route helper→host calls
+ * through {@link callSessionTool}. Reserving the synthetic tool name
+ * {@link EVAL_COMPLETION_BRIDGE_NAME} lets a single host handler serve both
+ * transports without registering an agent-visible tool: cell code calls
+ * `completion(prompt, opts)`, the prelude forwards `{ prompt, model, system?, schema? }`
+ * through the bridge, and this module performs one stateless completion.
+ *
+ * The call is oneshot and toolless from the model's perspective — pure text
+ * in, text (or, with `schema`, a structured object) out.
+ */
 import type { ToolSession } from "../tools/index.js";
 import type { JsStatusEvent } from "./js/shared/types.js";
 /** Synthetic bridge name reserved for the `completion()` helper across both runtimes. */

package/dist/types/eval/py/tool-bridge.d.ts

@@ -2,7 +2,19 @@ import type { ToolSession } from "../../tools/index.js";
 import { type JsStatusEvent } from "../js/tool-bridge.js";
 export interface PyToolBridgeEntry {
     toolSession: ToolSession;
+    /**
+     * Turn-cancel handed to the tool implementation. Raw and never deferred, so
+     * delegated work — above all the subagents `agent()` spawns — stops at once.
+     */
     signal?: AbortSignal;
+    /**
+     * Kernel-side abort, held back while a critical `agent()` phase (isolation
+     * worktree setup, merge/cherry-pick) is in flight. Decides only when the host
+     * may stop waiting on a call and let the kernel unwind; it is never given to
+     * a tool. Keeping these separate is what stops a cancel from settling the
+     * cell on top of a still-running, abort-insensitive merge.
+     */
+    shieldedSignal?: AbortSignal;
     emitStatus?: (event: JsStatusEvent) => void;
     abortRequested?: () => boolean;
 }

package/dist/types/extensibility/custom-commands/types.d.ts

@@ -5,11 +5,11 @@
  * Unlike markdown commands which expand to prompts, custom commands can execute
  * arbitrary logic with full access to the hook context.
  */
-import type * as arktype from "arktype";
-import type * as zod from "zod/v4";
+import type * as arktype from "@oh-my-pi/omptype";
+import type * as TypeBox from "@oh-my-pi/omptype/typebox";
+import type * as zod from "@oh-my-pi/omptype/zod";
 import type { ExecOptions, ExecResult, HookCommandContext } from "../../extensibility/hooks/types.js";
 import type * as PiCodingAgent from "../../index.js";
-import type * as TypeBox from "../typebox.js";
 export type { ExecOptions, ExecResult, HookCommandContext };
 /**
  * API passed to custom command factory.
@@ -24,7 +24,7 @@ export interface CustomCommandAPI {
     typebox: typeof TypeBox;
     /** Injected arktype module for validation in custom commands. */
     arktype: typeof arktype;
-    /** Injected zod/v4 module for canonical command validation. */
+    /** Injected omptype-backed zod facade for command validation. */
     zod: typeof zod;
     /** Injected pi-coding-agent exports */
     pi: typeof PiCodingAgent;

package/dist/types/extensibility/custom-tools/types.d.ts

@@ -4,13 +4,14 @@
  * Custom tools are TypeScript modules that define additional tools for the agent.
  * They can provide custom rendering for tool calls and results in the TUI.
  */
+import type { type as ArkType } from "@oh-my-pi/omptype";
+import type * as TypeBox from "@oh-my-pi/omptype/typebox";
+import type * as zod from "@oh-my-pi/omptype/zod";
 import type { AgentToolResult, AgentToolUpdateCallback, ToolApproval, ToolApprovalDecision, ToolLoadMode, ToolTier } from "@oh-my-pi/pi-agent-core";
 import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
 import type { FetchImpl, Model, Static, TSchema } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import type { logger as PiLogger } from "@oh-my-pi/pi-utils";
-import type { type as ArkType } from "arktype";
-import type * as zod from "zod/v4";
 import type { Rule } from "../../capability/rule.js";
 import type { ModelRegistry } from "../../config/model-registry.js";
 import type { Settings } from "../../config/settings.js";
@@ -22,7 +23,6 @@ import type { Theme } from "../../modes/theme/theme.js";
 import type { ReadonlySessionManager } from "../../session/session-manager.js";
 import type { TodoItem } from "../../tools/todo.js";
 import type { RecoveredRetryError } from "../shared-events.js";
-import type * as TypeBox from "../typebox.js";
 /** Alias for clarity */
 export type CustomToolUIContext = HookUIContext;
 export type { ExecOptions, ExecResult } from "../../exec/exec.js";
@@ -57,7 +57,7 @@ export interface CustomToolAPI {
     typebox: typeof TypeBox;
     /** Injected arktype module for arktype-authored custom tools. */
     arktype: typeof ArkType;
-    /** Injected zod/v4 module for canonical parameter schemas. */
+    /** Injected omptype-backed zod facade for parameter schemas. */
     zod: typeof zod;
     /** Injected pi-coding-agent exports */
     pi: typeof PiCodingAgent;

package/dist/types/extensibility/extensions/types.d.ts

@@ -7,14 +7,15 @@
  * - Register commands, keyboard shortcuts, and CLI flags
  * - Interact with the user via UI primitives
  */
+import type { Type as arktype } from "@oh-my-pi/omptype";
+import type * as TypeBox from "@oh-my-pi/omptype/typebox";
+import type * as zod from "@oh-my-pi/omptype/zod";
 import type { AgentMessage, AgentToolResult, AgentToolUpdateCallback, ThinkingLevel, ToolApproval, ToolLoadMode } from "@oh-my-pi/pi-agent-core";
 import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
 import type { Api, AssistantMessageEvent, AssistantMessageEventStream, Context, ImageContent, Model, ModelSpec, ProviderResponseMetadata, ServiceTier, ServiceTierByFamily, ServiceTierFamily, SimpleStreamOptions, Static, TextContent, TSchema } from "@oh-my-pi/pi-ai";
 import type { OAuthCredentials, OAuthLoginCallbacks } from "@oh-my-pi/pi-ai/oauth/types";
 import type { AutocompleteItem, AutocompleteProvider, Component, EditorTheme, KeyId, TUI } from "@oh-my-pi/pi-tui";
 import type { logger as PiLogger } from "@oh-my-pi/pi-utils";
-import type { Type as arktype } from "arktype";
-import type * as zod from "zod/v4";
 import type { KeybindingsManager } from "../../config/keybindings.js";
 import type { ModelRegistry } from "../../config/model-registry.js";
 import type { EditToolDetails } from "../../edit/index.js";
@@ -35,7 +36,6 @@ import type { ApprovalMode } from "../../tools/approval.js";
 import type { EventBus } from "../../utils/event-bus.js";
 import type { AgentEndEvent, AgentStartEvent, AutoCompactionEndEvent, AutoCompactionStartEvent, AutoRetryEndEvent, AutoRetryStartEvent, ContextEvent, GoalUpdatedEvent, SessionBeforeBranchEvent, SessionBeforeBranchResult, SessionBeforeCompactEvent, SessionBeforeCompactResult, SessionBeforeSwitchEvent, SessionBeforeSwitchResult, SessionBeforeTreeEvent, SessionBeforeTreeResult, SessionBranchEvent, SessionCompactEvent, SessionCompactingEvent, SessionCompactingResult, SessionEvent, SessionShutdownEvent, SessionStartEvent, SessionStopEvent, SessionStopEventResult, SessionSwitchEvent, SessionTreeEvent, TodoReminderEvent, ToolCallEventResult, ToolResultEventResult, TtsrTriggeredEvent, TurnEndEvent, TurnStartEvent } from "../shared-events.js";
 import type { SlashCommandInfo } from "../slash-commands.js";
-import type * as TypeBox from "../typebox.js";
 export type { AppKeybinding, KeybindingsManager } from "../../config/keybindings.js";
 export type { ExecOptions, ExecResult } from "../../exec/exec.js";
 export type { AgentToolResult, AgentToolUpdateCallback };
@@ -740,7 +740,7 @@ export interface ExtensionAPI {
     typebox: typeof TypeBox;
     /** Injected arktype module for arktype-authored extension tools (canonical going forward). */
     arktype: typeof arktype;
-    /** Injected zod/v4 module for canonical extension tool parameter schemas. */
+    /** Injected omptype-backed zod facade for extension tool parameter schemas. */
     zod: typeof zod;
     /** Injected pi-coding-agent exports for accessing SDK utilities */
     pi: typeof PiCodingAgent;

package/dist/types/extensibility/hooks/types.d.ts

@@ -1,8 +1,9 @@
+import type { Type } from "@oh-my-pi/omptype";
+import type * as TypeBox from "@oh-my-pi/omptype/typebox";
+import type * as zod from "@oh-my-pi/omptype/zod";
 import type { ImageContent, Message, Model, TextContent } from "@oh-my-pi/pi-ai";
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
 import type { logger as PiLogger } from "@oh-my-pi/pi-utils";
-import type { Type } from "arktype";
-import type * as zod from "zod/v4";
 import type { ModelRegistry } from "../../config/model-registry.js";
 import type { EditToolDetails } from "../../edit/index.js";
 import type { ExecOptions, ExecResult } from "../../exec/exec.js";
@@ -12,7 +13,6 @@ import type { CustomMessagePayload, HookMessage } from "../../session/messages.j
 import type { ReadonlySessionManager, SessionManager } from "../../session/session-manager.js";
 import type { BashToolDetails, GlobToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools/index.js";
 import type { AgentEndEvent, AgentStartEvent, AutoCompactionEndEvent, AutoCompactionStartEvent, AutoRetryEndEvent, AutoRetryStartEvent, ContextEvent, SessionBeforeBranchEvent, SessionBeforeBranchResult, SessionBeforeCompactEvent, SessionBeforeCompactResult, SessionBeforeSwitchEvent, SessionBeforeSwitchResult, SessionBeforeTreeEvent, SessionBeforeTreeResult, SessionBranchEvent, SessionCompactEvent, SessionCompactingEvent, SessionCompactingResult, SessionEvent, SessionShutdownEvent, SessionStartEvent, SessionSwitchEvent, SessionTreeEvent, TodoReminderEvent, ToolCallEventResult, ToolResultEventResult, TtsrTriggeredEvent, TurnEndEvent, TurnStartEvent } from "../shared-events.js";
-import type * as TypeBox from "../typebox.js";
 export type { ExecOptions, ExecResult } from "../../exec/exec.js";
 /**
  * UI context for hooks to request interactive UI from the harness.
@@ -422,7 +422,7 @@ export interface HookAPI {
     typebox: typeof TypeBox;
     /** Injected arktype module for arktype-authored hooks. */
     arktype: typeof Type;
-    /** Injected zod/v4 module for canonical hook validation. */
+    /** Injected omptype-backed zod facade for hook validation. */
     zod: typeof zod;
     /** Injected pi-coding-agent exports */
     pi: typeof PiCodingAgent;

package/dist/types/extensibility/legacy-pi-ai-shim.d.ts

@@ -22,7 +22,7 @@
 import { type Api, type AssistantMessage, type AssistantMessageEventStream, type Context, type Model, type SimpleStreamOptions } from "@oh-my-pi/pi-ai";
 import type { Effort } from "@oh-my-pi/pi-catalog/effort";
 import { calculateCost, getBundledModel, getBundledModels, getBundledProviders, modelsAreEqual } from "@oh-my-pi/pi-catalog/models";
-import { type TSchema, Type } from "./typebox.js";
+import { type TSchema, Type } from "./legacy-typebox.js";
 export interface StringEnumOptions<T extends string> {
     description?: string;
     default?: T;

package/dist/types/extensibility/legacy-pi-coding-agent-shim.d.ts

@@ -404,4 +404,4 @@ export { parseArgs } from "../cli/args.js";
 export * from "../index.js";
 export { formatBytes as formatSize } from "../tools/render-utils.js";
 export { copyToClipboard } from "../utils/clipboard.js";
-export { Type } from "./typebox.js";
+export { Type } from "./legacy-typebox.js";

package/dist/types/extensibility/legacy-typebox.d.ts

@@ -0,0 +1,8 @@
+import { type TypeBuilder as OmpTypeBuilder } from "@oh-my-pi/omptype/typebox";
+export * from "@oh-my-pi/omptype/typebox";
+export declare const Type: OmpTypeBuilder;
+export type TypeBuilder = OmpTypeBuilder;
+declare const legacyTypeBox: {
+    Type: OmpTypeBuilder;
+};
+export default legacyTypeBox;

package/dist/types/extensibility/plugins/legacy-pi-compat.d.ts

@@ -20,20 +20,13 @@ export declare function __getLegacyPiBundledModulesGlobal(): string;
  */
 export declare function __computeBundledSelfPackageRoot(metaDir: string, pathImpl?: typeof path): string;
 /**
- * Resolve the path the TypeBox compatibility shim ships at, then drop it when
- * the source file is missing.
+ * Resolve the coding-agent compatibility surface that composes omptype's
+ * TypeBox facade with legacy `Type.Unsafe`, then drop the remap when that
+ * entrypoint is missing.
  *
- * In compiled-binary mode the shim is served through the
- * `omp-legacy-pi-bundled:` virtual namespace (issue #3423) — bunfs paths are
- * unreachable on Bun 1.3.14+, so the virtual specifier is always available and
- * needs no filesystem probe. In dev / source-link / installed-package mode the
- * shim is an on-disk source file; validation mirrors
- * `__validateLegacyPiPackageRootOverrides` (#2168): if the computed candidate
- * doesn't exist (e.g. an install that dropped the source — issue #3414),
- * `resolveTypeBoxSpecifier` returns `undefined` and
- * `rewriteLegacyExtensionSource` leaves bare `typebox` / `@sinclair/typebox`
- * specifiers alone, so Bun falls through to native resolution against the
- * extension's own `node_modules`.
+ * In compiled-binary mode the surface is served through the
+ * `omp-legacy-pi-bundled:` virtual namespace (issue #3423). Dev, source-link,
+ * and installed-package modes use the shipped source module.
  *
  * Exported for tests; production callers use `TYPEBOX_SHIM_PATH`.
  */

package/dist/types/goals/tools/goal-tool.d.ts

@@ -4,11 +4,15 @@ import type { RenderResultOptions } from "../../extensibility/custom-tools/types
 import type { Theme } from "../../modes/theme/theme.js";
 import type { ToolSession } from "../../tools/index.js";
 import type { Goal, GoalToolDetails } from "../state.js";
-declare const goalSchema: import("arktype/internal/variants/object.ts").ObjectType<{
+declare const goalSchema: import("@oh-my-pi/omptype").FluentType<{
+    objective?: string | undefined;
     op: "complete" | "create" | "drop" | "get" | "resume";
+    token_budget?: number | undefined;
+}, {
     objective?: string | undefined;
+    op: "complete" | "create" | "drop" | "get" | "resume";
     token_budget?: number | undefined;
-}, {}>;
+}>;
 export type GoalToolInput = typeof goalSchema.infer;
 export interface GoalToolResponse {
     goal: Goal | null;
@@ -23,11 +27,15 @@ export declare class GoalTool implements AgentTool<typeof goalSchema, GoalToolDe
     readonly name = "goal";
     readonly label = "Goal";
     readonly description: string;
-    readonly parameters: import("arktype/internal/variants/object.ts").ObjectType<{
+    readonly parameters: import("@oh-my-pi/omptype").FluentType<{
+        objective?: string | undefined;
         op: "complete" | "create" | "drop" | "get" | "resume";
+        token_budget?: number | undefined;
+    }, {
         objective?: string | undefined;
+        op: "complete" | "create" | "drop" | "get" | "resume";
         token_budget?: number | undefined;
-    }, {}>;
+    }>;
     readonly strict = true;
     readonly intent: "omit";
     constructor(session: ToolSession);

package/dist/types/launch/client.d.ts

@@ -1,4 +1,4 @@
-import { type DaemonOperation, type DaemonRpcResult } from "./protocol.js";
+import { type DaemonCompletionNotification, type DaemonOperation, type DaemonRpcResult } from "./protocol.js";
 /** Broker location and lifecycle overrides used by smoke tests and isolated consumers. */
 export interface DaemonBrokerClientOptions {
     /** Runtime directory override; defaults to the project-scoped config path. */
@@ -6,13 +6,21 @@ export interface DaemonBrokerClientOptions {
     /** Last-client shutdown grace override in milliseconds. */
     idleGraceMs?: number;
 }
+export interface DaemonCompletionUnregisterOptions {
+    /** Detach this process without deleting broker-persisted pending notifications. */
+    preservePending?: boolean;
+}
 /** Persistent per-process connection to one project or global daemon broker. */
 export interface DaemonBrokerClient {
+    onCompletion(owner: string, sink: (notification: DaemonCompletionNotification) => Promise<void> | void): (options?: DaemonCompletionUnregisterOptions) => void;
     /** Canonical project directory or synthetic directory identifying a global scope. */
     readonly projectDir: string;
     request(operation: DaemonOperation, signal?: AbortSignal): Promise<DaemonRpcResult>;
     close(): void;
 }
+/** A request reached the broker and the broker rejected the operation. */
+export declare class DaemonBrokerRejectedError extends Error {
+}
 /** Create an independent socket connection to one daemon broker scope. */
 export declare function createDaemonBrokerClient(projectDir: string, options?: DaemonBrokerClientOptions): Promise<DaemonBrokerClient>;
 /** Get the process-shared daemon broker client for one canonical project directory. */

package/dist/types/launch/protocol.d.ts

@@ -150,6 +150,13 @@ export type DaemonRpcResult = {
 export interface DaemonWireRequest {
     id: string;
     token: string;
+    owners?: string[];
+    detachedOwners?: string[];
+    completionEvents?: boolean;
+    completionAcks?: string[];
+    completionUnsubscribes?: string[];
+    completionReplays?: string[];
+    completionSubscriptionId?: string;
     operation: DaemonOperation;
 }
 /** Response envelope kept raw until matched with its pending operation. */
@@ -162,6 +169,14 @@ export type DaemonWireResponse = {
     ok: false;
     error: string;
 };
+/** Unsolicited terminal completion sent to the socket that owns a daemon. */
+export interface DaemonCompletionNotification {
+    event: "daemon-completed";
+    completionId: string;
+    owner: string;
+    daemon: DaemonSnapshot;
+}
+export type DaemonWireMessage = DaemonWireResponse | DaemonCompletionNotification;
 /** Decode and validate a daemon launch specification. */
 export declare function parseDaemonSpec(value: unknown): DaemonSpec;
 /** Decode and validate one daemon snapshot. */
@@ -170,5 +185,7 @@ export declare function parseDaemonSnapshot(value: unknown): DaemonSnapshot;
 export declare function parseDaemonWireRequest(value: unknown): DaemonWireRequest;
 /** Decode a socket response envelope before resolving a pending call. */
 export declare function parseDaemonWireResponse(value: unknown): DaemonWireResponse;
+/** Decode one broker response or unsolicited completion notification. */
+export declare function parseDaemonWireMessage(value: unknown): DaemonWireMessage;
 /** Decode a broker result using its pending operation as the discriminator. */
 export declare function parseDaemonRpcResult(operation: DaemonOperation, value: unknown): DaemonRpcResult;

package/dist/types/lsp/index.d.ts

@@ -102,17 +102,27 @@ export declare class LspTool implements AgentTool<typeof lspSchema, LspToolDetai
     readonly loadMode = "discoverable";
     readonly summary = "Query LSP (language server) for diagnostics, hover info, and references";
     readonly description: string;
-    readonly parameters: import("arktype/internal/variants/object.ts").ObjectType<{
+    readonly parameters: import("@oh-my-pi/omptype").FluentType<{
         action: "capabilities" | "code_actions" | "definition" | "diagnostics" | "hover" | "implementation" | "references" | "reload" | "rename" | "rename_file" | "request" | "status" | "symbols" | "type_definition";
+        apply?: boolean | undefined;
         file?: string | undefined;
         line?: number | undefined;
-        symbol?: string | undefined;
-        query?: string | undefined;
         new_name?: string | undefined;
-        apply?: boolean | undefined;
+        payload?: string | undefined;
+        query?: string | undefined;
+        symbol?: string | undefined;
         timeout?: number | undefined;
+    }, {
+        action: "capabilities" | "code_actions" | "definition" | "diagnostics" | "hover" | "implementation" | "references" | "reload" | "rename" | "rename_file" | "request" | "status" | "symbols" | "type_definition";
+        apply?: boolean | undefined;
+        file?: string | undefined;
+        line?: number | undefined;
+        new_name?: string | undefined;
         payload?: string | undefined;
-    }, {}>;
+        query?: string | undefined;
+        symbol?: string | undefined;
+        timeout?: number | undefined;
+    }>;
     readonly strict = true;
     constructor(session: ToolSession);
     static createIf(session: ToolSession): LspTool | null;

package/dist/types/lsp/types.d.ts

@@ -1,14 +1,24 @@
-export declare const lspSchema: import("arktype/internal/variants/object.ts").ObjectType<{
+export declare const lspSchema: import("@oh-my-pi/omptype").FluentType<{
     action: "capabilities" | "code_actions" | "definition" | "diagnostics" | "hover" | "implementation" | "references" | "reload" | "rename" | "rename_file" | "request" | "status" | "symbols" | "type_definition";
+    apply?: boolean | undefined;
     file?: string | undefined;
     line?: number | undefined;
-    symbol?: string | undefined;
-    query?: string | undefined;
     new_name?: string | undefined;
-    apply?: boolean | undefined;
+    payload?: string | undefined;
+    query?: string | undefined;
+    symbol?: string | undefined;
     timeout?: number | undefined;
+}, {
+    action: "capabilities" | "code_actions" | "definition" | "diagnostics" | "hover" | "implementation" | "references" | "reload" | "rename" | "rename_file" | "request" | "status" | "symbols" | "type_definition";
+    apply?: boolean | undefined;
+    file?: string | undefined;
+    line?: number | undefined;
+    new_name?: string | undefined;
     payload?: string | undefined;
-}, {}>;
+    query?: string | undefined;
+    symbol?: string | undefined;
+    timeout?: number | undefined;
+}>;
 export type LspParams = typeof lspSchema.infer;
 export interface LspToolDetails {
     serverName?: string;

package/dist/types/modes/components/btw-panel.d.ts

@@ -2,6 +2,7 @@ import { Container, type TUI } from "@oh-my-pi/pi-tui";
 interface BtwPanelComponentOptions {
     question: string;
     tui: TUI;
+    canBranch?: () => boolean;
 }
 export declare class BtwPanelComponent extends Container {
     #private;
@@ -9,6 +10,8 @@ export declare class BtwPanelComponent extends Container {
     appendText(delta: string): void;
     setAnswer(text: string): void;
     markComplete(): void;
+    /** Shows that the completed answer is being promoted into the chat session. */
+    markBranching(): void;
     markAborted(): void;
     markError(message: string): void;
     isBranchable(): boolean;

package/dist/types/modes/controllers/btw-controller.d.ts

@@ -5,6 +5,8 @@ export declare class BtwController {
     constructor(ctx: InteractiveModeContext);
     hasActiveRequest(): boolean;
     canBranch(): boolean;
+    /** Whether plain `b` is currently reserved for a completed or pending branch action. */
+    handlesBranchKey(): boolean;
     canCopy(): boolean;
     handleCopy(): Promise<boolean>;
     handleBranch(): Promise<boolean>;

package/dist/types/modes/controllers/command-controller.d.ts

@@ -27,6 +27,7 @@ export declare class CommandController {
     handleMemoryCommand(text: string): Promise<void>;
     handleClearCommand(): Promise<void>;
     handleFreshCommand(): Promise<void>;
+    handleResetContextCommand(): Promise<void>;
     handleDropCommand(): Promise<void>;
     handleForkCommand(): Promise<void>;
     /**

package/dist/types/modes/interactive-mode.d.ts

@@ -337,6 +337,7 @@ export declare class InteractiveMode implements InteractiveModeContext {
     handleContextCommand(): void;
     handleClearCommand(): Promise<void>;
     handleFreshCommand(): Promise<void>;
+    handleResetContextCommand(): Promise<void>;
     handleDropCommand(): Promise<void>;
     handleForkCommand(): Promise<void>;
     handleMoveCommand(targetPath?: string): Promise<void>;
@@ -393,10 +394,12 @@ export declare class InteractiveMode implements InteractiveModeContext {
     hasActiveBtw(): boolean;
     handleBtwEscape(): boolean;
     canBranchBtw(): boolean;
+    /** Reserves plain `b` only after /btw has a completed branch action to handle. */
+    handlesBtwBranchKey(): boolean;
     handleBtwBranchKey(): Promise<boolean>;
     canCopyBtw(): boolean;
     handleBtwCopyKey(): Promise<boolean>;
-    handleBtwBranch(question: string, assistantMessage: AssistantMessage): Promise<void>;
+    handleBtwBranch(question: string, assistantMessage: AssistantMessage, leafId: string, sessionId: string): Promise<void>;
     handleOmfgCommand(complaint: string): Promise<void>;
     hasActiveOmfg(): boolean;
     handleOmfgEscape(): boolean;

package/dist/types/modes/types.d.ts

@@ -326,6 +326,7 @@ export interface InteractiveModeContext {
     handleDebugTranscriptCommand(): Promise<void>;
     handleClearCommand(): Promise<void>;
     handleFreshCommand(): Promise<void>;
+    handleResetContextCommand(): Promise<void>;
     handleDropCommand(): Promise<void>;
     handleForkCommand(): Promise<void>;
     handleBashCommand(command: string, excludeFromContext?: boolean): Promise<void>;
@@ -388,9 +389,10 @@ export interface InteractiveModeContext {
     handleBtwEscape(): boolean;
     handleBtwBranchKey(): Promise<boolean>;
     canBranchBtw(): boolean;
+    handlesBtwBranchKey(): boolean;
     canCopyBtw(): boolean;
     handleBtwCopyKey(): Promise<boolean>;
-    handleBtwBranch(question: string, assistantMessage: AssistantMessage): Promise<void>;
+    handleBtwBranch(question: string, assistantMessage: AssistantMessage, leafId: string, sessionId: string): Promise<void>;
     handleOmfgCommand(complaint: string): Promise<void>;
     hasActiveOmfg(): boolean;
     handleOmfgEscape(): boolean;