@factory/droid-sdk 0.1.4 → 0.2.0

package/dist/index.js

@@ -14,11 +14,18 @@ var DroidServerMethod = /* @__PURE__ */ ((DroidServerMethod2) => {
   DroidServerMethod2["REMOVE_MCP_SERVER"] = "droid.remove_mcp_server";
   DroidServerMethod2["LIST_MCP_REGISTRY"] = "droid.list_mcp_registry";
   DroidServerMethod2["LIST_MCP_TOOLS"] = "droid.list_mcp_tools";
+  DroidServerMethod2["LIST_TOOLS"] = "droid.list_tools";
   DroidServerMethod2["LIST_MCP_SERVERS"] = "droid.list_mcp_servers";
   DroidServerMethod2["TOGGLE_MCP_TOOL"] = "droid.toggle_mcp_tool";
   DroidServerMethod2["SUBMIT_MCP_AUTH_CODE"] = "droid.submit_mcp_auth_code";
   DroidServerMethod2["LIST_SKILLS"] = "droid.list_skills";
   DroidServerMethod2["SUBMIT_BUG_REPORT"] = "droid.submit_bug_report";
+  DroidServerMethod2["GET_REWIND_INFO"] = "droid.get_rewind_info";
+  DroidServerMethod2["EXECUTE_REWIND"] = "droid.execute_rewind";
+  DroidServerMethod2["COMPACT_SESSION"] = "droid.compact_session";
+  DroidServerMethod2["FORK_SESSION"] = "droid.fork_session";
+  DroidServerMethod2["RENAME_SESSION"] = "droid.rename_session";
+  DroidServerMethod2["GET_CONTEXT_STATS"] = "droid.get_context_stats";
   return DroidServerMethod2;
 })(DroidServerMethod || {});
 var DroidClientMethod = /* @__PURE__ */ ((DroidClientMethod2) => {
@@ -57,6 +64,10 @@ var ToolConfirmationOutcome = /* @__PURE__ */ ((ToolConfirmationOutcome3) => {
   ToolConfirmationOutcome3["ProceedAutoRunLow"] = "proceed_auto_run_low";
   ToolConfirmationOutcome3["ProceedAutoRunMedium"] = "proceed_auto_run_medium";
   ToolConfirmationOutcome3["ProceedAutoRunHigh"] = "proceed_auto_run_high";
+  ToolConfirmationOutcome3["ProceedNewSession"] = "proceed_new_session";
+  ToolConfirmationOutcome3["ProceedNewSessionLow"] = "proceed_new_session_low";
+  ToolConfirmationOutcome3["ProceedNewSessionMedium"] = "proceed_new_session_medium";
+  ToolConfirmationOutcome3["ProceedNewSessionHigh"] = "proceed_new_session_high";
   ToolConfirmationOutcome3["ProceedEdit"] = "proceed_edit";
   ToolConfirmationOutcome3["Cancel"] = "cancel";
   return ToolConfirmationOutcome3;
@@ -81,6 +92,11 @@ var DroidWorkingState = /* @__PURE__ */ ((DroidWorkingState2) => {
   DroidWorkingState2["CompactingConversation"] = "compacting_conversation";
   return DroidWorkingState2;
 })(DroidWorkingState || {});
+var ContextStatsAccuracy = /* @__PURE__ */ ((ContextStatsAccuracy2) => {
+  ContextStatsAccuracy2["Exact"] = "exact";
+  ContextStatsAccuracy2["Estimated"] = "estimated";
+  return ContextStatsAccuracy2;
+})(ContextStatsAccuracy || {});
 var DroidErrorType = /* @__PURE__ */ ((DroidErrorType2) => {
   DroidErrorType2["CONNECTION_ERROR"] = "ConnectionError";
   DroidErrorType2["PROTOCOL_ERROR"] = "ProtocolError";
@@ -252,19 +268,39 @@ var SkillLocation = /* @__PURE__ */ ((SkillLocation2) => {
 // src/schemas/constants.ts
 var JSONRPC_VERSION = "2.0";
 var LEGACY_FACTORY_API_VERSION = "1.0.0";
-var FACTORY_PROTOCOL_VERSION = "1.2.0";
+var FACTORY_PROTOCOL_VERSION = "1.3.0";
 var FACTORY_CLIENT_HEADER = "X-Factory-Client";
 var FACTORY_CLIENT_VERSION = "X-Client-Version";
 var DEFAULT_REQUEST_TIMEOUT = 3e4;
 var SESSION_INIT_TIMEOUT = 6e4;
 var MCP_AUTH_TIMEOUT = 3e5;
+var COMPACTION_TIMEOUT = 24e4;
+var REWIND_TIMEOUT = 6e4;
 
 // src/schemas/shared.ts
 import { z } from "zod";
+var JsonValueSchema = z.lazy(
+  () => z.union([
+    z.string(),
+    z.number(),
+    z.boolean(),
+    z.null(),
+    z.array(JsonValueSchema),
+    z.record(JsonValueSchema)
+  ])
+);
+var JsonObjectSchema = z.record(JsonValueSchema);
+var JsonArraySchema = z.array(JsonValueSchema);
 var TraceContextMetaSchema = z.object({
   traceparent: z.string().optional(),
   tracestate: z.string().optional()
 });
+var ToolSelectionOverridesSchema = z.object({
+  enabledToolIds: z.array(z.string()).optional(),
+  disabledToolIds: z.array(z.string()).optional()
+});
+var EmptyResultSchema = z.object({}).passthrough();
+var SuccessResultSchema = z.object({ success: z.boolean() }).passthrough();
 var JsonRpcEnvelopeSchema = z.object({
   jsonrpc: z.literal(JSONRPC_VERSION),
   factoryApiVersion: z.literal(LEGACY_FACTORY_API_VERSION),
@@ -274,18 +310,18 @@ var JsonRpcEnvelopeSchema = z.object({
 var JsonRpcErrorSchema = z.object({
   code: z.nativeEnum(JsonRpcErrorCode),
   message: z.string(),
-  data: z.unknown().optional()
+  data: JsonValueSchema.optional()
 });
 var BaseRequestSchema = z.object({
   type: z.literal("request"),
   id: z.string(),
   method: z.string(),
-  params: z.unknown().optional()
+  params: JsonValueSchema.optional()
 });
 var BaseResponseSuccessSchema = z.object({
   type: z.literal("response"),
   id: z.string(),
-  result: z.unknown()
+  result: JsonValueSchema
 });
 var BaseResponseFailureSchema = z.object({
   type: z.literal("response"),
@@ -295,7 +331,7 @@ var BaseResponseFailureSchema = z.object({
 var BaseNotificationSchema = z.object({
   type: z.literal("notification"),
   method: z.string(),
-  params: z.unknown().optional()
+  params: JsonValueSchema.optional()
 });
 var JsonRpcRequestSchema = JsonRpcEnvelopeSchema.extend(
   BaseRequestSchema.shape
@@ -318,61 +354,128 @@ var JsonRpcMessageSchema = z.discriminatedUnion("type", [
   JsonRpcEnvelopeSchema.extend({
     type: z.literal("response"),
     id: z.string().nullable(),
-    result: z.unknown().optional(),
+    result: JsonValueSchema.optional(),
     error: JsonRpcErrorSchema.optional()
   }),
   JsonRpcNotificationSchema
 ]);
 
-// src/schemas/messages.ts
+// src/schemas/session-metadata.ts
+import { z as z6 } from "zod";
+
+// src/schemas/client.ts
+import { z as z5 } from "zod";
+
+// src/schemas/mcp.ts
 import { z as z2 } from "zod";
-var TextBlockSchema = z2.object({
-  type: z2.literal("text"),
-  text: z2.string(),
-  id: z2.string().optional()
-}).passthrough();
-var Base64ImageSourceSchema = z2.object({
-  type: z2.literal("base64"),
-  data: z2.string(),
-  mediaType: z2.enum(["image/jpeg", "image/png", "image/gif", "image/webp"])
-}).passthrough();
-var ImageBlockSchema = z2.object({
-  type: z2.literal("image"),
-  source: Base64ImageSourceSchema,
-  id: z2.string().optional()
-}).passthrough();
-var ThinkingBlockSchema = z2.object({
-  type: z2.literal("thinking"),
-  signature: z2.string(),
-  thinking: z2.string(),
-  id: z2.string().optional(),
-  signatureProvider: z2.string().optional()
-}).passthrough();
-var RedactedThinkingBlockSchema = z2.object({
-  type: z2.literal("redacted_thinking"),
-  data: z2.string(),
-  id: z2.string().optional()
-}).passthrough();
-var ToolUseBlockSchema = z2.object({
-  type: z2.literal("tool_use"),
-  id: z2.string(),
-  input: z2.record(z2.unknown()),
+var McpStdioServerConfigFieldsSchema = z2.object({
+  command: z2.string().optional(),
+  args: z2.array(z2.string()).optional()
+});
+var McpHttpServerConfigFieldsSchema = z2.object({
+  url: z2.string().optional()
+});
+var McpSseServerConfigFieldsSchema = z2.object({
+  url: z2.string(),
+  headers: z2.record(z2.string()).optional()
+});
+var McpServerStatusInfoSchema = z2.object({
+  name: z2.string(),
+  status: z2.nativeEnum(McpServerStatus),
+  source: z2.nativeEnum(SettingsLevel),
+  isManaged: z2.boolean(),
+  error: z2.string().optional(),
+  toolCount: z2.number().optional(),
+  serverType: z2.nativeEnum(McpServerType).optional(),
+  hasAuthTokens: z2.boolean().optional()
+}).passthrough();
+var McpStatusSummarySchema = z2.object({
+  total: z2.number(),
+  connected: z2.number(),
+  connecting: z2.number(),
+  failed: z2.number(),
+  disabled: z2.number().optional()
+}).passthrough();
+var McpRegistryServerSchema = z2.object({
+  name: z2.string(),
+  description: z2.string(),
+  type: z2.nativeEnum(McpServerType),
+  // Stdio config fields
+  command: z2.string().optional(),
+  args: z2.array(z2.string()).optional(),
+  // HTTP config fields
+  url: z2.string().optional(),
+  // Additional metadata
+  note: z2.string().optional(),
+  logoUrl: z2.string().optional()
+}).passthrough();
+var McpToolInputSchemaSchema = z2.object({
+  type: z2.string().optional(),
+  properties: JsonObjectSchema.optional(),
+  required: z2.array(z2.string()).optional()
+}).passthrough();
+var McpToolInfoSchema = z2.object({
+  serverName: z2.string(),
   name: z2.string(),
-  thoughtSignature: z2.string().optional()
+  description: z2.string().optional(),
+  isEnabled: z2.boolean(),
+  isReadOnly: z2.boolean().optional(),
+  inputSchema: McpToolInputSchemaSchema.optional()
+}).passthrough();
+var ToolConfirmationListItemSchema = z2.object({
+  label: z2.string(),
+  value: z2.nativeEnum(ToolConfirmationOutcome)
+}).passthrough();
+
+// src/schemas/messages.ts
+import { z as z3 } from "zod";
+var TextBlockSchema = z3.object({
+  type: z3.literal("text"),
+  text: z3.string(),
+  id: z3.string().optional()
+}).passthrough();
+var Base64ImageSourceSchema = z3.object({
+  type: z3.literal("base64"),
+  data: z3.string(),
+  mediaType: z3.enum(["image/jpeg", "image/png", "image/gif", "image/webp"])
+}).passthrough();
+var ImageBlockSchema = z3.object({
+  type: z3.literal("image"),
+  source: Base64ImageSourceSchema,
+  id: z3.string().optional()
+}).passthrough();
+var ThinkingBlockSchema = z3.object({
+  type: z3.literal("thinking"),
+  signature: z3.string(),
+  thinking: z3.string(),
+  id: z3.string().optional(),
+  signatureProvider: z3.string().optional()
+}).passthrough();
+var RedactedThinkingBlockSchema = z3.object({
+  type: z3.literal("redacted_thinking"),
+  data: z3.string(),
+  id: z3.string().optional()
+}).passthrough();
+var ToolUseBlockSchema = z3.object({
+  type: z3.literal("tool_use"),
+  id: z3.string(),
+  input: JsonObjectSchema,
+  name: z3.string(),
+  thoughtSignature: z3.string().optional()
 }).passthrough();
-var ToolResultBlockSchema = z2.object({
-  type: z2.literal("tool_result"),
-  toolUseId: z2.string(),
-  content: z2.union([z2.string(), z2.array(z2.unknown())]).optional(),
-  isError: z2.boolean().optional(),
-  id: z2.string().optional()
+var ToolResultBlockSchema = z3.object({
+  type: z3.literal("tool_result"),
+  toolUseId: z3.string(),
+  content: z3.union([z3.string(), z3.array(JsonValueSchema)]).optional(),
+  isError: z3.boolean().optional(),
+  id: z3.string().optional()
 }).passthrough();
-var DocumentBlockSchema = z2.object({
-  type: z2.literal("document"),
-  source: z2.record(z2.unknown()),
-  id: z2.string().optional()
+var DocumentBlockSchema = z3.object({
+  type: z3.literal("document"),
+  source: JsonObjectSchema,
+  id: z3.string().optional()
 }).passthrough();
-var ContentBlockSchema = z2.discriminatedUnion("type", [
+var ContentBlockSchema = z3.discriminatedUnion("type", [
   TextBlockSchema,
   ImageBlockSchema,
   ThinkingBlockSchema,
@@ -381,83 +484,33 @@ var ContentBlockSchema = z2.discriminatedUnion("type", [
   ToolResultBlockSchema,
   DocumentBlockSchema
 ]);
-var FactoryDroidMessageSchema = z2.object({
-  id: z2.string(),
-  role: z2.enum(["user", "assistant", "tool", "system"]),
-  content: z2.array(ContentBlockSchema),
-  createdAt: z2.number(),
-  updatedAt: z2.number(),
-  parentId: z2.string().optional(),
-  visibility: z2.enum(["both", "llm_only", "user_only"]).optional(),
-  isError: z2.boolean().optional()
-}).passthrough();
-var DocumentSourceSchema = z2.object({
-  type: z2.string(),
-  mediaType: z2.string(),
-  data: z2.string(),
-  name: z2.string().optional(),
-  mime: z2.string().optional()
-}).strict();
-
-// src/schemas/mcp.ts
-import { z as z3 } from "zod";
-var McpStdioServerConfigFieldsSchema = z3.object({
-  command: z3.string().optional(),
-  args: z3.array(z3.string()).optional()
-});
-var McpHttpServerConfigFieldsSchema = z3.object({
-  url: z3.string().optional()
-});
-var McpSseServerConfigFieldsSchema = z3.object({
-  url: z3.string(),
-  headers: z3.record(z3.string()).optional()
-});
-var McpServerStatusInfoSchema = z3.object({
-  name: z3.string(),
-  status: z3.nativeEnum(McpServerStatus),
-  source: z3.nativeEnum(SettingsLevel),
-  isManaged: z3.boolean(),
-  error: z3.string().optional(),
-  toolCount: z3.number().optional(),
-  serverType: z3.nativeEnum(McpServerType).optional(),
-  hasAuthTokens: z3.boolean().optional()
-}).passthrough();
-var McpStatusSummarySchema = z3.object({
-  total: z3.number(),
-  connected: z3.number(),
-  connecting: z3.number(),
-  failed: z3.number(),
-  disabled: z3.number().optional()
-}).passthrough();
-var McpRegistryServerSchema = z3.object({
-  name: z3.string(),
-  description: z3.string(),
-  type: z3.nativeEnum(McpServerType),
-  // Stdio config fields
-  command: z3.string().optional(),
-  args: z3.array(z3.string()).optional(),
-  // HTTP config fields
-  url: z3.string().optional(),
-  // Additional metadata
-  note: z3.string().optional(),
-  logoUrl: z3.string().optional()
-}).passthrough();
-var McpToolInputSchemaSchema = z3.object({
-  type: z3.string().optional(),
-  properties: z3.record(z3.unknown()).optional(),
-  required: z3.array(z3.string()).optional()
-}).passthrough();
-var McpToolInfoSchema = z3.object({
-  serverName: z3.string(),
-  name: z3.string(),
-  description: z3.string().optional(),
-  isEnabled: z3.boolean(),
-  isReadOnly: z3.boolean().optional(),
-  inputSchema: McpToolInputSchemaSchema.optional()
-}).passthrough();
-var ToolConfirmationListItemSchema = z3.object({
-  label: z3.string(),
-  value: z3.nativeEnum(ToolConfirmationOutcome)
+var FactoryDroidMessageRole = {
+  User: "user",
+  Assistant: "assistant",
+  Tool: "tool",
+  System: "system"
+};
+var FactoryDroidMessageSchema = z3.object({
+  id: z3.string(),
+  role: z3.enum([
+    FactoryDroidMessageRole.User,
+    FactoryDroidMessageRole.Assistant,
+    FactoryDroidMessageRole.Tool,
+    FactoryDroidMessageRole.System
+  ]),
+  content: z3.array(ContentBlockSchema),
+  createdAt: z3.number(),
+  updatedAt: z3.number(),
+  parentId: z3.string().optional(),
+  visibility: z3.enum(["both", "llm_only", "user_only"]).optional(),
+  isError: z3.boolean().optional()
+}).passthrough();
+var DocumentSourceSchema = z3.object({
+  type: z3.string(),
+  mediaType: z3.string(),
+  data: z3.string(),
+  name: z3.string().optional(),
+  mime: z3.string().optional()
 }).passthrough();
 
 // src/schemas/mission.ts
@@ -608,7 +661,12 @@ var ProgressLogEntrySchema = z4.discriminatedUnion("type", [
 ]);
 
 // src/schemas/client.ts
-import { z as z5 } from "zod";
+var SessionModeRequestFieldsShape = {
+  modelId: z5.string().optional(),
+  autonomyMode: z5.nativeEnum(AutonomyMode).optional(),
+  interactionMode: z5.nativeEnum(DroidInteractionMode).optional(),
+  autonomyLevel: z5.nativeEnum(AutonomyLevel).optional()
+};
 var SessionTagSchema = z5.object({
   name: z5.string(),
   metadata: z5.record(z5.string()).optional()
@@ -650,7 +708,8 @@ var SessionSettingsSchema = z5.object({
   interactionMode: z5.nativeEnum(DroidInteractionMode).optional().catch(void 0),
   autonomyLevel: z5.nativeEnum(AutonomyLevel).optional().catch(void 0),
   specModeModelId: z5.string().optional(),
-  specModeReasoningEffort: z5.nativeEnum(ReasoningEffort).optional()
+  specModeReasoningEffort: z5.nativeEnum(ReasoningEffort).optional(),
+  ...ToolSelectionOverridesSchema.shape
 }).passthrough();
 var GitRepoInfoSchema = z5.object({
   owner: z5.string().optional(),
@@ -670,7 +729,7 @@ var AvailableModelConfigSchema = z5.object({
   tier: z5.string().optional(),
   tokenMultiplier: z5.number().optional(),
   promoLabel: z5.string().optional(),
-  featureFlag: z5.record(z5.unknown()).optional(),
+  featureFlag: JsonObjectSchema.optional(),
   usesUSBasedInference: z5.boolean().optional()
 }).passthrough();
 var TokenUsageSchema = z5.object({
@@ -680,6 +739,13 @@ var TokenUsageSchema = z5.object({
   cacheReadTokens: z5.number(),
   thinkingTokens: z5.number()
 }).passthrough();
+var ContextStatsSchema = z5.object({
+  used: z5.number(),
+  remaining: z5.number(),
+  limit: z5.number(),
+  accuracy: z5.nativeEnum(ContextStatsAccuracy),
+  updatedAt: z5.string()
+}).passthrough();
 var WorkerStateInfoSchema = z5.object({
   startedAt: z5.string(),
   completedAt: z5.string().optional(),
@@ -707,17 +773,14 @@ var InitializeSessionRequestParamsSchema = z5.object({
   workspaceId: z5.string().optional(),
   sessionId: z5.string().optional(),
   mcpServers: z5.array(McpServerConfigSchema).optional(),
-  autonomyMode: z5.nativeEnum(AutonomyMode).optional(),
-  interactionMode: z5.nativeEnum(DroidInteractionMode).optional().catch(void 0),
-  autonomyLevel: z5.nativeEnum(AutonomyLevel).optional().catch(void 0),
-  modelId: z5.string().optional(),
+  ...SessionModeRequestFieldsShape,
   reasoningEffort: z5.nativeEnum(ReasoningEffort).optional(),
   specModeModelId: z5.string().optional(),
   specModeReasoningEffort: z5.nativeEnum(ReasoningEffort).optional(),
   decompSessionType: z5.nativeEnum(DecompSessionType).optional(),
   decompMissionId: z5.string().optional(),
   skipPermissionsUnsafe: z5.boolean().optional(),
-  enabledToolIds: z5.array(z5.string()).optional(),
+  ...ToolSelectionOverridesSchema.shape,
   sessionLocation: z5.string().optional(),
   sessionSource: SessionSourceSchema.optional(),
   tags: z5.array(SessionTagSchema).optional(),
@@ -728,24 +791,30 @@ var LoadSessionRequestParamsSchema = z5.object({
   mcpServers: z5.array(McpServerConfigSchema).optional(),
   mcpOAuthCallbackUri: z5.string().optional()
 }).strict();
+var OutputFormatType = {
+  JsonSchema: "json_schema"
+};
+var OutputFormatSchema = z5.object({
+  type: z5.literal(OutputFormatType.JsonSchema),
+  schema: JsonObjectSchema
+}).strict();
 var AddUserMessageRequestParamsSchema = z5.object({
   messageId: z5.string().optional(),
   text: z5.string(),
   images: z5.array(Base64ImageSourceSchema).optional(),
-  files: z5.array(DocumentSourceSchema).optional()
+  files: z5.array(DocumentSourceSchema).optional(),
+  outputFormat: OutputFormatSchema.optional()
 }).strict();
 var InterruptSessionRequestParamsSchema = z5.object({}).strict();
 var KillWorkerSessionRequestParamsSchema = z5.object({
   workerSessionId: z5.string()
 }).strict();
 var UpdateSessionSettingsRequestParamsSchema = z5.object({
-  modelId: z5.string().optional(),
+  ...SessionModeRequestFieldsShape,
   reasoningEffort: z5.nativeEnum(ReasoningEffort).optional(),
-  autonomyMode: z5.nativeEnum(AutonomyMode).optional(),
-  interactionMode: z5.nativeEnum(DroidInteractionMode).optional().catch(void 0),
-  autonomyLevel: z5.nativeEnum(AutonomyLevel).optional().catch(void 0),
   specModeModelId: z5.string().nullable().optional(),
-  specModeReasoningEffort: z5.nativeEnum(ReasoningEffort).nullable().optional()
+  specModeReasoningEffort: z5.nativeEnum(ReasoningEffort).nullable().optional(),
+  ...ToolSelectionOverridesSchema.shape
 }).strict();
 var ToggleMcpServerRequestParamsSchema = z5.object({
   serverName: z5.string(),
@@ -781,6 +850,22 @@ var RemoveMcpServerRequestParamsSchema = z5.object({
 }).strict();
 var ListMcpRegistryRequestParamsSchema = z5.object({}).strict();
 var ListMcpToolsRequestParamsSchema = z5.object({}).strict();
+var ExecToolInfoSchema = z5.object({
+  id: z5.string(),
+  llmId: z5.string(),
+  displayName: z5.string(),
+  description: z5.string(),
+  category: z5.enum(["read", "edit", "execute", "other"]),
+  defaultAllowed: z5.boolean(),
+  currentlyAllowed: z5.boolean()
+}).passthrough();
+var ListToolsRequestParamsSchema = z5.object({
+  ...SessionModeRequestFieldsShape,
+  specModeModelId: z5.string().nullable().optional(),
+  skipPermissionsUnsafe: z5.boolean().optional(),
+  ...ToolSelectionOverridesSchema.shape,
+  depth: z5.number().int().min(0).optional()
+}).strict();
 var ListMcpServersRequestParamsSchema = z5.object({}).strict();
 var ToggleMcpToolRequestParamsSchema = z5.object({
   serverName: z5.string(),
@@ -792,6 +877,35 @@ var SubmitBugReportRequestParamsSchema = z5.object({
   userComment: z5.string(),
   clientLogs: z5.string().optional()
 }).strict();
+var RewindFileSnapshotSchema = z5.object({
+  filePath: z5.string(),
+  contentHash: z5.string(),
+  size: z5.number()
+}).passthrough();
+var RewindFileCreationSchema = z5.object({
+  filePath: z5.string()
+}).passthrough();
+var RewindEvictedFileSchema = z5.object({
+  filePath: z5.string(),
+  reason: z5.string()
+}).passthrough();
+var GetRewindInfoRequestParamsSchema = z5.object({
+  messageId: z5.string()
+}).passthrough();
+var ExecuteRewindRequestParamsSchema = z5.object({
+  messageId: z5.string(),
+  filesToRestore: z5.array(RewindFileSnapshotSchema),
+  filesToDelete: z5.array(RewindFileCreationSchema),
+  forkTitle: z5.string()
+}).passthrough();
+var CompactSessionRequestParamsSchema = z5.object({
+  customInstructions: z5.string().optional()
+}).passthrough();
+var RenameSessionRequestParamsSchema = z5.object({
+  title: z5.string()
+}).passthrough();
+var ForkSessionRequestParamsSchema = z5.object({}).passthrough();
+var GetContextStatsRequestParamsSchema = z5.object({}).passthrough();
 var InitializeSessionRequestSchema = JsonRpcRequestSchema.extend({
   method: z5.literal("droid.initialize_session" /* INITIALIZE_SESSION */),
   params: InitializeSessionRequestParamsSchema
@@ -852,6 +966,10 @@ var ListMcpToolsRequestSchema = JsonRpcRequestSchema.extend({
   method: z5.literal("droid.list_mcp_tools" /* LIST_MCP_TOOLS */),
   params: ListMcpToolsRequestParamsSchema
 });
+var ListToolsRequestSchema = JsonRpcRequestSchema.extend({
+  method: z5.literal("droid.list_tools" /* LIST_TOOLS */),
+  params: ListToolsRequestParamsSchema
+});
 var ListMcpServersRequestSchema = JsonRpcRequestSchema.extend({
   method: z5.literal("droid.list_mcp_servers" /* LIST_MCP_SERVERS */),
   params: ListMcpServersRequestParamsSchema
@@ -868,6 +986,30 @@ var SubmitBugReportRequestSchema = JsonRpcRequestSchema.extend({
   method: z5.literal("droid.submit_bug_report" /* SUBMIT_BUG_REPORT */),
   params: SubmitBugReportRequestParamsSchema
 });
+var GetRewindInfoRequestSchema = JsonRpcRequestSchema.extend({
+  method: z5.literal("droid.get_rewind_info" /* GET_REWIND_INFO */),
+  params: GetRewindInfoRequestParamsSchema
+});
+var ExecuteRewindRequestSchema = JsonRpcRequestSchema.extend({
+  method: z5.literal("droid.execute_rewind" /* EXECUTE_REWIND */),
+  params: ExecuteRewindRequestParamsSchema
+});
+var CompactSessionRequestSchema = JsonRpcRequestSchema.extend({
+  method: z5.literal("droid.compact_session" /* COMPACT_SESSION */),
+  params: CompactSessionRequestParamsSchema
+});
+var ForkSessionRequestSchema = JsonRpcRequestSchema.extend({
+  method: z5.literal("droid.fork_session" /* FORK_SESSION */),
+  params: ForkSessionRequestParamsSchema
+});
+var GetContextStatsRequestSchema = JsonRpcRequestSchema.extend({
+  method: z5.literal("droid.get_context_stats" /* GET_CONTEXT_STATS */),
+  params: GetContextStatsRequestParamsSchema
+});
+var RenameSessionRequestSchema = JsonRpcRequestSchema.extend({
+  method: z5.literal("droid.rename_session" /* RENAME_SESSION */),
+  params: RenameSessionRequestParamsSchema
+});
 var ClientRequestSchema = z5.discriminatedUnion("method", [
   InitializeSessionRequestSchema,
   LoadSessionRequestSchema,
@@ -884,10 +1026,17 @@ var ClientRequestSchema = z5.discriminatedUnion("method", [
   RemoveMcpServerRequestSchema,
   ListMcpRegistryRequestSchema,
   ListMcpToolsRequestSchema,
+  ListToolsRequestSchema,
   ListMcpServersRequestSchema,
   ToggleMcpToolRequestSchema,
   ListSkillsRequestSchema,
-  SubmitBugReportRequestSchema
+  SubmitBugReportRequestSchema,
+  GetRewindInfoRequestSchema,
+  ExecuteRewindRequestSchema,
+  CompactSessionRequestSchema,
+  ForkSessionRequestSchema,
+  GetContextStatsRequestSchema,
+  RenameSessionRequestSchema
 ]);
 var MissionSnapshotSchema = z5.object({
   state: z5.nativeEnum(MissionState),
@@ -900,20 +1049,20 @@ var MissionSnapshotSchema = z5.object({
 }).passthrough();
 var InitializeSessionResultSchema = z5.object({
   sessionId: z5.string(),
-  session: z5.record(z5.unknown()),
+  session: JsonObjectSchema,
   mcpServers: z5.array(McpServerConfigSchema).optional(),
   settings: SessionSettingsSchema,
   gitRepo: GitRepoInfoSchema.optional(),
   availableModels: z5.array(AvailableModelConfigSchema).optional()
 }).passthrough();
 var LoadSessionResultSchema = z5.object({
-  session: z5.record(z5.unknown()),
+  session: JsonObjectSchema,
   mcpServers: z5.array(McpServerConfigSchema).optional(),
-  pendingPermissions: z5.array(z5.record(z5.unknown())).optional(),
-  pendingAskUserRequests: z5.array(z5.record(z5.unknown())).optional(),
+  pendingPermissions: z5.array(JsonObjectSchema).optional(),
+  pendingAskUserRequests: z5.array(JsonObjectSchema).optional(),
   settings: SessionSettingsSchema,
   isAgentLoopInProgress: z5.boolean().optional(),
-  queuedMessages: z5.array(z5.record(z5.unknown())).optional(),
+  queuedMessages: z5.array(JsonObjectSchema).optional(),
   gitRepo: GitRepoInfoSchema.optional(),
   cwd: z5.string().optional(),
   callingSessionId: z5.string().optional(),
@@ -923,26 +1072,48 @@ var LoadSessionResultSchema = z5.object({
   mission: MissionSnapshotSchema.optional(),
   decompSessionType: z5.nativeEnum(DecompSessionType).optional()
 }).passthrough();
-var AddUserMessageResultSchema = z5.object({}).passthrough();
-var InterruptSessionResultSchema = z5.object({}).passthrough();
-var KillWorkerSessionResultSchema = z5.object({}).passthrough();
-var UpdateSessionSettingsResultSchema = z5.object({}).passthrough();
-var ToggleMcpServerResultSchema = z5.object({ success: z5.boolean() }).passthrough();
-var AuthenticateMcpServerResultSchema = z5.object({ success: z5.boolean() }).passthrough();
-var CancelMcpAuthResultSchema = z5.object({ success: z5.boolean() }).passthrough();
-var ClearMcpAuthResultSchema = z5.object({ success: z5.boolean() }).passthrough();
-var SubmitMcpAuthCodeResultSchema = z5.object({ success: z5.boolean() }).passthrough();
-var AddMcpServerResultSchema = z5.object({ success: z5.boolean() }).passthrough();
-var RemoveMcpServerResultSchema = z5.object({ success: z5.boolean() }).passthrough();
+var AddUserMessageResultSchema = EmptyResultSchema;
+var InterruptSessionResultSchema = EmptyResultSchema;
+var KillWorkerSessionResultSchema = EmptyResultSchema;
+var UpdateSessionSettingsResultSchema = EmptyResultSchema;
+var ToggleMcpServerResultSchema = SuccessResultSchema;
+var AuthenticateMcpServerResultSchema = SuccessResultSchema;
+var CancelMcpAuthResultSchema = SuccessResultSchema;
+var ClearMcpAuthResultSchema = SuccessResultSchema;
+var SubmitMcpAuthCodeResultSchema = SuccessResultSchema;
+var AddMcpServerResultSchema = SuccessResultSchema;
+var RemoveMcpServerResultSchema = SuccessResultSchema;
 var ListMcpRegistryResultSchema = z5.object({ servers: z5.array(McpRegistryServerSchema) }).passthrough();
 var ListMcpToolsResultSchema = z5.object({ tools: z5.array(McpToolInfoSchema) }).passthrough();
+var ListToolsResultSchema = z5.object({ tools: z5.array(ExecToolInfoSchema) }).passthrough();
 var ListMcpServersResultSchema = z5.object({
   servers: z5.array(McpServerStatusInfoSchema),
   summary: McpStatusSummarySchema
 }).passthrough();
-var ToggleMcpToolResultSchema = z5.object({ success: z5.boolean() }).passthrough();
+var ToggleMcpToolResultSchema = SuccessResultSchema;
 var ListSkillsResultSchema = z5.object({ skills: z5.array(SkillInfoSchema) }).passthrough();
 var SubmitBugReportResultSchema = z5.object({ bugReportId: z5.string() }).passthrough();
+var GetRewindInfoResultSchema = z5.object({
+  availableFiles: z5.array(RewindFileSnapshotSchema),
+  createdFiles: z5.array(RewindFileCreationSchema),
+  evictedFiles: z5.array(RewindEvictedFileSchema)
+}).passthrough();
+var ExecuteRewindResultSchema = z5.object({
+  newSessionId: z5.string(),
+  restoredCount: z5.number(),
+  deletedCount: z5.number(),
+  failedRestoreCount: z5.number(),
+  failedDeleteCount: z5.number()
+}).passthrough();
+var CompactSessionResultSchema = z5.object({
+  newSessionId: z5.string(),
+  removedCount: z5.number()
+}).passthrough();
+var ForkSessionResultSchema = z5.object({
+  newSessionId: z5.string()
+}).passthrough();
+var GetContextStatsResultSchema = ContextStatsSchema;
+var RenameSessionResultSchema = SuccessResultSchema;
 var InitializeSessionResponseSchema = z5.union([
   JsonRpcResponseSuccessSchema.extend({
     result: InitializeSessionResultSchema
@@ -1020,6 +1191,10 @@ var ListMcpToolsResponseSchema = z5.union([
   JsonRpcResponseSuccessSchema.extend({ result: ListMcpToolsResultSchema }),
   JsonRpcResponseFailureSchema
 ]);
+var ListToolsResponseSchema = z5.union([
+  JsonRpcResponseSuccessSchema.extend({ result: ListToolsResultSchema }),
+  JsonRpcResponseFailureSchema
+]);
 var ListMcpServersResponseSchema = z5.union([
   JsonRpcResponseSuccessSchema.extend({ result: ListMcpServersResultSchema }),
   JsonRpcResponseFailureSchema
@@ -1036,145 +1211,194 @@ var SubmitBugReportResponseSchema = z5.union([
   JsonRpcResponseSuccessSchema.extend({ result: SubmitBugReportResultSchema }),
   JsonRpcResponseFailureSchema
 ]);
+var GetRewindInfoResponseSchema = z5.union([
+  JsonRpcResponseSuccessSchema.extend({ result: GetRewindInfoResultSchema }),
+  JsonRpcResponseFailureSchema
+]);
+var ExecuteRewindResponseSchema = z5.union([
+  JsonRpcResponseSuccessSchema.extend({ result: ExecuteRewindResultSchema }),
+  JsonRpcResponseFailureSchema
+]);
+var CompactSessionResponseSchema = z5.union([
+  JsonRpcResponseSuccessSchema.extend({ result: CompactSessionResultSchema }),
+  JsonRpcResponseFailureSchema
+]);
+var ForkSessionResponseSchema = z5.union([
+  JsonRpcResponseSuccessSchema.extend({ result: ForkSessionResultSchema }),
+  JsonRpcResponseFailureSchema
+]);
+var GetContextStatsResponseSchema = z5.union([
+  JsonRpcResponseSuccessSchema.extend({ result: GetContextStatsResultSchema }),
+  JsonRpcResponseFailureSchema
+]);
+var RenameSessionResponseSchema = z5.union([
+  JsonRpcResponseSuccessSchema.extend({ result: RenameSessionResultSchema }),
+  JsonRpcResponseFailureSchema
+]);
 
-// src/schemas/server.ts
-import { z as z6 } from "zod";
-var ToolUseSchema = z6.object({
-  type: z6.literal("tool_use"),
+// src/schemas/session-metadata.ts
+var SessionMetadataSchema = z6.object({
   id: z6.string(),
-  input: z6.record(z6.unknown()),
-  name: z6.string(),
-  thoughtSignature: z6.string().optional()
-}).passthrough();
-var ErrorDetailSchema = z6.object({
-  name: z6.string(),
-  message: z6.string()
-}).passthrough();
-var ToolProgressUpdateSchema = z6.object({
-  type: z6.enum(["tool_call", "tool_result", "error", "status", "message"]),
-  toolName: z6.string().optional(),
-  status: z6.string().optional(),
-  details: z6.string().optional(),
-  text: z6.string().optional(),
-  error: z6.string().optional(),
-  timestamp: z6.number().optional(),
-  parameters: z6.record(z6.unknown()).optional(),
-  valueSnippet: z6.string().optional(),
-  subagentSessionId: z6.string().optional()
-}).passthrough();
-var SettingsUpdatedPayloadSchema = z6.object({
-  autonomyMode: z6.nativeEnum(AutonomyMode).optional(),
-  interactionMode: z6.nativeEnum(DroidInteractionMode).optional().catch(void 0),
-  autonomyLevel: z6.nativeEnum(AutonomyLevel).optional().catch(void 0),
-  modelId: z6.string().optional(),
-  reasoningEffort: z6.nativeEnum(ReasoningEffort).optional(),
-  specModeModelId: z6.string().optional(),
-  specModeReasoningEffort: z6.nativeEnum(ReasoningEffort).optional()
-}).passthrough();
-var ToolResultNotificationSchema = z6.object({
-  type: z6.literal("tool_result" /* TOOL_RESULT */),
-  messageId: z6.string(),
-  toolUseId: z6.string(),
-  content: z6.unknown().optional(),
-  isError: z6.boolean().optional(),
-  id: z6.string().optional()
-}).passthrough();
-var ToolProgressUpdateNotificationSchema = z6.object({
-  type: z6.literal("tool_progress_update" /* TOOL_PROGRESS_UPDATE */),
-  toolUseId: z6.string(),
-  toolName: z6.string(),
+  title: z6.string(),
+  sessionTitle: z6.string().optional(),
+  owner: z6.string(),
+  messageCount: z6.number(),
+  modifiedTime: z6.date(),
+  createdTime: z6.date(),
+  isFavorite: z6.boolean().optional(),
+  cwd: z6.string().optional(),
+  decompSessionType: z6.nativeEnum(DecompSessionType).optional(),
+  decompMissionId: z6.string().optional()
+}).passthrough();
+var SessionStartEventSchema = z6.object({
+  type: z6.literal("session_start"),
+  sessionId: z6.string().optional(),
+  title: z6.string().optional(),
+  sessionTitle: z6.string().optional(),
+  owner: z6.string().optional(),
+  cwd: z6.string().optional(),
+  decompSessionType: z6.nativeEnum(DecompSessionType).optional().catch(void 0),
+  decompMissionId: z6.string().optional()
+}).passthrough();
+var SessionSettingsFileSchema = z6.object({
+  archivedAt: z6.string().optional(),
+  tags: z6.array(SessionTagSchema).optional()
+}).passthrough();
+
+// src/schemas/server.ts
+import { z as z7 } from "zod";
+var ToolUseBlockSchema2 = ToolUseBlockSchema;
+var ToolUseSchema = ToolUseBlockSchema2;
+var ErrorDetailSchema = z7.object({
+  name: z7.string(),
+  message: z7.string()
+}).passthrough();
+var ToolProgressUpdateSchema = z7.object({
+  type: z7.enum(["tool_call", "tool_result", "error", "status", "message"]),
+  toolName: z7.string().optional(),
+  status: z7.string().optional(),
+  details: z7.string().optional(),
+  text: z7.string().optional(),
+  error: z7.string().optional(),
+  timestamp: z7.number().optional(),
+  parameters: JsonObjectSchema.optional(),
+  valueSnippet: z7.string().optional(),
+  subagentSessionId: z7.string().optional()
+}).passthrough();
+var SettingsUpdatedPayloadSchema = z7.object({
+  autonomyMode: z7.nativeEnum(AutonomyMode).optional(),
+  interactionMode: z7.nativeEnum(DroidInteractionMode).optional().catch(void 0),
+  autonomyLevel: z7.nativeEnum(AutonomyLevel).optional().catch(void 0),
+  modelId: z7.string().optional(),
+  reasoningEffort: z7.nativeEnum(ReasoningEffort).optional(),
+  specModeModelId: z7.string().optional(),
+  specModeReasoningEffort: z7.nativeEnum(ReasoningEffort).optional(),
+  ...ToolSelectionOverridesSchema.shape
+}).passthrough();
+var ToolResultNotificationSchema = z7.object({
+  type: z7.literal("tool_result" /* TOOL_RESULT */),
+  messageId: z7.string(),
+  toolUseId: z7.string(),
+  content: JsonValueSchema.optional(),
+  isError: z7.boolean().optional(),
+  id: z7.string().optional()
+}).passthrough();
+var ToolProgressUpdateNotificationSchema = z7.object({
+  type: z7.literal("tool_progress_update" /* TOOL_PROGRESS_UPDATE */),
+  toolUseId: z7.string(),
+  toolName: z7.string(),
   update: ToolProgressUpdateSchema
 }).passthrough();
-var CreateMessageNotificationSchema = z6.object({
-  type: z6.literal("create_message" /* CREATE_MESSAGE */),
+var CreateMessageNotificationSchema = z7.object({
+  type: z7.literal("create_message" /* CREATE_MESSAGE */),
   message: FactoryDroidMessageSchema,
-  parentId: z6.string().optional(),
-  requestId: z6.string().optional()
-}).passthrough();
-var ErrorNotificationSchema = z6.object({
-  type: z6.literal("error" /* ERROR */),
-  message: z6.string(),
-  errorType: z6.nativeEnum(DroidErrorType),
-  timestamp: z6.string(),
+  parentId: z7.string().optional(),
+  requestId: z7.string().optional()
+}).passthrough();
+var ErrorNotificationSchema = z7.object({
+  type: z7.literal("error" /* ERROR */),
+  message: z7.string(),
+  errorType: z7.nativeEnum(DroidErrorType),
+  timestamp: z7.string(),
   error: ErrorDetailSchema.optional()
 }).passthrough();
-var DroidWorkingStateChangedNotificationSchema = z6.object({
-  type: z6.literal("droid_working_state_changed" /* DROID_WORKING_STATE_CHANGED */),
-  newState: z6.nativeEnum(DroidWorkingState)
+var DroidWorkingStateChangedNotificationSchema = z7.object({
+  type: z7.literal("droid_working_state_changed" /* DROID_WORKING_STATE_CHANGED */),
+  newState: z7.nativeEnum(DroidWorkingState)
 }).passthrough();
-var PermissionResolvedNotificationSchema = z6.object({
-  type: z6.literal("permission_resolved" /* PERMISSION_RESOLVED */),
-  requestId: z6.string(),
-  toolUseIds: z6.array(z6.string()),
-  selectedOption: z6.nativeEnum(ToolConfirmationOutcome)
+var PermissionResolvedNotificationSchema = z7.object({
+  type: z7.literal("permission_resolved" /* PERMISSION_RESOLVED */),
+  requestId: z7.string(),
+  toolUseIds: z7.array(z7.string()),
+  selectedOption: z7.nativeEnum(ToolConfirmationOutcome)
 }).passthrough();
-var SettingsUpdatedNotificationSchema = z6.object({
-  type: z6.literal("settings_updated" /* SETTINGS_UPDATED */),
+var SettingsUpdatedNotificationSchema = z7.object({
+  type: z7.literal("settings_updated" /* SETTINGS_UPDATED */),
   settings: SettingsUpdatedPayloadSchema
 }).passthrough();
-var SessionTitleUpdatedNotificationSchema = z6.object({
-  type: z6.literal("session_title_updated" /* SESSION_TITLE_UPDATED */),
-  title: z6.string()
+var SessionTitleUpdatedNotificationSchema = z7.object({
+  type: z7.literal("session_title_updated" /* SESSION_TITLE_UPDATED */),
+  title: z7.string()
 }).passthrough();
-var McpStatusChangedNotificationSchema = z6.object({
-  type: z6.literal("mcp_status_changed" /* MCP_STATUS_CHANGED */),
-  servers: z6.array(McpServerStatusInfoSchema),
+var McpStatusChangedNotificationSchema = z7.object({
+  type: z7.literal("mcp_status_changed" /* MCP_STATUS_CHANGED */),
+  servers: z7.array(McpServerStatusInfoSchema),
   summary: McpStatusSummarySchema
 }).passthrough();
-var AssistantTextDeltaNotificationSchema = z6.object({
-  type: z6.literal("assistant_text_delta" /* ASSISTANT_TEXT_DELTA */),
-  messageId: z6.string(),
-  blockIndex: z6.number(),
-  textDelta: z6.string()
-}).passthrough();
-var ThinkingTextDeltaNotificationSchema = z6.object({
-  type: z6.literal("thinking_text_delta" /* THINKING_TEXT_DELTA */),
-  messageId: z6.string(),
-  blockIndex: z6.number(),
-  textDelta: z6.string()
-}).passthrough();
-var SessionTokenUsageChangedNotificationSchema = z6.object({
-  type: z6.literal("session_token_usage_changed" /* SESSION_TOKEN_USAGE_CHANGED */),
-  sessionId: z6.string(),
+var AssistantTextDeltaNotificationSchema = z7.object({
+  type: z7.literal("assistant_text_delta" /* ASSISTANT_TEXT_DELTA */),
+  messageId: z7.string(),
+  blockIndex: z7.number(),
+  textDelta: z7.string()
+}).passthrough();
+var ThinkingTextDeltaNotificationSchema = z7.object({
+  type: z7.literal("thinking_text_delta" /* THINKING_TEXT_DELTA */),
+  messageId: z7.string(),
+  blockIndex: z7.number(),
+  textDelta: z7.string()
+}).passthrough();
+var SessionTokenUsageChangedNotificationSchema = z7.object({
+  type: z7.literal("session_token_usage_changed" /* SESSION_TOKEN_USAGE_CHANGED */),
+  sessionId: z7.string(),
   tokenUsage: TokenUsageSchema
 }).passthrough();
-var MissionStateChangedNotificationSchema = z6.object({
-  type: z6.literal("mission_state_changed" /* MISSION_STATE_CHANGED */),
-  state: z6.nativeEnum(MissionState)
+var MissionStateChangedNotificationSchema = z7.object({
+  type: z7.literal("mission_state_changed" /* MISSION_STATE_CHANGED */),
+  state: z7.nativeEnum(MissionState)
 }).passthrough();
-var MissionFeaturesChangedNotificationSchema = z6.object({
-  type: z6.literal("mission_features_changed" /* MISSION_FEATURES_CHANGED */),
-  features: z6.array(MissionFeatureSchema)
+var MissionFeaturesChangedNotificationSchema = z7.object({
+  type: z7.literal("mission_features_changed" /* MISSION_FEATURES_CHANGED */),
+  features: z7.array(MissionFeatureSchema)
 }).passthrough();
-var MissionProgressEntryNotificationSchema = z6.object({
-  type: z6.literal("mission_progress_entry" /* MISSION_PROGRESS_ENTRY */),
-  progressLog: z6.array(ProgressLogEntrySchema)
+var MissionProgressEntryNotificationSchema = z7.object({
+  type: z7.literal("mission_progress_entry" /* MISSION_PROGRESS_ENTRY */),
+  progressLog: z7.array(ProgressLogEntrySchema)
 }).passthrough();
-var MissionHeartbeatNotificationSchema = z6.object({
-  type: z6.literal("mission_heartbeat" /* MISSION_HEARTBEAT */),
-  timestamp: z6.string()
+var MissionHeartbeatNotificationSchema = z7.object({
+  type: z7.literal("mission_heartbeat" /* MISSION_HEARTBEAT */),
+  timestamp: z7.string()
 }).passthrough();
-var MissionWorkerStartedNotificationSchema = z6.object({
-  type: z6.literal("mission_worker_started" /* MISSION_WORKER_STARTED */),
-  workerSessionId: z6.string()
+var MissionWorkerStartedNotificationSchema = z7.object({
+  type: z7.literal("mission_worker_started" /* MISSION_WORKER_STARTED */),
+  workerSessionId: z7.string()
 }).passthrough();
-var MissionWorkerCompletedNotificationSchema = z6.object({
-  type: z6.literal("mission_worker_completed" /* MISSION_WORKER_COMPLETED */),
-  workerSessionId: z6.string(),
-  exitCode: z6.number()
+var MissionWorkerCompletedNotificationSchema = z7.object({
+  type: z7.literal("mission_worker_completed" /* MISSION_WORKER_COMPLETED */),
+  workerSessionId: z7.string(),
+  exitCode: z7.number()
 }).passthrough();
-var McpAuthRequiredNotificationSchema = z6.object({
-  type: z6.literal("mcp_auth_required" /* MCP_AUTH_REQUIRED */),
-  serverName: z6.string(),
-  authUrl: z6.string(),
-  message: z6.string(),
-  state: z6.string()
+var McpAuthRequiredNotificationSchema = z7.object({
+  type: z7.literal("mcp_auth_required" /* MCP_AUTH_REQUIRED */),
+  serverName: z7.string(),
+  authUrl: z7.string(),
+  message: z7.string(),
+  state: z7.string()
 }).passthrough();
-var McpAuthCompletedNotificationSchema = z6.object({
-  type: z6.literal("mcp_auth_completed" /* MCP_AUTH_COMPLETED */),
-  serverName: z6.string(),
-  outcome: z6.nativeEnum(McpAuthOutcome),
-  message: z6.string()
+var McpAuthCompletedNotificationSchema = z7.object({
+  type: z7.literal("mcp_auth_completed" /* MCP_AUTH_COMPLETED */),
+  serverName: z7.string(),
+  outcome: z7.nativeEnum(McpAuthOutcome),
+  message: z7.string()
 }).passthrough();
 var SessionNotificationSchemaList = [
   ToolResultNotificationSchema,
@@ -1198,84 +1422,86 @@ var SessionNotificationSchemaList = [
   McpAuthRequiredNotificationSchema,
   McpAuthCompletedNotificationSchema
 ];
-var SessionNotificationPayloadSchema = z6.discriminatedUnion(
+var SessionNotificationPayloadSchema = z7.discriminatedUnion(
   "type",
   SessionNotificationSchemaList
 );
-var SessionNotificationParamsSchema = z6.object({
+var _SessionNotificationParamsSchema = z7.object({
   notification: SessionNotificationPayloadSchema
 }).passthrough();
-var SessionNotificationSchema = JsonRpcNotificationSchema.extend({
-  method: z6.literal("droid.session_notification" /* SESSION_NOTIFICATION */),
+var SessionNotificationParamsSchema = _SessionNotificationParamsSchema;
+var _SessionNotificationSchema = JsonRpcNotificationSchema.extend({
+  method: z7.literal("droid.session_notification" /* SESSION_NOTIFICATION */),
   params: SessionNotificationParamsSchema
 });
-var EditToolConfirmationDetailsSchema = z6.object({
-  type: z6.literal("edit" /* Edit */),
-  filePath: z6.string(),
-  fileName: z6.string(),
-  oldContent: z6.string().optional(),
-  newContent: z6.string().optional()
-}).passthrough();
-var ExecuteToolConfirmationDetailsSchema = z6.object({
-  type: z6.literal("exec" /* Execute */),
-  fullCommand: z6.string(),
-  command: z6.string(),
-  extractedCommands: z6.array(z6.string()).optional(),
-  impactLevel: z6.string().optional()
-}).passthrough();
-var CreateToolConfirmationDetailsSchema = z6.object({
-  type: z6.literal("create" /* Create */),
-  filePath: z6.string(),
-  fileName: z6.string(),
-  content: z6.string()
-}).passthrough();
-var AskUserQuestionSchema = z6.object({
-  index: z6.number(),
-  topic: z6.string(),
-  question: z6.string(),
-  options: z6.array(z6.string())
-}).passthrough();
-var AskUserConfirmationDetailsSchema = z6.object({
-  type: z6.literal("ask_user" /* AskUser */),
-  questionnaire: z6.string(),
-  parsed: z6.object({
-    questions: z6.array(AskUserQuestionSchema)
+var SessionNotificationSchema = _SessionNotificationSchema;
+var EditToolConfirmationDetailsSchema = z7.object({
+  type: z7.literal("edit" /* Edit */),
+  filePath: z7.string(),
+  fileName: z7.string(),
+  oldContent: z7.string().optional(),
+  newContent: z7.string().optional()
+}).passthrough();
+var ExecuteToolConfirmationDetailsSchema = z7.object({
+  type: z7.literal("exec" /* Execute */),
+  fullCommand: z7.string(),
+  command: z7.string(),
+  extractedCommands: z7.array(z7.string()).optional(),
+  impactLevel: z7.string().optional()
+}).passthrough();
+var CreateToolConfirmationDetailsSchema = z7.object({
+  type: z7.literal("create" /* Create */),
+  filePath: z7.string(),
+  fileName: z7.string(),
+  content: z7.string()
+}).passthrough();
+var AskUserQuestionSchema = z7.object({
+  index: z7.number(),
+  topic: z7.string(),
+  question: z7.string(),
+  options: z7.array(z7.string())
+}).passthrough();
+var AskUserConfirmationDetailsSchema = z7.object({
+  type: z7.literal("ask_user" /* AskUser */),
+  questionnaire: z7.string(),
+  parsed: z7.object({
+    questions: z7.array(AskUserQuestionSchema)
   }).optional(),
-  parseError: z6.object({
-    message: z6.string(),
-    line: z6.number().optional()
+  parseError: z7.object({
+    message: z7.string(),
+    line: z7.number().optional()
   }).optional()
 }).passthrough();
-var ExitSpecModeConfirmationDetailsSchema = z6.object({
-  type: z6.literal("exit_spec_mode" /* ExitSpecMode */),
-  plan: z6.string(),
-  title: z6.string().optional(),
-  optionNames: z6.array(z6.string()).optional()
-}).passthrough();
-var ProposeMissionConfirmationDetailsSchema = z6.object({
-  type: z6.literal("propose_mission" /* ProposeMission */),
-  proposal: z6.string(),
-  title: z6.string().optional()
-}).passthrough();
-var StartMissionRunConfirmationDetailsSchema = z6.object({
-  type: z6.literal("start_mission_run" /* StartMissionRun */),
-  runningMissionCount: z6.number(),
-  runningMissionSessionIds: z6.array(z6.string())
-}).passthrough();
-var ApplyPatchToolConfirmationDetailsSchema = z6.object({
-  type: z6.literal("apply_patch" /* ApplyPatch */),
-  filePath: z6.string(),
-  fileName: z6.string(),
-  patchContent: z6.string(),
-  oldContent: z6.string().optional(),
-  newContent: z6.string().optional()
-}).passthrough();
-var McpToolConfirmationDetailsSchema = z6.object({
-  type: z6.literal("mcp_tool" /* McpTool */),
-  toolName: z6.string(),
-  impactLevel: z6.string()
-}).passthrough();
-var ToolConfirmationDetailsSchema = z6.discriminatedUnion("type", [
+var ExitSpecModeConfirmationDetailsSchema = z7.object({
+  type: z7.literal("exit_spec_mode" /* ExitSpecMode */),
+  plan: z7.string(),
+  title: z7.string().optional(),
+  optionNames: z7.array(z7.string()).optional()
+}).passthrough();
+var ProposeMissionConfirmationDetailsSchema = z7.object({
+  type: z7.literal("propose_mission" /* ProposeMission */),
+  proposal: z7.string(),
+  title: z7.string().optional()
+}).passthrough();
+var StartMissionRunConfirmationDetailsSchema = z7.object({
+  type: z7.literal("start_mission_run" /* StartMissionRun */),
+  runningMissionCount: z7.number(),
+  runningMissionSessionIds: z7.array(z7.string())
+}).passthrough();
+var ApplyPatchToolConfirmationDetailsSchema = z7.object({
+  type: z7.literal("apply_patch" /* ApplyPatch */),
+  filePath: z7.string(),
+  fileName: z7.string(),
+  patchContent: z7.string(),
+  oldContent: z7.string().optional(),
+  newContent: z7.string().optional()
+}).passthrough();
+var McpToolConfirmationDetailsSchema = z7.object({
+  type: z7.literal("mcp_tool" /* McpTool */),
+  toolName: z7.string(),
+  impactLevel: z7.string()
+}).passthrough();
+var ToolConfirmationDetailsSchema = z7.discriminatedUnion("type", [
   EditToolConfirmationDetailsSchema,
   ExecuteToolConfirmationDetailsSchema,
   CreateToolConfirmationDetailsSchema,
@@ -1286,60 +1512,67 @@ var ToolConfirmationDetailsSchema = z6.discriminatedUnion("type", [
   ApplyPatchToolConfirmationDetailsSchema,
   McpToolConfirmationDetailsSchema
 ]);
-var ToolConfirmationInfoSchema = z6.object({
+var ToolConfirmationInfoSchema = z7.object({
   toolUse: ToolUseSchema,
-  confirmationType: z6.nativeEnum(ToolConfirmationType),
+  confirmationType: z7.nativeEnum(ToolConfirmationType),
   details: ToolConfirmationDetailsSchema
 }).passthrough();
-var RequestPermissionRequestParamsSchema = z6.object({
-  toolUses: z6.array(ToolConfirmationInfoSchema),
-  options: z6.array(ToolConfirmationListItemSchema)
+var RequestPermissionRequestParamsSchema = z7.object({
+  toolUses: z7.array(ToolConfirmationInfoSchema),
+  options: z7.array(ToolConfirmationListItemSchema)
 }).passthrough();
 var RequestPermissionRequestSchema = JsonRpcRequestSchema.extend({
-  method: z6.literal("droid.request_permission" /* REQUEST_PERMISSION */),
+  method: z7.literal("droid.request_permission" /* REQUEST_PERMISSION */),
   params: RequestPermissionRequestParamsSchema
 });
-var RequestPermissionResultSchema = z6.object({
-  selectedOption: z6.nativeEnum(ToolConfirmationOutcome)
+var RequestPermissionResultSchema = z7.object({
+  selectedOption: z7.nativeEnum(ToolConfirmationOutcome),
+  comment: z7.string().optional()
 }).strict();
-var RequestPermissionResponseSchema = z6.union([
+var RequestPermissionResponseSchema = z7.union([
   JsonRpcResponseSuccessSchema.extend({
     result: RequestPermissionResultSchema
   }),
   JsonRpcResponseFailureSchema
 ]);
-var AskUserRequestParamsSchema = z6.object({
-  toolCallId: z6.string(),
-  questions: z6.array(AskUserQuestionSchema)
+var AskUserRequestParamsSchema = z7.object({
+  toolCallId: z7.string(),
+  questions: z7.array(AskUserQuestionSchema)
 }).passthrough();
 var AskUserRequestSchema = JsonRpcRequestSchema.extend({
-  method: z6.literal("droid.ask_user" /* ASK_USER */),
+  method: z7.literal("droid.ask_user" /* ASK_USER */),
   params: AskUserRequestParamsSchema
 });
-var AskUserCollectedAnswerSchema = z6.object({
-  index: z6.number(),
-  question: z6.string(),
-  answer: z6.string()
+var AskUserCollectedAnswerSchema = z7.object({
+  index: z7.number(),
+  question: z7.string(),
+  answer: z7.string()
 }).strict();
-var AskUserResultSchema = z6.object({
-  cancelled: z6.boolean().optional(),
-  answers: z6.array(AskUserCollectedAnswerSchema)
+var AskUserResultSchema = z7.object({
+  cancelled: z7.boolean().optional(),
+  answers: z7.array(AskUserCollectedAnswerSchema)
 }).strict();
-var AskUserResponseSchema = z6.union([
+var AskUserResponseSchema = z7.union([
   JsonRpcResponseSuccessSchema.extend({ result: AskUserResultSchema }),
   JsonRpcResponseFailureSchema
 ]);
-var CliRequestOrNotificationSchema = z6.union([
+var _CliRequestOrNotificationSchema = z7.union([
   SessionNotificationSchema,
   RequestPermissionRequestSchema,
   AskUserRequestSchema
 ]);
+var CliRequestOrNotificationSchema = _CliRequestOrNotificationSchema;
+
+// src/constants.ts
+var SDK_VERSION = "0.2.0";
+var SDK_TAG = {
+  name: "sdk",
+  metadata: { language: "typescript", version: SDK_VERSION }
+};
 
 // src/errors.ts
 var ConnectionError = class _ConnectionError extends Error {
-  /** The working directory used when spawning the process. */
   cwd;
-  /** The executable path used when spawning the process. */
   execPath;
   constructor(message, options) {
     super(message);
@@ -1350,9 +1583,7 @@ var ConnectionError = class _ConnectionError extends Error {
   }
 };
 var ProtocolError = class _ProtocolError extends Error {
-  /** The JSON-RPC error code, if available. */
   code;
-  /** Additional error data from the JSON-RPC response. */
   data;
   constructor(message, options) {
     super(message);
@@ -1370,7 +1601,6 @@ var SessionError = class _SessionError extends Error {
   }
 };
 var SessionNotFoundError = class _SessionNotFoundError extends SessionError {
-  /** The ID of the session that was not found. */
   sessionId;
   constructor(sessionId) {
     super(`Session not found: ${sessionId}`);
@@ -1387,9 +1617,7 @@ var TimeoutError = class _TimeoutError extends Error {
   }
 };
 var ProcessExitError = class _ProcessExitError extends Error {
-  /** The exit code of the process, or null if terminated by signal. */
   exitCode;
-  /** The signal that terminated the process, or null if exited normally. */
   signal;
   constructor(message, options) {
     super(message);
@@ -1403,6 +1631,13 @@ var ProcessExitError = class _ProcessExitError extends Error {
 // src/transport.ts
 import { spawn } from "child_process";
 import * as readline from "readline";
+
+// src/utils.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// src/transport.ts
 var DEFAULT_EXEC_ARGS = [
   "exec",
   "--input-format",
@@ -1421,12 +1656,9 @@ var ProcessTransport = class {
   readlineInterface = null;
   messageHandler = null;
   errorHandler = null;
-  /**
-   * Sticky error from a process error or unexpected exit. Once set,
-   * all subsequent `send()` calls throw immediately.
-   */
+  /** Once set, all subsequent `send()` calls throw immediately. */
   processError = null;
-  /** Promise-chain serializer for stdin writes. */
+  /** Serializes stdin writes to prevent interleaving. */
   writeChain = Promise.resolve();
   _isConnected = false;
   isClosing = false;
@@ -1437,9 +1669,6 @@ var ProcessTransport = class {
     this.env = options.env;
     this.gracePeriodMs = (options.gracePeriod ?? DEFAULT_GRACE_PERIOD_MS / 1e3) * 1e3;
   }
-  // -----------------------------------------------------------------------
-  // DroidClientTransport interface
-  // -----------------------------------------------------------------------
   get isConnected() {
     return this._isConnected;
   }
@@ -1491,7 +1720,7 @@ var ProcessTransport = class {
       if (this.processError) {
         throw this.processError;
       }
-      await new Promise((resolve, reject) => {
+      await new Promise((resolve2, reject) => {
         if (!this.childProcess || !this.childProcess.stdin) {
           reject(
             new ConnectionError("Process stdin unavailable", {
@@ -1527,7 +1756,7 @@ var ProcessTransport = class {
               );
             }
           } else {
-            resolve();
+            resolve2();
           }
         });
       });
@@ -1552,7 +1781,7 @@ var ProcessTransport = class {
       this.readlineInterface = null;
     }
     if (proc && proc.exitCode === null && !proc.killed) {
-      await new Promise((resolve) => {
+      await new Promise((resolve2) => {
         const timeout = setTimeout(() => {
           if (proc.exitCode === null && !proc.killed) {
             try {
@@ -1563,7 +1792,7 @@ var ProcessTransport = class {
         }, this.gracePeriodMs);
         proc.once("exit", () => {
           clearTimeout(timeout);
-          resolve();
+          resolve2();
         });
         if (proc.stdin) {
           try {
@@ -1575,15 +1804,12 @@ var ProcessTransport = class {
           proc.kill("SIGTERM");
         } catch {
           clearTimeout(timeout);
-          resolve();
+          resolve2();
         }
       });
     }
     this.isClosing = false;
   }
-  // -----------------------------------------------------------------------
-  // Private helpers
-  // -----------------------------------------------------------------------
   setupHandlers() {
     const proc = this.childProcess;
     if (!proc || !proc.stdout) {
@@ -1598,10 +1824,10 @@ var ProcessTransport = class {
       if (!trimmed) {
         return;
       }
-      if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+      if (trimmed.startsWith("{")) {
         try {
           const parsed = JSON.parse(trimmed);
-          if (this.messageHandler && typeof parsed === "object" && parsed !== null) {
+          if (this.messageHandler && isRecord(parsed)) {
             this.messageHandler(parsed);
           }
         } catch {
@@ -1657,23 +1883,12 @@ import { v4 as uuidv4 } from "uuid";
 var ProtocolEngine = class {
   _transport;
   _defaultTimeout;
-  /** Pending requests keyed by UUID string. */
   _pendingRequests = /* @__PURE__ */ new Map();
-  /** Notification listener registry. */
   _notificationListeners = /* @__PURE__ */ new Set();
-  /** Server→client request handlers. */
   _permissionHandler = null;
   _askUserHandler = null;
-  /** Sticky transport error — once set, all requests fail immediately. */
   _transportError = null;
-  /** Closed flag — once true, new requests are rejected. */
   _closed = false;
-  /**
-   * Create a new ProtocolEngine.
-   *
-   * @param options.transport - A connected DroidClientTransport implementation.
-   * @param options.defaultTimeout - Default timeout in ms for sendRequest (default 30 000).
-   */
   constructor(options) {
     this._transport = options.transport;
     this._defaultTimeout = options.defaultTimeout ?? DEFAULT_REQUEST_TIMEOUT;
@@ -1684,25 +1899,6 @@ var ProtocolEngine = class {
       this._handleTransportError(error);
     });
   }
-  // ------------------------------------------------------------------
-  // Public API: Sending requests
-  // ------------------------------------------------------------------
-  /**
-   * Send a JSON-RPC request and wait for the response.
-   *
-   * Constructs the full envelope, registers a pending promise, sends
-   * via transport, and returns the parsed response `result` field.
-   *
-   * @param method - The RPC method name (e.g. `"droid.list_skills"`).
-   * @param params - Method parameters object.
-   * @param timeout - Timeout in ms. Defaults to `defaultTimeout`.
-   * @returns The `result` field from the JSON-RPC success response.
-   * @throws {ConnectionError} If the engine is closed.
-   * @throws {ConnectionError} If the transport has a sticky error.
-   * @throws {TimeoutError} If no response arrives within the timeout.
-   * @throws {ProtocolError} If the response contains a protocol error.
-   * @throws {SessionNotFoundError} If error code is ENTITY_NOT_FOUND.
-   */
   async sendRequest(method, params, timeout) {
     if (this._closed) {
       throw new ConnectionError("Protocol engine is closed");
@@ -1718,12 +1914,12 @@ var ProtocolEngine = class {
       jsonrpc: JSONRPC_VERSION,
       factoryApiVersion: LEGACY_FACTORY_API_VERSION,
       factoryProtocolVersion: FACTORY_PROTOCOL_VERSION,
-      type: "request",
+      type: "request" /* Request */,
       id: requestId,
       method,
       params
     };
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const timer = setTimeout(() => {
         this._pendingRequests.delete(requestId);
         reject(
@@ -1736,7 +1932,7 @@ var ProtocolEngine = class {
         method,
         requestId,
         params,
-        resolve,
+        resolve: resolve2,
         reject,
         timer
       };
@@ -1756,19 +1952,6 @@ var ProtocolEngine = class {
       }
     });
   }
-  // ------------------------------------------------------------------
-  // Public API: Notification listeners
-  // ------------------------------------------------------------------
-  /**
-   * Register a callback for incoming notification messages.
-   *
-   * Multiple listeners can be registered. Each receives the full
-   * parsed notification object.
-   *
-   * @param callback - Invoked with the notification object.
-   * @param filter - Optional filter to only receive specific notification types.
-   * @returns An unsubscribe function. Calling it again is safe (no-op).
-   */
   onNotification(callback, filter) {
     const listener = { callback, filter };
     this._notificationListeners.add(listener);
@@ -1780,23 +1963,9 @@ var ProtocolEngine = class {
       }
     };
   }
-  // ------------------------------------------------------------------
-  // Public API: Server→client request handlers
-  // ------------------------------------------------------------------
-  /**
-   * Register a handler for server→client permission requests.
-   *
-   * The handler receives the request params and should return a
-   * ToolConfirmationOutcome string value.
-   *
-   * Replaces any previously registered handler.
-   */
   setPermissionHandler(handler) {
     this._permissionHandler = handler;
   }
-  /**
-   * Remove the permission request handler (restores default Cancel).
-   */
   clearPermissionHandler() {
     this._permissionHandler = null;
   }
@@ -1811,31 +1980,12 @@ var ProtocolEngine = class {
   setAskUserHandler(handler) {
     this._askUserHandler = handler;
   }
-  /**
-   * Remove the ask-user request handler (restores default cancelled=true).
-   */
   clearAskUserHandler() {
     this._askUserHandler = null;
   }
-  // ------------------------------------------------------------------
-  // Public API: Health check
-  // ------------------------------------------------------------------
-  /**
-   * Whether the engine is in a healthy state — not closed and no
-   * sticky transport error.
-   */
   get isHealthy() {
     return !this._closed && this._transportError === null;
   }
-  // ------------------------------------------------------------------
-  // Public API: Close
-  // ------------------------------------------------------------------
-  /**
-   * Close the protocol engine.
-   *
-   * Rejects all pending requests, closes the transport, and prevents
-   * new requests. Idempotent — safe to call multiple times.
-   */
   async close() {
     if (this._closed) {
       return;
@@ -1850,38 +2000,25 @@ var ProtocolEngine = class {
     this._notificationListeners.clear();
     await this._transport.close();
   }
-  // ------------------------------------------------------------------
-  // Internal: Message handling
-  // ------------------------------------------------------------------
-  /**
-   * Handle an incoming parsed message from the transport.
-   * Dispatches to response handler, notification handler, or
-   * server→client request handler based on message type.
-   */
-  _handleMessage(parsed) {
-    const msgType = parsed["type"];
-    if (msgType === "response") {
-      this._handleResponse(parsed);
-    } else if (msgType === "notification") {
-      this._handleNotification(parsed);
-    } else if (msgType === "request") {
-      void this._handleServerRequest(parsed);
-    } else {
-      if ("result" in parsed || "error" in parsed) {
-        this._handleResponse(parsed);
-      } else if ("method" in parsed && !("id" in parsed)) {
-        this._handleNotification(parsed);
-      } else if ("method" in parsed && "id" in parsed) {
-        void this._handleServerRequest(parsed);
-      }
+  _handleMessage(raw) {
+    const parsed = JsonRpcMessageSchema.safeParse(raw);
+    if (!parsed.success) {
+      return;
+    }
+    const msg = parsed.data;
+    switch (msg.type) {
+      case "response" /* Response */:
+        this._handleResponse(msg.id, msg.result, msg.error);
+        break;
+      case "notification" /* Notification */:
+        this._handleNotification(msg);
+        break;
+      case "request" /* Request */:
+        void this._handleServerRequest(msg.method, msg.id, msg.params);
+        break;
     }
   }
-  /**
-   * Handle an incoming response message.
-   * Matches by ID to resolve the correct pending Promise.
-   */
-  _handleResponse(response) {
-    const responseId = response["id"];
+  _handleResponse(responseId, result, error) {
     if (responseId == null) {
       return;
     }
@@ -1891,32 +2028,29 @@ var ProtocolEngine = class {
     }
     this._pendingRequests.delete(responseId);
     clearTimeout(pending.timer);
-    const errorObj = response["error"];
-    if (errorObj != null && typeof errorObj === "object") {
-      const error = errorObj;
-      const code = error["code"];
-      const message = error["message"] ?? "Unknown error";
-      const data = error["data"];
-      if (code === -32004 /* ENTITY_NOT_FOUND */) {
+    if (error != null) {
+      if (error.code === -32004 /* ENTITY_NOT_FOUND */) {
         const sessionId = String(
           pending.params["sessionId"] ?? pending.requestId
         );
         pending.reject(new SessionNotFoundError(sessionId));
         return;
       }
-      pending.reject(new ProtocolError(message, { code, data }));
+      pending.reject(
+        new ProtocolError(error.message, { code: error.code, data: error.data })
+      );
       return;
     }
-    pending.resolve(response);
+    pending.resolve(result);
   }
-  /**
-   * Handle an incoming notification message.
-   * Dispatches to all registered notification listeners that match.
-   */
   _handleNotification(notification) {
-    const params = notification["params"];
-    const innerNotification = params?.["notification"];
-    const notificationType = innerNotification?.["type"];
+    let notificationType;
+    const parsed = SessionNotificationParamsSchema.safeParse(
+      notification["params"]
+    );
+    if (parsed.success) {
+      notificationType = parsed.data.notification.type;
+    }
     for (const listener of this._notificationListeners) {
       if (listener.filter?.type != null && listener.filter.type !== notificationType) {
         continue;
@@ -1927,32 +2061,32 @@ var ProtocolEngine = class {
       }
     }
   }
-  /**
-   * Handle an incoming server→client request.
-   * Dispatches to the appropriate handler based on the method field.
-   */
-  async _handleServerRequest(request) {
-    const method = request["method"];
-    const requestId = request["id"];
-    const params = request["params"] ?? {};
+  async _handleServerRequest(method, requestId, params) {
     if (method === "droid.request_permission" /* REQUEST_PERMISSION */) {
       await this._handlePermissionRequest(requestId, params);
     } else if (method === "droid.ask_user" /* ASK_USER */) {
       await this._handleAskUserRequest(requestId, params);
     }
   }
-  /**
-   * Handle droid.request_permission server→client request.
-   */
   async _handlePermissionRequest(requestId, params) {
     const handler = this._permissionHandler;
     if (handler == null) {
-      this._sendResponse(requestId, { selectedOption: "cancel" });
+      this._sendResponse(
+        requestId,
+        RequestPermissionResultSchema.parse({
+          selectedOption: "cancel" /* Cancel */
+        })
+      );
       return;
     }
     try {
-      const selectedOption = await Promise.resolve(handler(params));
-      this._sendResponse(requestId, { selectedOption });
+      const parsedParams = RequestPermissionRequestParamsSchema.parse(params);
+      const selection = await Promise.resolve(handler(parsedParams));
+      const result = typeof selection === "string" ? { selectedOption: selection } : selection;
+      this._sendResponse(
+        requestId,
+        RequestPermissionResultSchema.parse(result)
+      );
     } catch (exc) {
       const errorMessage = exc instanceof Error ? exc.message : String(exc);
       this._sendErrorResponse(
@@ -1963,18 +2097,19 @@ var ProtocolEngine = class {
       );
     }
   }
-  /**
-   * Handle droid.ask_user server→client request.
-   */
   async _handleAskUserRequest(requestId, params) {
     const handler = this._askUserHandler;
     if (handler == null) {
-      this._sendResponse(requestId, { cancelled: true, answers: [] });
+      this._sendResponse(
+        requestId,
+        AskUserResultSchema.parse({ cancelled: true, answers: [] })
+      );
       return;
     }
     try {
-      const result = await Promise.resolve(handler(params));
-      this._sendResponse(requestId, result);
+      const parsedParams = AskUserRequestParamsSchema.parse(params);
+      const result = await Promise.resolve(handler(parsedParams));
+      this._sendResponse(requestId, AskUserResultSchema.parse(result));
     } catch (exc) {
       const errorMessage = exc instanceof Error ? exc.message : String(exc);
       this._sendErrorResponse(
@@ -1985,9 +2120,6 @@ var ProtocolEngine = class {
       );
     }
   }
-  // ------------------------------------------------------------------
-  // Internal: Transport error handling
-  // ------------------------------------------------------------------
   /**
    * Handle a transport error.
    * Sets the sticky transport error and rejects all pending requests.
@@ -2001,29 +2133,17 @@ var ProtocolEngine = class {
     connectionError.cause = error;
     this._rejectAllPending(connectionError);
   }
-  // ------------------------------------------------------------------
-  // Internal: Response helpers
-  // ------------------------------------------------------------------
-  /**
-   * Send a JSON-RPC success response back to the server.
-   */
   _sendResponse(requestId, result) {
     const response = {
       jsonrpc: JSONRPC_VERSION,
       factoryApiVersion: LEGACY_FACTORY_API_VERSION,
       factoryProtocolVersion: FACTORY_PROTOCOL_VERSION,
-      type: "response",
+      type: "response" /* Response */,
       id: requestId,
       result
     };
-    try {
-      this._transport.send(response);
-    } catch {
-    }
+    this._sendBestEffort(response);
   }
-  /**
-   * Send a JSON-RPC error response back to the server.
-   */
   _sendErrorResponse(requestId, code, message, data) {
     const errorObj = { code, message };
     if (data !== void 0) {
@@ -2033,18 +2153,18 @@ var ProtocolEngine = class {
       jsonrpc: JSONRPC_VERSION,
       factoryApiVersion: LEGACY_FACTORY_API_VERSION,
       factoryProtocolVersion: FACTORY_PROTOCOL_VERSION,
-      type: "response",
+      type: "response" /* Response */,
       id: requestId,
       error: errorObj
     };
+    this._sendBestEffort(response);
+  }
+  _sendBestEffort(message) {
     try {
-      this._transport.send(response);
+      this._transport.send(message);
     } catch {
     }
   }
-  /**
-   * Reject all pending requests with the given error.
-   */
   _rejectAllPending(error) {
     const pending = new Map(this._pendingRequests);
     this._pendingRequests.clear();
@@ -2062,7 +2182,7 @@ var DroidClient = class {
   _closed = false;
   /**
    * Client-level notification listeners.
-   * Each entry is [callback, optional type filter string].
+   * Each entry is [callback, optional notification filter].
    */
   _notificationListeners = [];
   /** Client-level permission handler. */
@@ -2084,329 +2204,212 @@ var DroidClient = class {
       (params) => this._dispatchAskUserRequest(params)
     );
   }
-  // ------------------------------------------------------------------
-  // Properties
-  // ------------------------------------------------------------------
-  /**
-   * Current session ID, or `null` if no session is active.
-   */
+  async _rpc(method, params, schema, timeout) {
+    const raw = await this._engine.sendRequest(method, params, timeout);
+    return schema.parse(raw);
+  }
+  async _sessionRpc(method, params, schema, timeout) {
+    this._ensureNotClosed();
+    this._ensureSession();
+    return this._rpc(method, params, schema, timeout);
+  }
+  async _sessionRpcWithoutParams(method, schema, timeout) {
+    return this._sessionRpc(method, {}, schema, timeout);
+  }
   get sessionId() {
     return this._sessionId;
   }
-  /**
-   * Whether the client is in a healthy state — not closed and no
-   * transport errors have occurred. Returns false after transport
-   * disconnect/error.
-   */
   get isConnected() {
     return !this._closed && this._engine.isHealthy;
   }
-  // ------------------------------------------------------------------
-  // Session lifecycle methods
-  // ------------------------------------------------------------------
-  /**
-   * Initialize a new session.
-   *
-   * Sends `droid.initialize_session` with extended timeout. On success,
-   * stores the session ID internally and returns the typed result.
-   */
   async initializeSession(params) {
     this._ensureNotClosed();
-    const response = await this._engine.sendRequest(
+    const result = await this._rpc(
       "droid.initialize_session" /* INITIALIZE_SESSION */,
       params,
+      InitializeSessionResultSchema,
       SESSION_INIT_TIMEOUT
     );
-    const result = response["result"];
-    if (result) {
-      this._sessionId = result.sessionId;
-      return result;
-    }
-    if ("sessionId" in response) {
-      this._sessionId = response["sessionId"];
-      return response;
-    }
-    return response;
+    this._sessionId = result.sessionId;
+    return result;
   }
-  /**
-   * Load an existing session.
-   *
-   * Sends `droid.load_session`. SessionNotFoundError is thrown for
-   * non-existent sessions (mapped from ENTITY_NOT_FOUND by the protocol engine).
-   */
   async loadSession(params) {
     this._ensureNotClosed();
-    const response = await this._engine.sendRequest(
+    const result = await this._rpc(
       "droid.load_session" /* LOAD_SESSION */,
       params,
+      LoadSessionResultSchema,
       SESSION_INIT_TIMEOUT
     );
-    const result = response["result"];
-    if (result) {
-      this._sessionId = params.sessionId;
-      return result;
-    }
     this._sessionId = params.sessionId;
-    return response;
+    return result;
   }
-  /**
-   * Add a user message to the active session.
-   *
-   * Sends `droid.add_user_message` with text and optional images/files.
-   */
   async addUserMessage(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.add_user_message" /* ADD_USER_MESSAGE */,
-      params
+      params,
+      AddUserMessageResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Interrupt the current session.
-   *
-   * Sends `droid.interrupt_session` with empty params.
-   */
   async interruptSession() {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpcWithoutParams(
       "droid.interrupt_session" /* INTERRUPT_SESSION */,
-      {}
+      InterruptSessionResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Kill a worker session.
-   *
-   * Sends `droid.kill_worker_session`.
-   */
   async killWorkerSession(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.kill_worker_session" /* KILL_WORKER_SESSION */,
-      params
+      params,
+      KillWorkerSessionResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Update session settings.
-   *
-   * Sends `droid.update_session_settings` with the provided partial settings.
-   */
   async updateSessionSettings(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.update_session_settings" /* UPDATE_SESSION_SETTINGS */,
-      params
+      params,
+      UpdateSessionSettingsResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  // ------------------------------------------------------------------
-  // MCP methods
-  // ------------------------------------------------------------------
-  /**
-   * Toggle an MCP server on or off.
-   */
   async toggleMcpServer(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.toggle_mcp_server" /* TOGGLE_MCP_SERVER */,
-      params
+      params,
+      ToggleMcpServerResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Authenticate an MCP server (OAuth flow).
-   * Uses extended timeout (300s) since OAuth requires user interaction.
-   */
   async authenticateMcpServer(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.authenticate_mcp_server" /* AUTHENTICATE_MCP_SERVER */,
       params,
+      AuthenticateMcpServerResultSchema,
       MCP_AUTH_TIMEOUT
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Cancel an in-progress MCP authentication.
-   */
   async cancelMcpAuth(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.cancel_mcp_auth" /* CANCEL_MCP_AUTH */,
-      params
+      params,
+      CancelMcpAuthResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Clear stored MCP authentication tokens.
-   */
   async clearMcpAuth(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.clear_mcp_auth" /* CLEAR_MCP_AUTH */,
-      params
+      params,
+      ClearMcpAuthResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Submit an MCP authentication code (OAuth callback).
-   */
   async submitMcpAuthCode(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.submit_mcp_auth_code" /* SUBMIT_MCP_AUTH_CODE */,
-      params
+      params,
+      SubmitMcpAuthCodeResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Add an MCP server.
-   */
   async addMcpServer(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.add_mcp_server" /* ADD_MCP_SERVER */,
-      params
+      params,
+      AddMcpServerResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Remove an MCP server.
-   */
   async removeMcpServer(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.remove_mcp_server" /* REMOVE_MCP_SERVER */,
-      params
+      params,
+      RemoveMcpServerResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * List available MCP registry servers.
-   */
   async listMcpRegistry() {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpcWithoutParams(
       "droid.list_mcp_registry" /* LIST_MCP_REGISTRY */,
-      {}
+      ListMcpRegistryResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * List available MCP tools.
-   */
   async listMcpTools() {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpcWithoutParams(
       "droid.list_mcp_tools" /* LIST_MCP_TOOLS */,
-      {}
+      ListMcpToolsResultSchema
+    );
+  }
+  async listTools(params = {}) {
+    return this._sessionRpc(
+      "droid.list_tools" /* LIST_TOOLS */,
+      params,
+      ListToolsResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * List MCP servers with status and summary.
-   */
   async listMcpServers() {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpcWithoutParams(
       "droid.list_mcp_servers" /* LIST_MCP_SERVERS */,
-      {}
+      ListMcpServersResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Toggle an MCP tool on or off.
-   */
   async toggleMcpTool(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.toggle_mcp_tool" /* TOGGLE_MCP_TOOL */,
-      params
+      params,
+      ToggleMcpToolResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  // ------------------------------------------------------------------
-  // Skills and bug report methods
-  // ------------------------------------------------------------------
-  /**
-   * List available skills.
-   */
   async listSkills() {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpcWithoutParams(
       "droid.list_skills" /* LIST_SKILLS */,
-      {}
+      ListSkillsResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  /**
-   * Submit a bug report.
-   */
   async submitBugReport(params) {
-    this._ensureNotClosed();
-    this._ensureSession();
-    const response = await this._engine.sendRequest(
+    return this._sessionRpc(
       "droid.submit_bug_report" /* SUBMIT_BUG_REPORT */,
-      params
+      params,
+      SubmitBugReportResultSchema
+    );
+  }
+  async getRewindInfo(params) {
+    return this._sessionRpc(
+      "droid.get_rewind_info" /* GET_REWIND_INFO */,
+      params,
+      GetRewindInfoResultSchema
+    );
+  }
+  async executeRewind(params) {
+    return this._sessionRpc(
+      "droid.execute_rewind" /* EXECUTE_REWIND */,
+      params,
+      ExecuteRewindResultSchema,
+      REWIND_TIMEOUT
+    );
+  }
+  async compactSession(params) {
+    return this._sessionRpc(
+      "droid.compact_session" /* COMPACT_SESSION */,
+      params,
+      CompactSessionResultSchema,
+      COMPACTION_TIMEOUT
+    );
+  }
+  async forkSession() {
+    return this._sessionRpcWithoutParams(
+      "droid.fork_session" /* FORK_SESSION */,
+      ForkSessionResultSchema
+    );
+  }
+  async getContextStats() {
+    return this._sessionRpcWithoutParams(
+      "droid.get_context_stats" /* GET_CONTEXT_STATS */,
+      GetContextStatsResultSchema
+    );
+  }
+  async renameSession(params) {
+    return this._sessionRpc(
+      "droid.rename_session" /* RENAME_SESSION */,
+      params,
+      RenameSessionResultSchema
     );
-    const result = response["result"];
-    return result ?? response;
   }
-  // ------------------------------------------------------------------
-  // Notification subscription
-  // ------------------------------------------------------------------
-  /**
-   * Register a callback for incoming notification messages.
-   *
-   * Multiple listeners can be registered. Each receives the full parsed
-   * notification object. Optionally filter by notification type.
-   *
-   * Listener exceptions are isolated — if one raises, others still receive
-   * the event and the engine continues.
-   *
-   * @param callback - Invoked with the notification object.
-   * @param filter - Optional filter to only receive specific notification types.
-   * @returns An unsubscribe function. Calling it again is safe (no-op).
-   */
   onNotification(callback, filter) {
-    const entry = {
-      callback,
-      typeFilter: filter?.type
-    };
+    const entry = { callback, filter };
     this._notificationListeners.push(entry);
     let unsubscribed = false;
     return () => {
@@ -2419,54 +2422,18 @@ var DroidClient = class {
       }
     };
   }
-  // ------------------------------------------------------------------
-  // Permission/ask-user handler registration
-  // ------------------------------------------------------------------
-  /**
-   * Register a handler for server→client permission requests.
-   *
-   * The handler receives the request params and should return a
-   * ToolConfirmationOutcome string value. Async handlers are awaited.
-   * Replaces any previously registered handler.
-   */
   setPermissionHandler(handler) {
     this._permissionHandler = handler;
   }
-  /**
-   * Remove the permission request handler.
-   * Restores default behavior: return "cancel".
-   */
   clearPermissionHandler() {
     this._permissionHandler = null;
   }
-  /**
-   * Register a handler for server→client ask-user requests.
-   *
-   * The handler receives the request params and should return a result
-   * object with `cancelled` and `answers` keys. Async handlers are awaited.
-   * Replaces any previously registered handler.
-   */
   setAskUserHandler(handler) {
     this._askUserHandler = handler;
   }
-  /**
-   * Remove the ask-user request handler.
-   * Restores default behavior: return `{ cancelled: true, answers: [] }`.
-   */
   clearAskUserHandler() {
     this._askUserHandler = null;
   }
-  // ------------------------------------------------------------------
-  // Lifecycle
-  // ------------------------------------------------------------------
-  /**
-   * Close the client and release all resources.
-   *
-   * Rejects pending requests, clears handlers and listeners, and closes
-   * the protocol engine. Idempotent — safe to call multiple times.
-   *
-   * After close, all method calls throw ConnectionError immediately.
-   */
   async close() {
     if (this._closed) {
       return;
@@ -2477,21 +2444,17 @@ var DroidClient = class {
     this._askUserHandler = null;
     await this._engine.close();
   }
-  // ------------------------------------------------------------------
-  // Internal: dispatch methods
-  // ------------------------------------------------------------------
-  /**
-   * Dispatch a notification to all registered client-level listeners.
-   * Filters by notification type if a type filter is set.
-   * Exception in one listener does not affect others.
-   */
   _dispatchNotification(notification) {
-    const params = notification["params"];
-    const innerNotification = params?.["notification"];
-    const notificationType = innerNotification?.["type"];
+    let notificationType;
+    const parsed = SessionNotificationParamsSchema.safeParse(
+      notification["params"]
+    );
+    if (parsed.success) {
+      notificationType = parsed.data.notification.type;
+    }
     const listeners = [...this._notificationListeners];
     for (const listener of listeners) {
-      if (listener.typeFilter != null && listener.typeFilter !== notificationType) {
+      if (listener.filter?.type != null && listener.filter.type !== notificationType) {
         continue;
       }
       try {
@@ -2500,25 +2463,13 @@ var DroidClient = class {
       }
     }
   }
-  /**
-   * Dispatch to the client-level permission handler.
-   * If no handler is set, returns the default "cancel" outcome.
-   * If handler throws, the error propagates to the protocol engine
-   * which sends an error response.
-   */
   _dispatchPermissionRequest(params) {
     const handler = this._permissionHandler;
     if (handler == null) {
-      return "cancel";
+      return "cancel" /* Cancel */;
     }
     return handler(params);
   }
-  /**
-   * Dispatch to the client-level ask-user handler.
-   * If no handler is set, returns the default cancelled response.
-   * If handler throws, the error propagates to the protocol engine
-   * which sends an error response.
-   */
   _dispatchAskUserRequest(params) {
     const handler = this._askUserHandler;
     if (handler == null) {
@@ -2526,12 +2477,6 @@ var DroidClient = class {
     }
     return handler(params);
   }
-  // ------------------------------------------------------------------
-  // Internal: guards
-  // ------------------------------------------------------------------
-  /**
-   * Throw ConnectionError if the client has been closed.
-   */
   _ensureNotClosed() {
     if (this._closed) {
       throw new ConnectionError(
@@ -2539,9 +2484,6 @@ var DroidClient = class {
       );
     }
   }
-  /**
-   * Throw SessionError if no active session.
-   */
   _ensureSession() {
     if (this._sessionId == null) {
       throw new SessionError(
@@ -2552,26 +2494,56 @@ var DroidClient = class {
 };
 
 // src/stream.ts
-function convertNotificationToStreamMessage(notification) {
+var DroidMessageType = {
+  AssistantTextDelta: "assistant_text_delta",
+  ThinkingTextDelta: "thinking_text_delta",
+  ToolUse: "tool_use",
+  ToolResult: "tool_result",
+  ToolProgress: "tool_progress",
+  WorkingStateChanged: "working_state_changed",
+  TokenUsageUpdate: "token_usage_update",
+  CreateMessage: "create_message",
+  PermissionResolved: "permission_resolved",
+  SettingsUpdated: "settings_updated",
+  SessionTitleUpdated: "session_title_updated",
+  McpStatusChanged: "mcp_status_changed",
+  MissionStateChanged: "mission_state_changed",
+  MissionFeaturesChanged: "mission_features_changed",
+  MissionProgressEntry: "mission_progress_entry",
+  MissionHeartbeat: "mission_heartbeat",
+  MissionWorkerStarted: "mission_worker_started",
+  MissionWorkerCompleted: "mission_worker_completed",
+  McpAuthRequired: "mcp_auth_required",
+  McpAuthCompleted: "mcp_auth_completed",
+  Error: "error",
+  TurnComplete: "turn_complete"
+};
+function convertNotificationToStreamMessage(raw) {
+  const parsed = SessionNotificationPayloadSchema.safeParse(raw);
+  if (!parsed.success) {
+    return null;
+  }
+  const notification = parsed.data;
   switch (notification.type) {
     case "assistant_text_delta" /* ASSISTANT_TEXT_DELTA */:
       return {
-        type: "assistant_text_delta",
+        type: DroidMessageType.AssistantTextDelta,
         messageId: notification.messageId,
         blockIndex: notification.blockIndex,
         text: notification.textDelta
       };
     case "thinking_text_delta" /* THINKING_TEXT_DELTA */:
       return {
-        type: "thinking_text_delta",
+        type: DroidMessageType.ThinkingTextDelta,
         messageId: notification.messageId,
         blockIndex: notification.blockIndex,
         text: notification.textDelta
       };
     case "tool_result" /* TOOL_RESULT */:
       return {
-        type: "tool_result",
+        type: DroidMessageType.ToolResult,
         toolUseId: notification.toolUseId,
+        toolName: "",
         content: normalizeToolResultContent(notification.content),
         isError: Boolean(notification.isError)
       };
@@ -2579,7 +2551,7 @@ function convertNotificationToStreamMessage(notification) {
       const update = notification.update;
       const text = update?.text ?? update?.status ?? update?.details ?? "";
       return {
-        type: "tool_progress",
+        type: DroidMessageType.ToolProgress,
         toolUseId: notification.toolUseId,
         toolName: notification.toolName,
         content: text,
@@ -2588,108 +2560,106 @@ function convertNotificationToStreamMessage(notification) {
     }
     case "droid_working_state_changed" /* DROID_WORKING_STATE_CHANGED */:
       return {
-        type: "working_state_changed",
+        type: DroidMessageType.WorkingStateChanged,
         state: notification.newState
       };
     case "session_token_usage_changed" /* SESSION_TOKEN_USAGE_CHANGED */: {
       const tu = notification.tokenUsage;
       return {
-        type: "token_usage_update",
+        type: DroidMessageType.TokenUsageUpdate,
         inputTokens: tu.inputTokens,
         outputTokens: tu.outputTokens,
         cacheReadTokens: tu.cacheReadTokens,
-        cacheWriteTokens: tu.cacheCreationTokens,
+        cacheCreationTokens: tu.cacheCreationTokens,
         thinkingTokens: tu.thinkingTokens
       };
     }
     case "create_message" /* CREATE_MESSAGE */: {
       const msg = notification.message;
       const messages = [];
-      if (msg.content && Array.isArray(msg.content)) {
-        for (const block of msg.content) {
-          if (block.type === "tool_use") {
-            messages.push({
-              type: "tool_use",
-              toolName: block.name,
-              toolInput: block.input ?? {},
-              toolUseId: block.id
-            });
-          }
+      for (const block of msg.content) {
+        if (block.type === DroidMessageType.ToolUse) {
+          messages.push({
+            type: DroidMessageType.ToolUse,
+            toolName: block.name,
+            toolInput: block.input,
+            toolUseId: block.id
+          });
         }
       }
       messages.push({
-        type: "create_message",
+        type: DroidMessageType.CreateMessage,
         messageId: msg.id,
         role: msg.role,
-        content: msg.content ?? [],
+        content: msg.content,
         parentId: notification.parentId
       });
       return messages;
     }
     case "error" /* ERROR */:
       return {
-        type: "error",
+        type: DroidMessageType.Error,
         message: notification.message,
         errorType: notification.errorType,
         timestamp: notification.timestamp
       };
     case "permission_resolved" /* PERMISSION_RESOLVED */:
       return {
-        type: "permission_resolved",
+        type: DroidMessageType.PermissionResolved,
         requestId: notification.requestId,
         toolUseIds: notification.toolUseIds,
         selectedOption: notification.selectedOption
       };
     case "settings_updated" /* SETTINGS_UPDATED */:
       return {
-        type: "settings_updated",
+        type: DroidMessageType.SettingsUpdated,
         settings: notification.settings
       };
     case "session_title_updated" /* SESSION_TITLE_UPDATED */:
       return {
-        type: "session_title_updated",
+        type: DroidMessageType.SessionTitleUpdated,
         title: notification.title
       };
     case "mcp_status_changed" /* MCP_STATUS_CHANGED */:
       return {
-        type: "mcp_status_changed",
+        type: DroidMessageType.McpStatusChanged,
         servers: notification.servers,
         summary: notification.summary
       };
     case "mission_state_changed" /* MISSION_STATE_CHANGED */:
       return {
-        type: "mission_state_changed",
+        type: DroidMessageType.MissionStateChanged,
         state: notification.state
       };
     case "mission_features_changed" /* MISSION_FEATURES_CHANGED */:
       return {
-        type: "mission_features_changed",
+        type: DroidMessageType.MissionFeaturesChanged,
         features: notification.features
       };
     case "mission_progress_entry" /* MISSION_PROGRESS_ENTRY */:
       return {
-        type: "mission_progress_entry",
+        type: DroidMessageType.MissionProgressEntry,
         progressLog: notification.progressLog
       };
     case "mission_heartbeat" /* MISSION_HEARTBEAT */:
       return {
-        type: "mission_heartbeat",
+        type: DroidMessageType.MissionHeartbeat,
         timestamp: notification.timestamp
       };
     case "mission_worker_started" /* MISSION_WORKER_STARTED */:
       return {
-        type: "mission_worker_started",
+        type: DroidMessageType.MissionWorkerStarted,
         workerSessionId: notification.workerSessionId
       };
     case "mission_worker_completed" /* MISSION_WORKER_COMPLETED */:
       return {
-        type: "mission_worker_completed",
+        type: DroidMessageType.MissionWorkerCompleted,
         workerSessionId: notification.workerSessionId,
         exitCode: notification.exitCode
       };
     case "mcp_auth_required" /* MCP_AUTH_REQUIRED */:
       return {
-        type: "mcp_auth_required",
+        type: DroidMessageType.McpAuthRequired,
         serverName: notification.serverName,
         authUrl: notification.authUrl,
         message: notification.message,
@@ -2697,54 +2667,45 @@ function convertNotificationToStreamMessage(notification) {
       };
     case "mcp_auth_completed" /* MCP_AUTH_COMPLETED */:
       return {
-        type: "mcp_auth_completed",
+        type: DroidMessageType.McpAuthCompleted,
         serverName: notification.serverName,
         outcome: notification.outcome,
         message: notification.message
       };
     default:
-      console.warn(
-        `[droid-sdk] Unknown notification type: ${String(notification.type)}`
-      );
       return null;
   }
 }
 var StreamStateTracker = class {
-  /** Whether we have ever seen a non-idle state. */
   hasBeenNonIdle = false;
-  /** Last-seen token usage update (to attach to TurnComplete). */
   lastTokenUsage = null;
-  /**
-   * Process a DroidMessage and return any additional messages that should be
-   * emitted (e.g. TurnComplete sentinel).
-   *
-   * @param message - The DroidMessage to process.
-   * @returns An array of additional messages to emit (may be empty).
-   */
+  toolNameMap = /* @__PURE__ */ new Map();
+  getToolName(toolUseId) {
+    return this.toolNameMap.get(toolUseId) ?? "";
+  }
   processMessage(message) {
     const additional = [];
-    if (message.type === "token_usage_update") {
+    if (message.type === DroidMessageType.ToolUse) {
+      this.toolNameMap.set(message.toolUseId, message.toolName);
+    }
+    if (message.type === DroidMessageType.ToolResult) {
+      message = { ...message, toolName: this.getToolName(message.toolUseId) };
+    }
+    if (message.type === DroidMessageType.TokenUsageUpdate) {
       this.lastTokenUsage = message;
     }
-    if (message.type === "working_state_changed") {
+    if (message.type === DroidMessageType.WorkingStateChanged) {
       if (message.state !== "idle" /* Idle */) {
         this.hasBeenNonIdle = true;
       } else if (this.hasBeenNonIdle) {
         additional.push({
-          type: "turn_complete",
+          type: DroidMessageType.TurnComplete,
           tokenUsage: this.lastTokenUsage
         });
         this.hasBeenNonIdle = false;
       }
     }
-    return additional;
-  }
-  /**
-   * Reset the tracker for a new turn/stream call.
-   */
-  reset() {
-    this.hasBeenNonIdle = false;
-    this.lastTokenUsage = null;
+    return { message, additional };
   }
 };
 function normalizeToolResultContent(content) {
@@ -2760,124 +2721,469 @@ function normalizeToolResultContent(content) {
   return String(content);
 }
 
-// src/query.ts
-function query(options) {
-  let transport = null;
-  let client = null;
-  let sessionId = null;
-  let aborted = false;
-  const messageQueue = [];
-  let resolveWaiting = null;
-  let streamDone = false;
-  function enqueueMessage(msg) {
-    messageQueue.push(msg);
-    if (resolveWaiting) {
-      const resolve = resolveWaiting;
-      resolveWaiting = null;
-      resolve();
-    }
+// src/helpers.ts
+function wireAbortSignal(signal, onAbort) {
+  if (!signal) return () => {
+  };
+  if (signal.aborted) {
+    onAbort();
+    return () => {
+    };
+  } else {
+    const listener = () => onAbort();
+    signal.addEventListener("abort", listener, { once: true });
+    return () => signal.removeEventListener("abort", listener);
   }
-  function signalDone() {
-    streamDone = true;
-    if (resolveWaiting) {
-      const resolve = resolveWaiting;
-      resolveWaiting = null;
-      resolve();
+}
+function extractInnerNotification(notification) {
+  const parsed = SessionNotificationSchema.safeParse(notification);
+  return parsed.success ? parsed.data.params.notification : null;
+}
+var MessageBridge = class {
+  _queue = [];
+  _resolveWaiting = null;
+  _done = false;
+  _stateTracker = new StreamStateTracker();
+  notificationHandler = (notification) => {
+    const inner = extractInnerNotification(notification);
+    if (!inner) return;
+    const converted = convertNotificationToStreamMessage(inner);
+    if (converted === null) return;
+    const messages = Array.isArray(converted) ? converted : [converted];
+    for (const msg of messages) {
+      const { message, additional } = this._stateTracker.processMessage(msg);
+      this._enqueue(message);
+      for (const extra of additional) {
+        this._enqueue(extra);
+        if (extra.type === DroidMessageType.TurnComplete) {
+          this._signalDone();
+        }
+      }
     }
-  }
-  async function* generateMessages() {
-    if (options.transport) {
-      transport = options.transport;
-    } else {
-      const transportOptions = {
-        execPath: options.execPath,
-        execArgs: options.execArgs,
-        cwd: options.cwd,
-        env: options.env
-      };
-      const processTransport = new ProcessTransport(transportOptions);
-      await processTransport.connect();
-      transport = processTransport;
-    }
-    client = new DroidClient({ transport });
-    if (options.permissionHandler) {
-      client.setPermissionHandler(options.permissionHandler);
-    }
-    if (options.askUserHandler) {
-      client.setAskUserHandler(options.askUserHandler);
-    }
-    const stateTracker = new StreamStateTracker();
-    client.onNotification((notification) => {
-      const params = notification["params"];
-      const innerNotification = params?.["notification"];
-      if (!innerNotification) {
-        return;
+  };
+  signalDone() {
+    this._signalDone();
+  }
+  async *messages() {
+    while (true) {
+      while (this._queue.length > 0) {
+        const msg = this._queue.shift();
+        yield msg;
+        if (msg.type === DroidMessageType.TurnComplete) {
+          return;
+        }
       }
-      const converted = convertNotificationToStreamMessage(
-        innerNotification
-      );
-      if (converted === null) {
+      if (this._done && this._queue.length === 0) {
         return;
       }
-      const messages = Array.isArray(converted) ? converted : [converted];
-      for (const msg of messages) {
-        enqueueMessage(msg);
-        const additional = stateTracker.processMessage(msg);
-        for (const extra of additional) {
-          enqueueMessage(extra);
-          if (extra.type === "turn_complete") {
-            signalDone();
-          }
-        }
-      }
-    });
-    const initParams = {
-      machineId: options.machineId ?? "default",
-      cwd: options.cwd ?? "."
+      await new Promise((resolve2) => {
+        this._resolveWaiting = resolve2;
+      });
+    }
+  }
+  _enqueue(msg) {
+    this._queue.push(msg);
+    if (this._resolveWaiting) {
+      const resolve2 = this._resolveWaiting;
+      this._resolveWaiting = null;
+      resolve2();
+    }
+  }
+  _signalDone() {
+    this._done = true;
+    if (this._resolveWaiting) {
+      const resolve2 = this._resolveWaiting;
+      this._resolveWaiting = null;
+      resolve2();
+    }
+  }
+};
+async function createTransport(options) {
+  if (options.transport) {
+    return options.transport;
+  }
+  const transportOptions = {
+    execPath: options.execPath,
+    execArgs: options.execArgs,
+    cwd: options.cwd,
+    env: options.env
+  };
+  const processTransport = new ProcessTransport(transportOptions);
+  await processTransport.connect();
+  return processTransport;
+}
+function setupClientHandlers(client, options) {
+  if (options.permissionHandler) {
+    client.setPermissionHandler(options.permissionHandler);
+  }
+  if (options.askUserHandler) {
+    client.setAskUserHandler(options.askUserHandler);
+  }
+}
+async function createConfiguredClient(options) {
+  const transport = await createTransport(options);
+  const client = new DroidClient({ transport });
+  setupClientHandlers(client, options);
+  return { transport, client };
+}
+async function closeQuietly(resource) {
+  if (!resource) {
+    return;
+  }
+  try {
+    await resource.close();
+  } catch {
+  }
+}
+function buildInitParams(options) {
+  return {
+    machineId: options.machineId ?? "default",
+    cwd: options.cwd ?? ".",
+    ...options.modelId !== void 0 && { modelId: options.modelId },
+    ...options.autonomyLevel !== void 0 && {
+      autonomyLevel: options.autonomyLevel
+    },
+    ...options.interactionMode !== void 0 && {
+      interactionMode: options.interactionMode
+    },
+    ...options.reasoningEffort !== void 0 && {
+      reasoningEffort: options.reasoningEffort
+    },
+    ...options.specModeModelId !== void 0 && {
+      specModeModelId: options.specModeModelId
+    },
+    ...options.specModeReasoningEffort !== void 0 && {
+      specModeReasoningEffort: options.specModeReasoningEffort
+    },
+    ...options.mcpServers !== void 0 && {
+      mcpServers: options.mcpServers
+    },
+    ...options.enabledToolIds !== void 0 && {
+      enabledToolIds: options.enabledToolIds
+    },
+    ...options.disabledToolIds !== void 0 && {
+      disabledToolIds: options.disabledToolIds
+    },
+    tags: [...options.tags ?? [], SDK_TAG]
+  };
+}
+
+// src/mcp.ts
+import { once } from "events";
+import http from "http";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { z as z8 } from "zod";
+function tool(name, description, inputSchemaOrHandler, handler) {
+  if (typeof inputSchemaOrHandler === "function") {
+    const actualHandler = inputSchemaOrHandler;
+    return {
+      name,
+      description,
+      handler: (input) => actualHandler(input)
     };
-    if (options.modelId !== void 0) {
-      initParams.modelId = options.modelId;
+  }
+  if (!handler) {
+    throw new Error(`Missing handler for SDK MCP tool "${name}"`);
+  }
+  const inputObjectSchema = z8.object(inputSchemaOrHandler);
+  return {
+    name,
+    description,
+    inputSchema: inputSchemaOrHandler,
+    handler: (input) => handler(inputObjectSchema.parse(input))
+  };
+}
+function isSdkMcpServer(server) {
+  return server instanceof SdkMcpServer;
+}
+function toCallToolResult(result) {
+  if (typeof result === "string") {
+    return {
+      content: [{ type: "text", text: result }]
+    };
+  }
+  return result;
+}
+async function readJsonBody(req) {
+  const chunks = [];
+  for await (const chunk of req) {
+    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+  }
+  if (chunks.length === 0) {
+    return void 0;
+  }
+  return JSON.parse(Buffer.concat(chunks).toString("utf8"));
+}
+function writeJsonError(res, statusCode, message) {
+  if (res.headersSent) {
+    return;
+  }
+  res.writeHead(statusCode, { "content-type": "application/json" });
+  res.end(
+    JSON.stringify({
+      jsonrpc: JSONRPC_VERSION,
+      error: { code: -32603 /* INTERNAL_ERROR */, message },
+      id: null
+    })
+  );
+}
+var SdkMcpServer = class {
+  name;
+  version;
+  tools;
+  _httpServer = null;
+  _url = null;
+  constructor(options) {
+    this.name = options.name;
+    this.version = options.version ?? "1.0.0";
+    this.tools = options.tools;
+  }
+  get config() {
+    if (!this._url) {
+      return null;
     }
-    if (options.autonomyLevel !== void 0) {
-      initParams.autonomyLevel = options.autonomyLevel;
+    return {
+      type: "http" /* Http */,
+      name: this.name,
+      url: this._url,
+      headers: []
+    };
+  }
+  async start() {
+    if (this.config) {
+      return this.config;
     }
-    if (options.interactionMode !== void 0) {
-      initParams.interactionMode = options.interactionMode;
+    this._httpServer = http.createServer((req, res) => {
+      void this.handleRequest(req, res);
+    });
+    this._httpServer.listen(0, "127.0.0.1");
+    await once(this._httpServer, "listening");
+    const address = this._httpServer.address();
+    if (!address || typeof address === "string") {
+      throw new Error("Unable to determine SDK MCP server address");
     }
-    if (options.reasoningEffort !== void 0) {
-      initParams.reasoningEffort = options.reasoningEffort;
+    this._url = `http://127.0.0.1:${address.port}/mcp`;
+    const config = this.config;
+    if (!config) {
+      throw new Error("Unable to start SDK MCP server");
     }
-    if (options.mcpServers !== void 0) {
-      initParams.mcpServers = options.mcpServers;
+    return config;
+  }
+  async close() {
+    const server = this._httpServer;
+    this._httpServer = null;
+    this._url = null;
+    if (!server) {
+      return;
     }
-    if (options.enabledToolIds !== void 0) {
-      initParams.enabledToolIds = options.enabledToolIds;
+    server.closeAllConnections?.();
+    server.close();
+    await once(server, "close");
+  }
+  createMcpServer() {
+    const server = new McpServer({
+      name: this.name,
+      version: this.version
+    });
+    for (const sdkTool of this.tools) {
+      server.registerTool(
+        sdkTool.name,
+        {
+          description: sdkTool.description,
+          ...sdkTool.inputSchema && {
+            inputSchema: sdkTool.inputSchema
+          }
+        },
+        async (input) => toCallToolResult(await sdkTool.handler(input))
+      );
     }
-    const initResult = await client.initializeSession(
-      initParams
-    );
-    sessionId = initResult.sessionId;
-    await client.addUserMessage({ text: options.prompt });
+    return server;
+  }
+  async handleRequest(req, res) {
+    if (req.url !== "/mcp") {
+      res.writeHead(404).end();
+      return;
+    }
+    if (req.method !== "POST") {
+      res.writeHead(405).end();
+      return;
+    }
+    const server = this.createMcpServer();
+    const transport = new StreamableHTTPServerTransport({
+      sessionIdGenerator: void 0
+    });
+    res.on("close", () => {
+      void transport.close();
+      void server.close();
+    });
     try {
-      while (true) {
+      const body = await readJsonBody(req);
+      await server.connect(transport);
+      await transport.handleRequest(req, res, body);
+    } catch (error) {
+      writeJsonError(
+        res,
+        500,
+        error instanceof Error ? error.message : "Internal server error"
+      );
+      await transport.close();
+      await server.close();
+    }
+  }
+};
+function createSdkMcpServer(options) {
+  return new SdkMcpServer(options);
+}
+async function startSdkMcpServers(servers) {
+  if (!servers) {
+    return { cleanup: async () => {
+    } };
+  }
+  const startedServers = [];
+  const mcpServers = [];
+  try {
+    for (const server of servers) {
+      if (isSdkMcpServer(server)) {
+        mcpServers.push(await server.start());
+        startedServers.push(server);
+      } else {
+        mcpServers.push(server);
+      }
+    }
+  } catch (error) {
+    await Promise.all(startedServers.map((server) => server.close()));
+    throw error;
+  }
+  return {
+    mcpServers,
+    cleanup: async () => {
+      await Promise.all(startedServers.map((server) => server.close()));
+    }
+  };
+}
+
+// src/query.ts
+var DroidQueryImpl = class {
+  _generator;
+  _getSessionId;
+  _getInitResult;
+  _getInitialized;
+  _interruptFn;
+  _abortFn;
+  constructor(generator, getSessionId, getInitResult, getInitialized, interruptFn, abortFn) {
+    this._generator = generator;
+    this._getSessionId = getSessionId;
+    this._getInitResult = getInitResult;
+    this._getInitialized = getInitialized;
+    this._interruptFn = interruptFn;
+    this._abortFn = abortFn;
+  }
+  get sessionId() {
+    return this._getSessionId();
+  }
+  get initResult() {
+    return this._getInitResult();
+  }
+  get initialized() {
+    return this._getInitialized();
+  }
+  async interrupt() {
+    return this._interruptFn();
+  }
+  abort() {
+    this._abortFn();
+  }
+  next(...args) {
+    return this._generator.next(...args);
+  }
+  return(value) {
+    return this._generator.return(value);
+  }
+  throw(e) {
+    return this._generator.throw(e);
+  }
+  [Symbol.asyncIterator]() {
+    return this;
+  }
+};
+function query(options) {
+  let transport = null;
+  let client = null;
+  let sessionId = null;
+  let initResult = null;
+  let aborted = false;
+  let initializationPromise = null;
+  let promptPromise = null;
+  let cleanupAbortSignal = () => {
+  };
+  let cleanupSdkMcpServers = null;
+  const bridge = new MessageBridge();
+  const closeActiveResources = async () => {
+    const closer = client ?? transport;
+    const cleanupMcp = cleanupSdkMcpServers;
+    client = null;
+    transport = null;
+    cleanupSdkMcpServers = null;
+    await Promise.all([closeQuietly(closer), cleanupMcp?.()]);
+  };
+  const ensureInitialized = () => {
+    if (initResult) {
+      return Promise.resolve(initResult);
+    }
+    if (initializationPromise) {
+      return initializationPromise;
+    }
+    initializationPromise = (async () => {
+      try {
         if (aborted) {
-          return;
-        }
-        while (messageQueue.length > 0) {
-          const msg = messageQueue.shift();
-          yield msg;
-          if (msg.type === "turn_complete") {
-            return;
-          }
+          throw new Error("Query aborted before initialization");
         }
-        if (streamDone && messageQueue.length === 0) {
-          return;
+        const configuredClient = await createConfiguredClient(options);
+        transport = configuredClient.transport;
+        client = configuredClient.client;
+        client.onNotification(bridge.notificationHandler);
+        if (aborted) {
+          throw new Error("Query aborted before initialization");
         }
-        await new Promise((resolve) => {
-          resolveWaiting = resolve;
-        });
+        const sdkMcpServers = await startSdkMcpServers(options.mcpServers);
+        cleanupSdkMcpServers = sdkMcpServers.cleanup;
+        const result = await client.initializeSession(
+          buildInitParams({
+            ...options,
+            mcpServers: sdkMcpServers.mcpServers
+          })
+        );
+        sessionId = result.sessionId;
+        initResult = result;
+        return result;
+      } catch (error) {
+        await closeActiveResources();
+        throw error;
       }
-    } finally {
+    })();
+    return initializationPromise;
+  };
+  const ensurePromptSent = () => {
+    if (promptPromise) {
+      return promptPromise;
+    }
+    promptPromise = (async () => {
+      await ensureInitialized();
+      if (aborted || client === null) {
+        return;
+      }
+      await client.addUserMessage({ text: options.prompt });
+    })();
+    return promptPromise;
+  };
+  async function* generateMessages() {
+    if (aborted) return;
+    await ensurePromptSent();
+    if (aborted) return;
+    for await (const msg of bridge.messages()) {
+      if (aborted) return;
+      yield msg;
     }
   }
   const generator = generateMessages();
@@ -2885,310 +3191,273 @@ function query(options) {
     try {
       yield* generator;
     } finally {
-      if (client) {
-        try {
-          await client.close();
-        } catch {
-        }
-        client = null;
-      } else if (transport) {
-        try {
-          await transport.close();
-        } catch {
-        }
-      }
-      transport = null;
+      cleanupAbortSignal();
+      await closeActiveResources();
     }
   }
-  const wrapped = wrappedGenerator();
-  const droidQuery = wrapped;
-  Object.defineProperties(droidQuery, {
-    interrupt: {
-      value: async function interrupt() {
-        if (client && !aborted) {
-          await client.interruptSession();
-        }
-      },
-      writable: false,
-      enumerable: true
-    },
-    abort: {
-      value: function abort() {
-        aborted = true;
-        signalDone();
-        if (client) {
-          void client.close().catch(() => {
-          });
-          client = null;
-        } else if (transport) {
-          void transport.close().catch(() => {
-          });
-        }
-        transport = null;
-      },
-      writable: false,
-      enumerable: true
+  const droidQuery = new DroidQueryImpl(
+    wrappedGenerator(),
+    () => sessionId,
+    () => initResult,
+    () => ensureInitialized(),
+    async () => {
+      if (client && !aborted) {
+        await client.interruptSession();
+      }
     },
-    sessionId: {
-      get() {
-        return sessionId;
-      },
-      enumerable: true
+    () => {
+      aborted = true;
+      bridge.signalDone();
+      cleanupAbortSignal();
+      void closeActiveResources();
     }
-  });
+  );
+  cleanupAbortSignal = wireAbortSignal(
+    options.abortSignal,
+    () => droidQuery.abort()
+  );
   return droidQuery;
 }
 
 // src/session.ts
+function getAbortError(signal) {
+  if (signal.reason instanceof Error) {
+    return signal.reason;
+  }
+  return new Error(
+    typeof signal.reason === "string" ? signal.reason : "Operation aborted"
+  );
+}
+function throwIfAborted(signal) {
+  if (signal?.aborted) {
+    throw getAbortError(signal);
+  }
+}
+function parseJsonObject(text) {
+  try {
+    const parsed = JSON.parse(text);
+    const result = JsonObjectSchema.safeParse(parsed);
+    return result.success ? result.data : null;
+  } catch {
+    return null;
+  }
+}
+function extractAssistantText(message) {
+  if (message.type !== DroidMessageType.CreateMessage) {
+    return "";
+  }
+  if (message.role !== FactoryDroidMessageRole.Assistant) {
+    return "";
+  }
+  return message.content.filter((block) => block.type === "text").map((block) => block.text).join("");
+}
 var DroidSession = class {
   _client;
   _sessionId;
   _initResult;
   _closed = false;
+  _cleanupAbortSignal = null;
+  _cleanupCallbacks = [];
   /** @internal */
   constructor(client, sessionId, initResult) {
     this._client = client;
     this._sessionId = sessionId;
     this._initResult = initResult;
   }
-  // ------------------------------------------------------------------
-  // Properties
-  // ------------------------------------------------------------------
-  /** The session ID. */
   get sessionId() {
     return this._sessionId;
   }
-  /** The result from session initialization or loading. */
   get initResult() {
     return this._initResult;
   }
-  // ------------------------------------------------------------------
-  // Messaging
-  // ------------------------------------------------------------------
-  /**
-   * Send a message and return a streaming async generator of DroidMessage events.
-   *
-   * The generator yields messages until a TurnComplete event is received,
-   * signaling the end of the agent's turn.
-   *
-   * @param text - The user message text.
-   * @param options - Optional images/files to include.
-   * @returns An async generator yielding DroidMessage events.
-   */
+  /** @internal */
+  setAbortSignalCleanup(cleanup) {
+    this._cleanupAbortSignal = cleanup;
+  }
+  /** @internal */
+  addCleanup(cleanup) {
+    this._cleanupCallbacks.push(cleanup);
+  }
+  /** Yields {@link DroidMessage} events until `turn_complete`. */
   async *stream(text, options) {
     this._ensureNotClosed();
-    const messageQueue = [];
-    let resolveWaiting = null;
-    let streamDone = false;
-    function enqueueMessage(msg) {
-      messageQueue.push(msg);
-      if (resolveWaiting) {
-        const resolve = resolveWaiting;
-        resolveWaiting = null;
-        resolve();
-      }
-    }
-    function signalDone() {
-      streamDone = true;
-      if (resolveWaiting) {
-        const resolve = resolveWaiting;
-        resolveWaiting = null;
-        resolve();
-      }
-    }
-    const stateTracker = new StreamStateTracker();
-    const unsubscribe = this._client.onNotification((notification) => {
-      const params = notification["params"];
-      const innerNotification = params?.["notification"];
-      if (!innerNotification) {
-        return;
-      }
-      const converted = convertNotificationToStreamMessage(
-        innerNotification
-      );
-      if (converted === null) {
-        return;
-      }
-      const messages = Array.isArray(converted) ? converted : [converted];
-      for (const msg of messages) {
-        enqueueMessage(msg);
-        const additional = stateTracker.processMessage(msg);
-        for (const extra of additional) {
-          enqueueMessage(extra);
-          if (extra.type === "turn_complete") {
-            signalDone();
-          }
-        }
-      }
+    throwIfAborted(options?.abortSignal);
+    const bridge = new MessageBridge();
+    const unsubscribe = this._client.onNotification(bridge.notificationHandler);
+    let resolveAbort = () => {
+    };
+    const abortPromise = new Promise((resolve2) => {
+      resolveAbort = resolve2;
     });
-    try {
-      await this._client.addUserMessage({
-        text,
-        images: options?.images,
-        files: options?.files
+    const cleanupAbortSignal = wireAbortSignal(options?.abortSignal, () => {
+      bridge.signalDone();
+      resolveAbort();
+      void this._client.interruptSession().catch(() => {
       });
-      while (true) {
-        while (messageQueue.length > 0) {
-          const msg = messageQueue.shift();
-          yield msg;
-          if (msg.type === "turn_complete") {
-            return;
-          }
-        }
-        if (streamDone && messageQueue.length === 0) {
-          return;
-        }
-        await new Promise((resolve) => {
-          resolveWaiting = resolve;
-        });
+    });
+    try {
+      await Promise.race([
+        this._client.addUserMessage({
+          text,
+          images: options?.images,
+          files: options?.files,
+          outputFormat: options?.outputFormat
+        }),
+        abortPromise
+      ]);
+      throwIfAborted(options?.abortSignal);
+      for await (const msg of bridge.messages()) {
+        throwIfAborted(options?.abortSignal);
+        yield msg;
       }
+      throwIfAborted(options?.abortSignal);
     } finally {
+      cleanupAbortSignal();
       unsubscribe();
     }
   }
-  /**
-   * Send a message and collect the complete response (non-streaming).
-   *
-   * Internally consumes all stream messages and returns an aggregated
-   * {@link DroidResult} with the concatenated text, all messages, and
-   * final token usage.
-   *
-   * @param text - The user message text.
-   * @param options - Optional images/files to include.
-   * @returns Aggregated result with text, messages, and token usage.
-   */
+  /** Consumes the stream and returns an aggregated {@link DroidResult}. */
   async send(text, options) {
     this._ensureNotClosed();
     const messages = [];
     let fullText = "";
     let lastTokenUsage = null;
+    let firstError = null;
+    let structuredOutput = null;
+    let finalAssistantText = "";
+    let turnCount = 0;
+    const startedAt = Date.now();
     for await (const msg of this.stream(text, options)) {
       messages.push(msg);
-      if (msg.type === "assistant_text_delta") {
+      if (msg.type === DroidMessageType.AssistantTextDelta) {
         fullText += msg.text;
       }
-      if (msg.type === "token_usage_update") {
+      const assistantText = extractAssistantText(msg);
+      if (assistantText) {
+        finalAssistantText = assistantText;
+        if (options?.outputFormat && fullText.length === 0) {
+          fullText = assistantText;
+        }
+      }
+      if (msg.type === DroidMessageType.TokenUsageUpdate) {
         lastTokenUsage = msg;
       }
-      if (msg.type === "turn_complete" && msg.tokenUsage) {
-        lastTokenUsage = msg.tokenUsage;
+      if (msg.type === DroidMessageType.Error && firstError === null) {
+        firstError = msg;
+      }
+      if (options?.outputFormat && structuredOutput === null) {
+        const textToParse = finalAssistantText || fullText;
+        if (textToParse) {
+          structuredOutput = parseJsonObject(textToParse);
+        }
+      }
+      if (msg.type === DroidMessageType.TurnComplete) {
+        turnCount++;
+        if (msg.tokenUsage) {
+          lastTokenUsage = msg.tokenUsage;
+        }
       }
     }
     return {
+      sessionId: this._sessionId,
       text: fullText,
       messages,
-      tokenUsage: lastTokenUsage
+      tokenUsage: lastTokenUsage,
+      durationMs: Date.now() - startedAt,
+      turnCount,
+      error: firstError,
+      structuredOutput,
+      success: firstError === null
     };
   }
-  // ------------------------------------------------------------------
-  // Session control
-  // ------------------------------------------------------------------
-  /**
-   * Interrupt the current agent turn.
-   *
-   * Sends an interrupt request. The agent will stop after completing
-   * its current operation.
-   */
   async interrupt() {
     this._ensureNotClosed();
     await this._client.interruptSession();
   }
-  /**
-   * Close the session and release all resources.
-   *
-   * Closes the underlying transport and rejects any pending requests.
-   * After close, the session cannot be used.
-   */
   async close() {
     if (this._closed) {
       return;
     }
     this._closed = true;
-    await this._client.close();
+    this._cleanupAbortSignal?.();
+    this._cleanupAbortSignal = null;
+    try {
+      await this._client.close();
+    } finally {
+      const cleanups = this._cleanupCallbacks.splice(0);
+      await Promise.all(cleanups.map((cleanup) => cleanup()));
+    }
   }
-  // ------------------------------------------------------------------
-  // Settings
-  // ------------------------------------------------------------------
-  /**
-   * Update session settings (model, reasoning effort, autonomy, etc.).
-   *
-   * @param params - Partial settings to update.
-   */
   async updateSettings(params) {
     this._ensureNotClosed();
     return this._client.updateSessionSettings(params);
   }
-  // ------------------------------------------------------------------
-  // MCP methods
-  // ------------------------------------------------------------------
-  /**
-   * Add an MCP server to the session.
-   */
+  async enterSpecMode(params = {}) {
+    this._ensureNotClosed();
+    return this._client.updateSessionSettings({
+      interactionMode: "spec" /* Spec */,
+      ...params
+    });
+  }
   async addMcpServer(params) {
     this._ensureNotClosed();
     return this._client.addMcpServer(params);
   }
-  /**
-   * Remove an MCP server from the session.
-   */
   async removeMcpServer(params) {
     this._ensureNotClosed();
     return this._client.removeMcpServer(params);
   }
-  /**
-   * Toggle an MCP server on or off.
-   */
   async toggleMcpServer(params) {
     this._ensureNotClosed();
     return this._client.toggleMcpServer(params);
   }
-  /**
-   * List MCP servers and their status.
-   */
   async listMcpServers() {
     this._ensureNotClosed();
     return this._client.listMcpServers();
   }
-  /**
-   * List available MCP tools.
-   */
   async listMcpTools() {
     this._ensureNotClosed();
     return this._client.listMcpTools();
   }
-  /**
-   * Authenticate an MCP server (OAuth flow).
-   */
+  async listTools(params = {}) {
+    this._ensureNotClosed();
+    return this._client.listTools(params);
+  }
   async authenticateMcpServer(params) {
     this._ensureNotClosed();
     return this._client.authenticateMcpServer(params);
   }
-  // ------------------------------------------------------------------
-  // Skills
-  // ------------------------------------------------------------------
-  /**
-   * List available skills.
-   */
   async listSkills() {
     this._ensureNotClosed();
     return this._client.listSkills();
   }
-  // ------------------------------------------------------------------
-  // Notification subscription
-  // ------------------------------------------------------------------
-  /**
-   * Register a callback for incoming notification messages.
-   *
-   * @param callback - Invoked with the notification object.
-   * @param filter - Optional filter to only receive specific notification types.
-   * @returns An unsubscribe function.
-   */
+  async getRewindInfo(params) {
+    this._ensureNotClosed();
+    return this._client.getRewindInfo(params);
+  }
+  async executeRewind(params) {
+    this._ensureNotClosed();
+    return this._client.executeRewind(params);
+  }
+  async compactSession(params) {
+    this._ensureNotClosed();
+    return this._client.compactSession(params ?? {});
+  }
+  async forkSession() {
+    this._ensureNotClosed();
+    return this._client.forkSession();
+  }
+  async getContextStats() {
+    this._ensureNotClosed();
+    return this._client.getContextStats();
+  }
+  async renameSession(params) {
+    this._ensureNotClosed();
+    return this._client.renameSession(params);
+  }
   onNotification(callback, filter) {
     return this._client.onNotification(callback, filter);
   }
-  // ------------------------------------------------------------------
-  // Internal
-  // ------------------------------------------------------------------
   _ensureNotClosed() {
     if (this._closed) {
       throw new ConnectionError(
@@ -3198,98 +3467,290 @@ var DroidSession = class {
   }
 };
 async function createSession(options = {}) {
-  let transport;
-  if (options.transport) {
-    transport = options.transport;
-  } else {
-    const transportOptions = {
-      execPath: options.execPath,
-      execArgs: options.execArgs,
-      cwd: options.cwd,
-      env: options.env
+  const { client } = await createConfiguredClient(options);
+  let cleanupInitAbortSignal = options.abortSignal?.aborted ? () => {
+  } : wireAbortSignal(options.abortSignal, () => {
+    void closeQuietly(client);
+  });
+  let sdkMcpServers;
+  try {
+    sdkMcpServers = await startSdkMcpServers(options.mcpServers);
+    const initParams = buildInitParams({
+      ...options,
+      mcpServers: sdkMcpServers.mcpServers
+    });
+    const initResult = await client.initializeSession(initParams);
+    const session = new DroidSession(client, initResult.sessionId, initResult);
+    session.addCleanup(sdkMcpServers.cleanup);
+    cleanupInitAbortSignal();
+    cleanupInitAbortSignal = () => {
     };
-    const processTransport = new ProcessTransport(transportOptions);
-    await processTransport.connect();
-    transport = processTransport;
-  }
-  const client = new DroidClient({ transport });
-  if (options.permissionHandler) {
-    client.setPermissionHandler(options.permissionHandler);
-  }
-  if (options.askUserHandler) {
-    client.setAskUserHandler(options.askUserHandler);
-  }
-  const initParams = {
-    machineId: options.machineId ?? "default",
-    cwd: options.cwd ?? "."
-  };
-  if (options.modelId !== void 0) {
-    initParams.modelId = options.modelId;
+    session.setAbortSignalCleanup(
+      wireAbortSignal(options.abortSignal, () => void session.close())
+    );
+    return session;
+  } catch (error) {
+    cleanupInitAbortSignal();
+    await sdkMcpServers?.cleanup();
+    await closeQuietly(client);
+    throw error;
   }
-  if (options.autonomyLevel !== void 0) {
-    initParams.autonomyLevel = options.autonomyLevel;
+}
+async function resumeSession(sessionId, options = {}) {
+  const { client } = await createConfiguredClient(options);
+  let sdkMcpServers;
+  try {
+    sdkMcpServers = await startSdkMcpServers(options.mcpServers);
+    const loadParams = {
+      sessionId,
+      mcpServers: sdkMcpServers.mcpServers
+    };
+    const loadResult = await client.loadSession(loadParams);
+    const session = new DroidSession(client, sessionId, loadResult);
+    session.addCleanup(sdkMcpServers.cleanup);
+    session.setAbortSignalCleanup(
+      wireAbortSignal(options.abortSignal, () => void session.close())
+    );
+    return session;
+  } catch (error) {
+    await sdkMcpServers?.cleanup();
+    await closeQuietly(client);
+    throw error;
   }
-  if (options.interactionMode !== void 0) {
-    initParams.interactionMode = options.interactionMode;
+}
+
+// src/run.ts
+async function run(text, options = {}) {
+  const session = await createSession(options);
+  try {
+    return await session.send(text, options);
+  } finally {
+    await session.close();
   }
-  if (options.reasoningEffort !== void 0) {
-    initParams.reasoningEffort = options.reasoningEffort;
+}
+
+// src/session-discovery.ts
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+var FAVORITES_FILE = ".favorites";
+var SESSION_EXTENSION = ".jsonl";
+var SETTINGS_SUFFIX = ".settings.json";
+var MISSION_TAG_PREFIX = "mission:";
+var MISSION_ID_METADATA_KEY = "missionId";
+var DECOMP_SESSION_TYPE_TAG = "decompSessionType";
+var DECOMP_SESSION_TYPE_METADATA_KEY = "value";
+var LF = 10;
+var CR = 13;
+var SPACE = 32;
+var TAB = 9;
+var PARSE_OVERSAMPLE = 20;
+function readFileBuffer(filePath) {
+  try {
+    return fs.readFileSync(filePath);
+  } catch {
+    return null;
   }
-  if (options.mcpServers !== void 0) {
-    initParams.mcpServers = options.mcpServers;
+}
+function parseJsonBuffer(buf) {
+  try {
+    return JSON.parse(buf.toString("utf-8"));
+  } catch {
+    return null;
   }
-  if (options.enabledToolIds !== void 0) {
-    initParams.enabledToolIds = options.enabledToolIds;
+}
+function scanBufferForLines(buf) {
+  let nonEmptyLineCount = 0;
+  let firstLineEnd = -1;
+  let currentLineHasContent = false;
+  for (let i = 0; i < buf.length; i++) {
+    const ch = buf[i];
+    if (ch === LF) {
+      if (currentLineHasContent) nonEmptyLineCount++;
+      if (firstLineEnd === -1) firstLineEnd = i;
+      currentLineHasContent = false;
+    } else if (ch !== CR && ch !== SPACE && ch !== TAB) {
+      currentLineHasContent = true;
+    }
   }
+  if (currentLineHasContent) nonEmptyLineCount++;
+  const end = firstLineEnd === -1 ? buf.length : firstLineEnd > 0 && buf[firstLineEnd - 1] === CR ? firstLineEnd - 1 : firstLineEnd;
+  return {
+    firstLine: buf.subarray(0, end),
+    nonEmptyLineCount
+  };
+}
+function loadFavorites(sessionsDir) {
+  const buf = readFileBuffer(path.join(sessionsDir, FAVORITES_FILE));
+  if (!buf) return /* @__PURE__ */ new Set();
+  const parsed = parseJsonBuffer(buf);
+  if (!Array.isArray(parsed)) return /* @__PURE__ */ new Set();
+  return new Set(parsed.filter((id) => typeof id === "string"));
+}
+function loadSettingsFile(directory, sessionId) {
+  const buf = readFileBuffer(
+    path.join(directory, `${sessionId}${SETTINGS_SUFFIX}`)
+  );
+  if (!buf) return null;
+  const parsed = parseJsonBuffer(buf);
+  if (parsed === null) return null;
+  const result = SessionSettingsFileSchema.safeParse(parsed);
+  return result.success ? result.data : null;
+}
+function getMissionMetadataFromTags(settings) {
+  if (!settings?.tags) return {};
+  const missionTag = settings.tags.find(
+    (tag) => tag.name.startsWith(MISSION_TAG_PREFIX)
+  );
+  const roleTag = settings.tags.find(
+    (tag) => tag.name === DECOMP_SESSION_TYPE_TAG
+  );
+  return {
+    decompMissionId: missionTag?.metadata?.[MISSION_ID_METADATA_KEY],
+    decompSessionType: roleTag?.metadata?.[DECOMP_SESSION_TYPE_METADATA_KEY]
+  };
+}
+function parseSessionFile(candidate, ctx) {
+  const buf = readFileBuffer(candidate.sessionPath);
+  if (!buf) return null;
+  const scanned = scanBufferForLines(buf);
+  const firstParsed = parseJsonBuffer(scanned.firstLine);
+  if (firstParsed === null) return null;
+  const firstResult = SessionStartEventSchema.safeParse(firstParsed);
+  if (!firstResult.success) return null;
+  const summary = firstResult.data;
+  if (ctx.requiredCwd !== void 0 && (summary.cwd === void 0 || path.resolve(summary.cwd) !== ctx.requiredCwd)) {
+    return null;
+  }
+  const settingsName = `${candidate.sessionId}${SETTINGS_SUFFIX}`;
+  const settings = candidate.siblingNames.has(settingsName) ? loadSettingsFile(candidate.directory, candidate.sessionId) : null;
+  if (settings?.archivedAt) return null;
+  const tagMeta = getMissionMetadataFromTags(settings);
+  const decompSessionType = summary.decompSessionType ?? SessionStartEventSchema.shape.decompSessionType.safeParse(
+    tagMeta.decompSessionType
+  ).data;
+  const messageCount = Math.max(0, scanned.nonEmptyLineCount - 1);
+  return {
+    id: candidate.sessionId,
+    title: summary.title ?? "",
+    sessionTitle: summary.sessionTitle,
+    owner: summary.owner ?? "",
+    messageCount,
+    modifiedTime: candidate.stats.mtime,
+    createdTime: candidate.stats.birthtime || candidate.stats.ctime,
+    isFavorite: ctx.favorites.has(candidate.sessionId),
+    cwd: summary.cwd,
+    decompSessionType,
+    decompMissionId: tagMeta.decompMissionId ?? summary.decompMissionId
+  };
+}
+function readDirEntries(directory) {
   try {
-    const initResult = await client.initializeSession(
-      initParams
-    );
-    return new DroidSession(client, initResult.sessionId, initResult);
-  } catch (error) {
+    return fs.readdirSync(directory, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+}
+function collectCandidates(directory, entries) {
+  const siblingNames = new Set(entries.map((e) => e.name));
+  const candidates = [];
+  for (const entry of entries) {
+    if (entry.isDirectory()) continue;
+    if (!entry.name.endsWith(SESSION_EXTENSION)) continue;
+    const sessionPath = path.join(directory, entry.name);
+    let stats;
     try {
-      await client.close();
+      stats = fs.statSync(sessionPath);
     } catch {
+      continue;
     }
-    throw error;
+    candidates.push({
+      sessionId: entry.name.slice(0, -SESSION_EXTENSION.length),
+      sessionPath,
+      directory,
+      siblingNames,
+      stats
+    });
   }
+  return candidates;
 }
-async function resumeSession(sessionId, options = {}) {
-  let transport;
-  if (options.transport) {
-    transport = options.transport;
-  } else {
-    const transportOptions = {
-      execPath: options.execPath,
-      execArgs: options.execArgs,
-      cwd: options.cwd,
-      env: options.env
-    };
-    const processTransport = new ProcessTransport(transportOptions);
-    await processTransport.connect();
-    transport = processTransport;
+function parseUpTo(candidates, ctx, limit) {
+  const out = [];
+  for (const candidate of candidates) {
+    if (limit !== void 0 && out.length >= limit) break;
+    const metadata = parseSessionFile(candidate, ctx);
+    if (metadata) out.push(metadata);
+  }
+  return out;
+}
+function sanitizePathToDirectoryName(cwd) {
+  let expandedPath = cwd;
+  if (cwd.startsWith("~/") || cwd === "~") {
+    expandedPath = path.join(os.homedir(), cwd.slice(1));
   }
-  const client = new DroidClient({ transport });
-  if (options.permissionHandler) {
-    client.setPermissionHandler(options.permissionHandler);
+  const absolutePath = path.resolve(expandedPath);
+  let canonicalPath = absolutePath;
+  try {
+    canonicalPath = fs.realpathSync(absolutePath);
+  } catch {
+    canonicalPath = absolutePath;
   }
-  if (options.askUserHandler) {
-    client.setAskUserHandler(options.askUserHandler);
+  const normalized = canonicalPath.replace(/[\\/]+$/, "");
+  if (process.platform === "win32") {
+    return `-${normalized.replace(/^([A-Z]):/i, "$1").replace(/[\\/]+/g, "-")}`;
   }
-  const loadParams = {
-    sessionId,
-    mcpServers: options.mcpServers
-  };
-  try {
-    const loadResult = await client.loadSession(loadParams);
-    return new DroidSession(client, sessionId, loadResult);
-  } catch (error) {
-    try {
-      await client.close();
-    } catch {
+  return `-${normalized.replace(/^\/+/, "").replace(/\/+/g, "-")}`;
+}
+function getDefaultSessionsDir() {
+  return path.join(os.homedir(), ".factory", "sessions");
+}
+async function listSessions(options = {}) {
+  const sessionsDir = options.sessionsDir ?? getDefaultSessionsDir();
+  const favorites = loadFavorites(sessionsDir);
+  const rootEntries = readDirEntries(sessionsDir);
+  const legacyCandidates = collectCandidates(sessionsDir, rootEntries);
+  const projectCandidates = [];
+  let requiredCwd;
+  if (options.fetchOutsideCWD) {
+    for (const entry of rootEntries) {
+      if (!entry.isDirectory()) continue;
+      if (!entry.name.startsWith("-")) continue;
+      const dir = path.join(sessionsDir, entry.name);
+      projectCandidates.push(...collectCandidates(dir, readDirEntries(dir)));
     }
-    throw error;
+  } else {
+    const normalizedCwd = path.resolve(options.cwd ?? process.cwd());
+    requiredCwd = normalizedCwd;
+    const projectDir = path.join(
+      sessionsDir,
+      sanitizePathToDirectoryName(normalizedCwd)
+    );
+    projectCandidates.push(
+      ...collectCandidates(projectDir, readDirEntries(projectDir))
+    );
+  }
+  const byMtimeDesc = (a, b) => b.stats.mtime.getTime() - a.stats.mtime.getTime();
+  projectCandidates.sort(byMtimeDesc);
+  legacyCandidates.sort(byMtimeDesc);
+  const parseLimit = options.numSessions !== void 0 && options.numSessions >= 0 ? options.numSessions + PARSE_OVERSAMPLE : void 0;
+  const ctx = { favorites };
+  const legacyCtx = requiredCwd !== void 0 ? { favorites, requiredCwd } : ctx;
+  const projectSessions = parseUpTo(projectCandidates, ctx, parseLimit);
+  const legacySessions = parseUpTo(legacyCandidates, legacyCtx, parseLimit);
+  const byId = /* @__PURE__ */ new Map();
+  for (const session of [...projectSessions, ...legacySessions]) {
+    const existing = byId.get(session.id);
+    if (!existing || session.modifiedTime.getTime() > existing.modifiedTime.getTime()) {
+      byId.set(session.id, session);
+    }
+  }
+  const sorted = Array.from(byId.values()).sort(
+    (a, b) => b.modifiedTime.getTime() - a.modifiedTime.getTime()
+  );
+  if (options.numSessions !== void 0 && options.numSessions >= 0) {
+    return sorted.slice(0, options.numSessions);
   }
+  return sorted;
 }
 export {
   AddMcpServerRequestParamsSchema,
@@ -3321,6 +3782,7 @@ export {
   BaseRequestSchema,
   BaseResponseFailureSchema,
   BaseResponseSuccessSchema,
+  COMPACTION_TIMEOUT,
   CancelMcpAuthRequestParamsSchema,
   CancelMcpAuthRequestSchema,
   CancelMcpAuthResponseSchema,
@@ -3331,8 +3793,14 @@ export {
   ClearMcpAuthResultSchema,
   CliRequestOrNotificationSchema,
   ClientRequestSchema,
+  CompactSessionRequestParamsSchema,
+  CompactSessionRequestSchema,
+  CompactSessionResponseSchema,
+  CompactSessionResultSchema,
   ConnectionError,
   ContentBlockSchema,
+  ContextStatsAccuracy,
+  ContextStatsSchema,
   CreateMessageNotificationSchema,
   CreateToolConfirmationDetailsSchema,
   DEFAULT_REQUEST_TIMEOUT,
@@ -3346,22 +3814,42 @@ export {
   DroidClientMethod,
   DroidErrorType,
   DroidInteractionMode,
+  DroidMessageType,
   DroidServerMethod,
   DroidSession,
   DroidWorkingState,
   DroidWorkingStateChangedNotificationSchema,
   EditToolConfirmationDetailsSchema,
+  EmptyResultSchema,
   ErrorDetailSchema,
   ErrorNotificationSchema,
+  ExecToolInfoSchema,
+  ExecuteRewindRequestParamsSchema,
+  ExecuteRewindRequestSchema,
+  ExecuteRewindResponseSchema,
+  ExecuteRewindResultSchema,
   ExecuteToolConfirmationDetailsSchema,
   ExitSpecModeConfirmationDetailsSchema,
   FACTORY_CLIENT_HEADER,
   FACTORY_CLIENT_VERSION,
   FACTORY_PROTOCOL_VERSION,
+  FactoryDroidMessageRole,
   FactoryDroidMessageSchema,
   FeatureStatus,
   FeatureSuccessState,
   FeatureSuccessStateSchema,
+  ForkSessionRequestParamsSchema,
+  ForkSessionRequestSchema,
+  ForkSessionResponseSchema,
+  ForkSessionResultSchema,
+  GetContextStatsRequestParamsSchema,
+  GetContextStatsRequestSchema,
+  GetContextStatsResponseSchema,
+  GetContextStatsResultSchema,
+  GetRewindInfoRequestParamsSchema,
+  GetRewindInfoRequestSchema,
+  GetRewindInfoResponseSchema,
+  GetRewindInfoResultSchema,
   GitRepoInfoSchema,
   HandoffItemsDismissedEntrySchema,
   HandoffSchema,
@@ -3379,6 +3867,8 @@ export {
   InterruptSessionResultSchema,
   IssueSeverity,
   JSONRPC_VERSION,
+  JsonArraySchema,
+  JsonObjectSchema,
   JsonRpcEnvelopeSchema,
   JsonRpcErrorCode,
   JsonRpcErrorSchema,
@@ -3389,6 +3879,7 @@ export {
   JsonRpcResponseFailureSchema,
   JsonRpcResponseSchema,
   JsonRpcResponseSuccessSchema,
+  JsonValueSchema,
   KillWorkerSessionRequestParamsSchema,
   KillWorkerSessionRequestSchema,
   KillWorkerSessionResponseSchema,
@@ -3410,6 +3901,10 @@ export {
   ListSkillsRequestSchema,
   ListSkillsResponseSchema,
   ListSkillsResultSchema,
+  ListToolsRequestParamsSchema,
+  ListToolsRequestSchema,
+  ListToolsResponseSchema,
+  ListToolsResultSchema,
   LoadSessionRequestParamsSchema,
   LoadSessionRequestSchema,
   LoadSessionResponseSchema,
@@ -3447,6 +3942,8 @@ export {
   MissionWorkerCompletedNotificationSchema,
   MissionWorkerStartedNotificationSchema,
   ModelProvider,
+  OutputFormatSchema,
+  OutputFormatType,
   PermissionResolvedNotificationSchema,
   ProcessExitError,
   ProcessTransport,
@@ -3455,26 +3952,40 @@ export {
   ProposeMissionConfirmationDetailsSchema,
   ProtocolEngine,
   ProtocolError,
+  REWIND_TIMEOUT,
   ReasoningEffort,
   RedactedThinkingBlockSchema,
   RemoveMcpServerRequestParamsSchema,
   RemoveMcpServerRequestSchema,
   RemoveMcpServerResponseSchema,
   RemoveMcpServerResultSchema,
+  RenameSessionRequestParamsSchema,
+  RenameSessionRequestSchema,
+  RenameSessionResponseSchema,
+  RenameSessionResultSchema,
   RequestPermissionRequestParamsSchema,
   RequestPermissionRequestSchema,
   RequestPermissionResponseSchema,
   RequestPermissionResultSchema,
+  RewindEvictedFileSchema,
+  RewindFileCreationSchema,
+  RewindFileSnapshotSchema,
+  SDK_TAG,
+  SDK_VERSION,
   SESSION_INIT_TIMEOUT,
+  SdkMcpServer,
   SessionError,
+  SessionMetadataSchema,
   SessionNotFoundError,
   SessionNotificationParamsSchema,
   SessionNotificationPayloadSchema,
   SessionNotificationSchema,
   SessionNotificationSchemaList,
   SessionNotificationType,
+  SessionSettingsFileSchema,
   SessionSettingsSchema,
   SessionSourceSchema,
+  SessionStartEventSchema,
   SessionTagSchema,
   SessionTitleUpdatedNotificationSchema,
   SessionTokenUsageChangedNotificationSchema,
@@ -3498,6 +4009,7 @@ export {
   SubmitMcpAuthCodeRequestSchema,
   SubmitMcpAuthCodeResponseSchema,
   SubmitMcpAuthCodeResultSchema,
+  SuccessResultSchema,
   TestCaseSchema,
   TestFileSchema,
   TestsSchema,
@@ -3523,6 +4035,7 @@ export {
   ToolProgressUpdateSchema,
   ToolResultBlockSchema,
   ToolResultNotificationSchema,
+  ToolSelectionOverridesSchema,
   ToolUseBlockSchema,
   ToolUseSchema,
   TraceContextMetaSchema,
@@ -3539,8 +4052,12 @@ export {
   WorkerStartedEntrySchema,
   WorkerStateInfoSchema,
   convertNotificationToStreamMessage,
+  createSdkMcpServer,
   createSession,
+  listSessions,
   query,
-  resumeSession
+  resumeSession,
+  run,
+  tool
 };
 //# sourceMappingURL=index.js.map