@factory/droid-sdk 0.7.0 → 0.9.0

package/dist/node.mjs

@@ -8,6 +8,7 @@ import {
   AddUserMessageRequestSchema,
   AddUserMessageResponseSchema,
   AddUserMessageResultSchema,
+  AppendMessagesResponseSchema,
   ApplyPatchToolConfirmationDetailsSchema,
   AskUserCollectedAnswerSchema,
   AskUserConfirmationDetailsSchema,
@@ -194,6 +195,9 @@ import {
   ListMcpToolsRequestSchema,
   ListMcpToolsResponseSchema,
   ListMcpToolsResultSchema,
+  ListModelsOptionsSchema,
+  ListModelsResponseSchema,
+  ListModelsResultSchema,
   ListSkillsRequestParamsSchema,
   ListSkillsRequestSchema,
   ListSkillsResponseSchema,
@@ -247,6 +251,8 @@ import {
   MissionStateSchema,
   MissionWorkerCompletedNotificationSchema,
   MissionWorkerStartedNotificationSchema,
+  ModelInfoSchema,
+  ModelMetadataSchema,
   ModelProvider,
   MultiMissionStateManager,
   MultiSessionStateManager,
@@ -284,6 +290,8 @@ import {
   RewindEvictedFileSchema,
   RewindFileCreationSchema,
   RewindFileSnapshotSchema,
+  SDK_CLIENT_METADATA,
+  SDK_REQUEST_ATTRIBUTION,
   SDK_TAG,
   SDK_VERSION,
   SESSION_INIT_TIMEOUT,
@@ -399,6 +407,7 @@ import {
   deleteComputer,
   extractInnerNotification,
   filterMessagesForUI,
+  formatSdkClientMetadata,
   getComputer,
   getComputerByName,
   getComputerMetrics,
@@ -434,8 +443,9 @@ import {
   toError,
   unwrapResponseResult,
   updateComputer,
-  wireAbortSignal
-} from "./chunk-5UXINOXG.mjs";
+  wireAbortSignal,
+  withSdkTag
+} from "./chunk-KXDG5ZWS.mjs";
 
 // src/exec-core/client.ts
 import EventEmitter from "events";
@@ -797,6 +807,7 @@ function inspectJsonRpcEnvelope2(message) {
 var DroidClient = class _DroidClient extends EventEmitter {
   transport;
   requestTimeout;
+  sessionInitTimeout;
   pendingRequests = /* @__PURE__ */ new Map();
   permissionHandlers = /* @__PURE__ */ new Map();
   askUserHandlers = /* @__PURE__ */ new Map();
@@ -810,9 +821,11 @@ var DroidClient = class _DroidClient extends EventEmitter {
    * requests from hanging on a dead transport.
    */
   transportError = null;
+  completedTurnObserved = false;
   logger;
   tracing;
   onRequestSettled;
+  getRequestAttribution;
   constructor(options, deps = defaultExecCoreDeps) {
     super();
     this.transport = options.transport;
@@ -820,7 +833,9 @@ var DroidClient = class _DroidClient extends EventEmitter {
     this.logger = resolved.logger;
     this.tracing = resolved.tracing;
     this.requestTimeout = options.requestTimeout ?? DEFAULT_REQUEST_TIMEOUT2;
+    this.sessionInitTimeout = options.sessionInitTimeout ?? SESSION_INIT_TIMEOUT2;
     this.onRequestSettled = options.onRequestSettled;
+    this.getRequestAttribution = options.getRequestAttribution;
     this.transport.onMessage((message) => {
       void this.handleMessage(message).catch((error) => {
         const err = error instanceof Error ? error : new Error(String(error));
@@ -834,7 +849,14 @@ var DroidClient = class _DroidClient extends EventEmitter {
     });
     this.transport.onError((error) => {
       const err = error instanceof Error ? error : new Error(String(error));
-      this.logger.exception(err, "Transport error");
+      const expectedCleanExit = err instanceof ProcessExitError && err.exitCode === 0 && this.completedTurnObserved;
+      if (expectedCleanExit) {
+        this.logger.info("[DroidClient] Process exited after completed turn", {
+          exitCode: err.exitCode
+        });
+      } else {
+        this.logger.exception(err, "Transport error");
+      }
       this.transportError = err;
       this.rejectAllPending(err);
       if (this.listenerCount("error" /* ERROR */) > 0) {
@@ -883,7 +905,10 @@ var DroidClient = class _DroidClient extends EventEmitter {
       method: "droid.initialize_session" /* INITIALIZE_SESSION */,
       params
     };
-    const rawResponse = await this.sendRequest(request, SESSION_INIT_TIMEOUT2);
+    const rawResponse = await this.sendRequest(
+      request,
+      this.sessionInitTimeout
+    );
     const response = InitializeSessionResponseSchema.parse(rawResponse);
     this.peerProtocolVersion = response.factoryProtocolVersion;
     if (response.error) {
@@ -909,7 +934,10 @@ var DroidClient = class _DroidClient extends EventEmitter {
       method: "droid.load_session" /* LOAD_SESSION */,
       params
     };
-    const rawResponse = await this.sendRequest(request, SESSION_INIT_TIMEOUT2);
+    const rawResponse = await this.sendRequest(
+      request,
+      this.sessionInitTimeout
+    );
     const response = LoadSessionResponseSchema.parse(rawResponse);
     this.peerProtocolVersion = response.factoryProtocolVersion;
     if (response.error) {
@@ -939,6 +967,7 @@ var DroidClient = class _DroidClient extends EventEmitter {
         "No active session. Call initializeSession or loadSession first."
       );
     }
+    this.completedTurnObserved = false;
     const request = {
       factoryApiVersion: LEGACY_FACTORY_API_VERSION,
       factoryProtocolVersion: FACTORY_PROTOCOL_VERSION,
@@ -947,16 +976,8 @@ var DroidClient = class _DroidClient extends EventEmitter {
       id: requestId ?? uuidv4(),
       method: "droid.add_user_message" /* ADD_USER_MESSAGE */,
       params: {
-        ...params.messageId && { messageId: params.messageId },
-        text: params.text,
-        images: params.images,
-        imagePaths: params.imagePaths,
-        files: params.files,
-        outputFormat: params.outputFormat,
-        ...params.skipAgentLoop && { skipAgentLoop: params.skipAgentLoop },
-        queuePlacement: params.queuePlacement ?? "end_of_turn" /* EndOfTurn */,
-        ...params.role && { role: params.role },
-        ...params.visibility && { visibility: params.visibility }
+        ...params,
+        queuePlacement: params.queuePlacement ?? "end_of_turn" /* EndOfTurn */
       }
     };
     const rawResponse = await this.sendRequest(request);
@@ -971,6 +992,39 @@ var DroidClient = class _DroidClient extends EventEmitter {
     }
     return response;
   }
+  /**
+   * Persists user-only messages without starting an agent turn.
+   *
+   * Use for daemon-owned activity that belongs in session history but was not
+   * produced by the agent, such as commands run while a session starts.
+   */
+  async appendMessages(params, requestId) {
+    if (!this.currentSessionId) {
+      throw new SessionError(
+        "No active session. Call initializeSession or loadSession first."
+      );
+    }
+    const request = {
+      factoryApiVersion: LEGACY_FACTORY_API_VERSION,
+      factoryProtocolVersion: FACTORY_PROTOCOL_VERSION,
+      type: "request",
+      jsonrpc: JSONRPC_VERSION2,
+      id: requestId ?? uuidv4(),
+      method: "droid.append_messages" /* APPEND_MESSAGES */,
+      params
+    };
+    const rawResponse = await this.sendRequest(request);
+    const response = AppendMessagesResponseSchema.parse(rawResponse);
+    if (response.error) {
+      throw new ProtocolError("Append messages request failed", {
+        requestId: request.id,
+        code: response.error.code,
+        message: response.error.message,
+        data: response.error.data
+      });
+    }
+    return response;
+  }
   async resolveQueuedUserMessage(params) {
     if (!this.currentSessionId) {
       throw new SessionError(
@@ -1092,19 +1146,7 @@ var DroidClient = class _DroidClient extends EventEmitter {
       jsonrpc: JSONRPC_VERSION2,
       id: requestId ?? uuidv4(),
       method: "droid.update_session_settings" /* UPDATE_SESSION_SETTINGS */,
-      params: {
-        modelId: params.modelId,
-        reasoningEffort: params.reasoningEffort,
-        interactionMode: params.interactionMode,
-        autonomyLevel: params.autonomyLevel,
-        specModeModelId: params.specModeModelId,
-        specModeReasoningEffort: params.specModeReasoningEffort,
-        missionSettings: params.missionSettings,
-        tags: params.tags,
-        compactionTokenLimit: params.compactionTokenLimit,
-        compactionThresholdCheckEnabled: params.compactionThresholdCheckEnabled,
-        disabledToolIds: params.disabledToolIds
-      }
+      params
     };
     const rawResponse = await this.sendRequest(request, this.requestTimeout);
     const responseParsed = UpdateSessionSettingsResponseSchema.safeParse(rawResponse);
@@ -1284,6 +1326,19 @@ var DroidClient = class _DroidClient extends EventEmitter {
     const response = RemoveMcpServerResponseSchema.parse(rawResponse);
     return response;
   }
+  async listModels(params = {}) {
+    const request = {
+      factoryApiVersion: LEGACY_FACTORY_API_VERSION,
+      factoryProtocolVersion: FACTORY_PROTOCOL_VERSION,
+      type: "request",
+      jsonrpc: JSONRPC_VERSION2,
+      id: uuidv4(),
+      method: "droid.list_models" /* LIST_MODELS */,
+      params
+    };
+    const rawResponse = await this.sendRequest(request, this.requestTimeout);
+    return ListModelsResponseSchema.parse(rawResponse);
+  }
   async listMcpRegistry() {
     if (!this.currentSessionId) {
       throw new SessionError(
@@ -1745,9 +1800,12 @@ var DroidClient = class _DroidClient extends EventEmitter {
         });
       }
     );
-    const _meta = {};
+    const requestAttribution = this.getRequestAttribution?.();
+    const _meta = {
+      ...requestAttribution && { requestAttribution }
+    };
     this.tracing.injectContext(_meta, this.tracing.getCurrentContext());
-    const requestWithMeta = _meta.traceparent ? { ...request, _meta } : request;
+    const requestWithMeta = _meta.traceparent || _meta.requestAttribution ? { ...request, _meta } : request;
     try {
       this.logger.info("[DroidClient] [daemon -> droid] sending request", {
         requestId: request.id,
@@ -1806,6 +1864,9 @@ var DroidClient = class _DroidClient extends EventEmitter {
             case "droid.add_user_message" /* ADD_USER_MESSAGE */:
               validatedResponse = AddUserMessageResponseSchema.parse(response);
               break;
+            case "droid.append_messages" /* APPEND_MESSAGES */:
+              validatedResponse = AppendMessagesResponseSchema.parse(response);
+              break;
             case "droid.resolve_queued_user_message" /* RESOLVE_QUEUED_USER_MESSAGE */:
               validatedResponse = ResolveQueuedUserMessageResponseSchema.parse(response);
               break;
@@ -1839,6 +1900,9 @@ var DroidClient = class _DroidClient extends EventEmitter {
             case "droid.remove_mcp_server" /* REMOVE_MCP_SERVER */:
               validatedResponse = RemoveMcpServerResponseSchema.parse(response);
               break;
+            case "droid.list_models" /* LIST_MODELS */:
+              validatedResponse = ListModelsResponseSchema.parse(response);
+              break;
             case "droid.list_mcp_registry" /* LIST_MCP_REGISTRY */:
               validatedResponse = ListMcpRegistryResponseSchema.parse(response);
               break;
@@ -1977,6 +2041,12 @@ var DroidClient = class _DroidClient extends EventEmitter {
     try {
       const validatedEvent = CliRequestOrNotificationSchema.parse(event);
       if (validatedEvent.method === "droid.session_notification" /* SESSION_NOTIFICATION */) {
+        const notification = validatedEvent.params.notification;
+        if (notification.type === "agent_turn_completed" /* AGENT_TURN_COMPLETED */) {
+          this.completedTurnObserved = true;
+        } else if (notification.type === "droid_working_state_changed" /* DROID_WORKING_STATE_CHANGED */ && notification.newState !== "idle" /* Idle */) {
+          this.completedTurnObserved = false;
+        }
         this.emit("session_notification" /* SESSION_NOTIFICATION */, validatedEvent);
       } else if (validatedEvent.method === "droid.request_permission" /* REQUEST_PERMISSION */) {
         await this.handlePermissionRequest(validatedEvent);
@@ -2073,7 +2143,7 @@ var DroidClient = class _DroidClient extends EventEmitter {
     }
     this.logger.info("[DroidClient] Handling permission request", {
       requestId: event.id,
-      toolCount: event.params.toolUses.length
+      count: event.params.toolUses.length
     });
     this.emit("request_permission" /* REQUEST_PERMISSION */, event);
     let selectedOption = "cancel" /* Cancel */;
@@ -2191,7 +2261,7 @@ var DroidClient = class _DroidClient extends EventEmitter {
     this.logger.info("[DroidClient] Handling ask-user request", {
       requestId: event.id,
       toolCallId: event.params.toolCallId,
-      questionCount: event.params.questions.length
+      count: event.params.questions.length
     });
     this.emit("ask_user" /* ASK_USER */, event);
     let result = { cancelled: true, answers: [] };
@@ -2225,7 +2295,7 @@ var DroidClient = class _DroidClient extends EventEmitter {
         this.logger.info("[DroidClient] Ask-user handler resolved", {
           requestId: event.id,
           cancelled: result.cancelled ?? false,
-          answerCount: result.answers.length
+          count: result.answers.length
         });
       } catch (error) {
         this.logger.exception(error, "Failed to handle ask-user request");
@@ -2297,6 +2367,7 @@ var DroidClient = class _DroidClient extends EventEmitter {
       message: error.message,
       errorType: _DroidClient.getErrorType(error),
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      ...error instanceof ProcessExitError && error.exitCode !== void 0 ? { exitCode: error.exitCode } : {},
       error: {
         name: error.name,
         message: error.message
@@ -2333,6 +2404,7 @@ var DroidClient = class _DroidClient extends EventEmitter {
 };
 
 // src/exec-core/managed-process.ts
+import { spawnSync } from "child_process";
 import fs2 from "fs";
 import * as readline from "readline";
 
@@ -2764,12 +2836,16 @@ var ManagedProcessImpl = class {
           let forcedExitTimeout;
           const gracefulExitTimeout = setTimeout(() => {
             if (processToClose.exitCode === null) {
-              processToClose.kill("SIGTERM");
-              forcedExitTimeout = setTimeout(() => {
-                if (processToClose.exitCode === null) {
-                  processToClose.kill("SIGKILL");
-                }
-              }, FORCED_EXIT_TIMEOUT_MS);
+              if (process.platform === "win32") {
+                this.killProcessTree(processToClose, "SIGKILL");
+              } else {
+                this.killProcessTree(processToClose, "SIGTERM");
+                forcedExitTimeout = setTimeout(() => {
+                  if (processToClose.exitCode === null) {
+                    this.killProcessTree(processToClose, "SIGKILL");
+                  }
+                }, FORCED_EXIT_TIMEOUT_MS);
+              }
             }
           }, GRACEFUL_EXIT_TIMEOUT_MS);
           processToClose.once("exit", () => {
@@ -2795,6 +2871,34 @@ var ManagedProcessImpl = class {
     this._childProcess = null;
     this.isClosing = false;
   }
+  killProcessTree(childProcess, signal) {
+    if (process.platform !== "win32" || childProcess.pid === void 0) {
+      childProcess.kill(signal);
+      return;
+    }
+    const result = spawnSync(
+      "taskkill",
+      ["/PID", String(childProcess.pid), "/T", "/F"],
+      {
+        stdio: "ignore",
+        windowsHide: true
+      }
+    );
+    if (!result.error && result.status === 0) {
+      return;
+    }
+    logWarn(
+      this.logger,
+      "[ManagedProcess] Failed to kill Windows process tree",
+      {
+        pid: childProcess.pid,
+        signal,
+        status: result.status,
+        cause: result.error
+      }
+    );
+    childProcess.kill(signal);
+  }
   get isConnected() {
     return this._childProcess !== null && !this._childProcess.killed && this._childProcess.stdin !== null && !this._childProcess.stdin.destroyed && ("writable" in this._childProcess.stdin ? this._childProcess.stdin.writable : true);
   }
@@ -3178,7 +3282,12 @@ async function createTransport(options) {
     droidExecPath: options.execPath,
     droidExecExtraArgs: options.execArgs,
     cwd: options.cwd,
-    env: { ...options.env, FACTORY_API_KEY: resolveApiKey(options.apiKey) },
+    env: {
+      ...options.env,
+      FACTORY_API_KEY: resolveApiKey(options.apiKey),
+      FACTORY_UPSTREAM_CLIENT_TYPE: "sdk" /* SDK */,
+      FACTORY_UPSTREAM_SDK: formatSdkClientMetadata(SDK_CLIENT_METADATA)
+    },
     observability: options.observability
   });
   await processTransport.connect();
@@ -3198,7 +3307,8 @@ async function createConfiguredClient(options) {
   const transport = await createTransport(options);
   const client = new DroidClient({
     transport,
-    observability: options.observability
+    observability: options.observability,
+    getRequestAttribution: () => SDK_REQUEST_ATTRIBUTION
   });
   setupClientHandlers(client, options);
   return { transport, client };
@@ -3226,6 +3336,9 @@ function buildInitParams(options) {
     ...options.reasoningEffort !== void 0 && {
       reasoningEffort: options.reasoningEffort
     },
+    ...options.systemPrompt !== void 0 && {
+      systemPrompt: options.systemPrompt
+    },
     ...options.specModeModelId !== void 0 && {
       specModeModelId: options.specModeModelId
     },
@@ -3241,13 +3354,14 @@ function buildInitParams(options) {
     ...options.sessionSource !== void 0 && {
       sessionSource: options.sessionSource
     },
+    sessionOriginHint: "sdk" /* Sdk */,
     ...options.autoRejectPermissionRequests !== void 0 && {
       autoRejectPermissionRequests: options.autoRejectPermissionRequests
     },
     ...options.disableBuiltinSkills !== void 0 && {
       disableBuiltinSkills: options.disableBuiltinSkills
     },
-    tags: [...options.tags ?? [], SDK_TAG]
+    tags: withSdkTag(options.tags)
   };
 }
 
@@ -3521,7 +3635,10 @@ var DroidSession = class _DroidSession {
           if (inner) handler(inner);
         }),
         onError: (handler) => this._client.onError(handler),
-        addUserMessage: (params) => this._client.addUserMessage(params),
+        addUserMessage: (params) => this._client.addUserMessage({
+          ...params,
+          userMessageSource: "sdk" /* Sdk */
+        }),
         interruptSession: () => this._client.interruptSession()
       },
       this._sessionId,
@@ -3575,6 +3692,11 @@ var DroidSession = class _DroidSession {
       ...params
     });
   }
+  async exitSpecMode() {
+    return this.updateSettings({
+      interactionMode: "auto" /* Auto */
+    });
+  }
   async addMcpServer(params) {
     this._ensureNotClosed();
     return unwrapResponseResult(await this._client.addMcpServer(params));
@@ -3831,7 +3953,8 @@ function createReplacementLoadParams(options, mcpServers) {
     disabledToolIds: options.disabledToolIds,
     autoRejectPermissionRequests: options.autoRejectPermissionRequests,
     disableBuiltinSkills: options.disableBuiltinSkills,
-    sessionSource: options.sessionSource
+    sessionSource: options.sessionSource,
+    sessionOriginHint: "sdk" /* Sdk */
   };
 }
 async function createSession(options = {}) {
@@ -4153,6 +4276,20 @@ async function listSessions(options = {}) {
   }
   return sorted;
 }
+
+// src/model-discovery.ts
+async function listModels(options = {}) {
+  const { includeDisabled, ...transportOptions } = options;
+  const { client } = await createConfiguredClient(transportOptions);
+  try {
+    const response = await client.listModels({
+      ...includeDisabled !== void 0 && { includeDisabled }
+    });
+    return unwrapResponseResult(response).models;
+  } finally {
+    await closeQuietly(client);
+  }
+}
 export {
   AbortError,
   AddMcpServerRequestParamsSchema,
@@ -4349,6 +4486,8 @@ export {
   ListMcpToolsRequestSchema,
   ListMcpToolsResponseSchema,
   ListMcpToolsResultSchema,
+  ListModelsOptionsSchema,
+  ListModelsResultSchema,
   ListSkillsRequestParamsSchema,
   ListSkillsRequestSchema,
   ListSkillsResponseSchema,
@@ -4402,6 +4541,8 @@ export {
   MissionStateChangedNotificationSchema,
   MissionWorkerCompletedNotificationSchema,
   MissionWorkerStartedNotificationSchema,
+  ModelInfoSchema,
+  ModelMetadataSchema,
   ModelProvider,
   MultiMissionStateManager,
   MultiSessionStateManager,
@@ -4576,6 +4717,7 @@ export {
   isTransportLoggingEnabled,
   listComputers,
   listMachineTemplates,
+  listModels,
   listRemoteSessions,
   listSessions,
   logTransportMessage,