@protolabsai/proto 0.47.0 → 0.47.1

package/cli.js

@@ -169159,7 +169159,7 @@ __export(geminiContentGenerator_exports, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.47.0";
+  const version2 = "0.47.1";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -172165,6 +172165,8 @@ function getHookKey(hook) {
     identifier2 = hook.url;
   } else if (hook.type === HookType.Prompt) {
     identifier2 = hook.prompt.slice(0, 50);
+  } else if (hook.type === HookType.SdkCallback) {
+    identifier2 = hook.callbackId;
   } else {
     identifier2 = String(hook.type);
   }
@@ -172199,6 +172201,7 @@ var init_types7 = __esm({
       HooksConfigSource2["User"] = "user";
       HooksConfigSource2["System"] = "system";
       HooksConfigSource2["Extensions"] = "extensions";
+      HooksConfigSource2["Runtime"] = "runtime";
     })(HooksConfigSource || (HooksConfigSource = {}));
     (function(HookEventName2) {
       HookEventName2["PreToolUse"] = "PreToolUse";
@@ -172222,6 +172225,7 @@ var init_types7 = __esm({
       HookType2["Command"] = "command";
       HookType2["Http"] = "http";
       HookType2["Prompt"] = "prompt";
+      HookType2["SdkCallback"] = "sdkCallback";
     })(HookType || (HookType = {}));
     __name(getHookKey, "getHookKey");
     __name(createHookOutput, "createHookOutput");
@@ -269806,6 +269810,45 @@ var init_hookRegistry = __esm({
       getAllHooks() {
         return [...this.entries];
       }
+      /**
+       * Register a hook at runtime, bypassing the config-file load path. Used by
+       * the SDK control plane (`systemController.handleInitialize`) when a host
+       * process registers callback hooks via `hooks: HookRegistration[]`.
+       *
+       * Returns a disposer that removes the registration. Idempotent: registering
+       * the same callbackId twice for the same event replaces the prior entry.
+       */
+      addRuntimeHook(eventName, config2, options2) {
+        const hookName = this.getHookName({ config: config2 });
+        this.entries = this.entries.filter((e4) => !(e4.source === HooksConfigSource.Runtime && e4.eventName === eventName && this.getHookName(e4) === hookName));
+        config2.source = HooksConfigSource.Runtime;
+        this.entries.push({
+          config: config2,
+          source: HooksConfigSource.Runtime,
+          eventName,
+          matcher: options2?.matcher,
+          sequential: options2?.sequential,
+          enabled: true
+        });
+        debugLogger79.debug(`Registered runtime hook "${hookName}" for ${eventName}`);
+        return () => this.removeRuntimeHook(eventName, hookName);
+      }
+      /**
+       * Remove a runtime-registered hook by event + name. No-op if not present.
+       * Returns true if an entry was removed.
+       */
+      removeRuntimeHook(eventName, hookName) {
+        const before = this.entries.length;
+        this.entries = this.entries.filter((e4) => !(e4.source === HooksConfigSource.Runtime && e4.eventName === eventName && this.getHookName(e4) === hookName));
+        return this.entries.length < before;
+      }
+      /**
+       * Remove every runtime-registered hook. Used when the SDK session ends so
+       * a re-init starts clean.
+       */
+      clearRuntimeHooks() {
+        this.entries = this.entries.filter((e4) => e4.source !== HooksConfigSource.Runtime);
+      }
       /**
        * Enable or disable a specific hook
        */
@@ -269932,7 +269975,7 @@ please review the project settings (.proto/settings.json) and remove them.`;
        * Validate a hook configuration
        */
       validateHookConfig(config2, eventName, source2) {
-        const validTypes = ["command", "http", "prompt", "plugin"];
+        const validTypes = ["command", "http", "prompt", "plugin", "sdkCallback"];
         if (!config2.type || !validTypes.includes(config2.type)) {
           debugLogger79.warn(`Invalid hook ${eventName} from ${source2} type: ${config2.type}`);
           return false;
@@ -269949,6 +269992,10 @@ please review the project settings (.proto/settings.json) and remove them.`;
           debugLogger79.warn(`Prompt hook ${eventName} from ${source2} missing prompt field`);
           return false;
         }
+        if (config2.type === "sdkCallback" && !("callbackId" in config2 && config2.callbackId)) {
+          debugLogger79.warn(`SdkCallback hook ${eventName} from ${source2} missing callbackId`);
+          return false;
+        }
         return true;
       }
       /**
@@ -269998,6 +270045,15 @@ var init_hookRunner = __esm({
       static {
         __name(this, "HookRunner");
       }
+      sdkCallbackInvoker;
+      /**
+       * Set the function used to invoke SDK-callback hooks. Called by the CLI's
+       * non-interactive session once the control dispatcher is ready. Pass
+       * `undefined` to clear (e.g. on session teardown).
+       */
+      setSdkCallbackInvoker(invoker) {
+        this.sdkCallbackInvoker = invoker;
+      }
       /**
        * Execute a single hook
        * @param hookConfig Hook configuration
@@ -270120,8 +270176,59 @@ var init_hookRunner = __esm({
         if (hookConfig.type === HookType.Prompt) {
           return this.executePromptHook(hookConfig, eventName, input, startTime);
         }
+        if (hookConfig.type === HookType.SdkCallback) {
+          return this.executeSdkCallbackHook(hookConfig, eventName, input, startTime, signal);
+        }
         return this.executeCommandHook(hookConfig, eventName, input, startTime, signal);
       }
+      /**
+       * Execute an SDK callback hook — round-trip the event back to the host
+       * process via the registered invoker and use its response as the hook
+       * output. If no invoker is wired (e.g. running outside SDK mode) or the
+       * host throws, treat as a non-blocking error so the agent keeps running.
+       */
+      async executeSdkCallbackHook(hookConfig, eventName, input, startTime, signal) {
+        if (!this.sdkCallbackInvoker) {
+          debugLogger80.warn(`SDK callback hook ${hookConfig.callbackId} fired for ${eventName} but no invoker is registered; skipping.`);
+          return {
+            hookConfig,
+            eventName,
+            success: true,
+            duration: Date.now() - startTime
+          };
+        }
+        const toolUseId = input.tool_use_id ?? null;
+        try {
+          const output = await this.sdkCallbackInvoker(hookConfig.callbackId, input, toolUseId);
+          return {
+            hookConfig,
+            eventName,
+            success: true,
+            output,
+            exitCode: 0,
+            duration: Date.now() - startTime
+          };
+        } catch (error40) {
+          if (signal?.aborted) {
+            return {
+              hookConfig,
+              eventName,
+              success: false,
+              error: new Error("SDK callback hook cancelled (aborted)"),
+              duration: Date.now() - startTime
+            };
+          }
+          const msg = error40 instanceof Error ? error40.message : String(error40);
+          debugLogger80.warn(`SDK callback hook ${hookConfig.callbackId} threw: ${msg}`);
+          return {
+            hookConfig,
+            eventName,
+            success: false,
+            error: error40 instanceof Error ? error40 : new Error(msg),
+            duration: Date.now() - startTime
+          };
+        }
+      }
       /**
        * Execute an HTTP webhook hook — POST event JSON to the configured URL.
        */
@@ -271261,6 +271368,13 @@ var init_hookSystem = __esm({
       getRegistry() {
         return this.hookRegistry;
       }
+      /**
+       * Get the hook runner. Exposed so the SDK control plane can wire its
+       * callback invoker via `getRunner().setSdkCallbackInvoker(...)`.
+       */
+      getRunner() {
+        return this.hookRunner;
+      }
       /**
        * Enable or disable a hook
        */
@@ -418183,7 +418297,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.47.0";
+  return "0.47.1";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -422460,6 +422574,10 @@ async function parseArguments() {
       type: "boolean",
       description: "Deprecated: use --lsp instead. This flag is ignored.",
       hidden: true
+    }).option("experimental-hooks", {
+      type: "boolean",
+      description: "Accept SDK hook registrations on the control plane. Set automatically by @protolabsai/sdk when hookCallbacks is provided.",
+      hidden: true
     }).option("lsp", {
       type: "boolean",
       description: "Enable LSP (Language Server Protocol) for code intelligence (goToDefinition, diagnostics, etc.)",
@@ -426191,7 +426309,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "ca3b7f2d7";
+var GIT_COMMIT_INFO = "2fb5fc6c1";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -439217,6 +439335,7 @@ var ControlContext = class {
   sdkMcpServers;
   mcpClients;
   inputClosed;
+  pendingHookRegistrations;
   onInterrupt;
   constructor(options2) {
     this.config = options2.config;
@@ -439228,6 +439347,7 @@ var ControlContext = class {
     this.sdkMcpServers = /* @__PURE__ */ new Set();
     this.mcpClients = /* @__PURE__ */ new Map();
     this.inputClosed = false;
+    this.pendingHookRegistrations = [];
     this.onInterrupt = options2.onInterrupt;
   }
 };
@@ -439499,6 +439619,14 @@ var SystemController = class extends BaseController {
         }
       }
     }
+    if (payload.hooks && Array.isArray(payload.hooks)) {
+      this.context.pendingHookRegistrations = payload.hooks;
+      debugLogger128.debug(
+        `[SystemController] Stashed ${payload.hooks.length} hook registration(s) for finalization`
+      );
+    } else {
+      this.context.pendingHookRegistrations = [];
+    }
     if (payload.agents && Array.isArray(payload.agents)) {
       try {
         this.context.config.setSessionSubagents(payload.agents);
@@ -439532,7 +439660,7 @@ var SystemController = class extends BaseController {
   buildControlCapabilities() {
     const capabilities = {
       can_handle_can_use_tool: true,
-      can_handle_hook_callback: false,
+      can_handle_hook_callback: true,
       can_set_permission_mode: typeof this.context.config.setApprovalMode === "function",
       can_set_model: typeof this.context.config.setModel === "function",
       // SDK MCP servers are supported - messages routed through control plane
@@ -440662,6 +440790,56 @@ var Session2 = class {
       throw error40;
     }
   }
+  /**
+   * Wire any hook registrations the SDK sent in INITIALIZE into the now-built
+   * HookSystem, and set the round-trip invoker so SdkCallback hooks call back
+   * to the SDK process via the control plane. No-op when not in SDK mode or
+   * when the host sent no registrations.
+   */
+  finalizeHookRegistrations() {
+    if (!this.controlContext || !this.dispatcher) return;
+    const pending = this.controlContext.pendingHookRegistrations ?? [];
+    const hookSystem = this.config.getHookSystem?.();
+    if (!hookSystem) {
+      if (pending.length > 0) {
+        debugLogger130.warn(
+          "[Session] SDK sent hook registrations but the HookSystem is disabled (disableAllHooks?); hooks will not fire."
+        );
+      }
+      return;
+    }
+    const dispatcher = this.dispatcher;
+    hookSystem.getRunner().setSdkCallbackInvoker(async (callbackId, input, toolUseId) => {
+      const response = await dispatcher.sendControlRequest({
+        subtype: "hook_callback",
+        callback_id: callbackId,
+        input,
+        tool_use_id: toolUseId
+      });
+      if (response.subtype !== "success") return void 0;
+      return response.response;
+    });
+    const registry3 = hookSystem.getRegistry();
+    registry3.clearRuntimeHooks();
+    for (const reg of pending) {
+      if (!Object.values(HookEventName).includes(reg.event)) {
+        debugLogger130.warn(
+          `[Session] Ignoring SDK hook registration for unknown event "${reg.event}"`
+        );
+        continue;
+      }
+      registry3.addRuntimeHook(reg.event, {
+        type: HookType.SdkCallback,
+        callbackId: reg.callback_id,
+        name: reg.callback_id
+      });
+    }
+    if (pending.length > 0) {
+      debugLogger130.debug(
+        `[Session] Wired ${pending.length} SDK hook registration(s)`
+      );
+    }
+  }
   /**
    * Mark initialization as complete
    */
@@ -440759,6 +440937,7 @@ var Session2 = class {
       await this.dispatcher?.dispatch(request3);
       const sendSdkMcpMessage = this.dispatcher?.sdkMcpController.createSendSdkMcpMessage();
       await this.ensureConfigInitialized({ sendSdkMcpMessage });
+      this.finalizeHookRegistrations();
       this.completeInitialization();
     } catch (error40) {
       debugLogger130.error("[Session] SDK mode initialization failed:", error40);
@@ -474398,7 +474577,8 @@ function getTranslatedSourceDisplayMap() {
     [HooksConfigSource.Project]: t4("Local Settings"),
     [HooksConfigSource.User]: t4("User Settings"),
     [HooksConfigSource.System]: t4("System Settings"),
-    [HooksConfigSource.Extensions]: t4("Extensions")
+    [HooksConfigSource.Extensions]: t4("Extensions"),
+    [HooksConfigSource.Runtime]: t4("SDK (Runtime)")
   };
 }
 __name(getTranslatedSourceDisplayMap, "getTranslatedSourceDisplayMap");
@@ -479728,54 +479908,67 @@ var Footer = /* @__PURE__ */ __name(() => {
 // packages/cli/src/ui/components/StickyTaskList.tsx
 init_esbuild_shims();
 var import_jsx_runtime129 = __toESM(require_jsx_runtime(), 1);
-var MAX_OPEN_DISPLAY = 7;
+var MAX_PENDING_DISPLAY = 7;
 var COMPLETED_PREVIEW = 2;
 var StickyTaskList = /* @__PURE__ */ __name(({ todos }) => {
   if (!todos || todos.length === 0) {
     return null;
   }
-  const open6 = todos.filter((t5) => t5.status !== "completed");
+  const inProgress = todos.filter((t5) => t5.status === "in_progress");
+  const pending = todos.filter((t5) => t5.status === "pending");
   const completed = todos.filter((t5) => t5.status === "completed");
   const total = todos.length;
-  const openShown = open6.slice(0, MAX_OPEN_DISPLAY);
-  const openHidden = open6.length - openShown.length;
+  const pendingShown = pending.slice(0, MAX_PENDING_DISPLAY);
+  const pendingHidden = pending.length - pendingShown.length;
   const completedShown = completed.slice(0, COMPLETED_PREVIEW);
   const completedHidden = completed.length - completedShown.length;
-  return /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(Box_default, { flexDirection: "column", marginLeft: 2, marginBottom: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(Text3, { color: theme.text.secondary, children: [
-      total,
-      " task",
+      /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text3, { bold: true, color: theme.text.primary, children: total }),
+      " ",
+      "task",
       total === 1 ? "" : "s",
       " (",
-      completed.length,
-      " done,",
+      /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text3, { bold: true, color: theme.text.primary, children: completed.length }),
+      " ",
+      "done,",
+      " ",
+      /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text3, { bold: true, color: theme.text.primary, children: inProgress.length }),
+      " ",
+      "in progress,",
+      " ",
+      /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text3, { bold: true, color: theme.text.primary, children: pending.length }),
       " ",
-      open6.length,
-      " open)"
+      "open)"
     ] }),
-    openShown.map((todo) => /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(TaskRow, { todo }, todo.id)),
-    openHidden > 0 && /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(Text3, { color: theme.ui.comment, children: [
+    inProgress.map((todo) => /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(TaskRow, { todo }, todo.id)),
+    pendingShown.map((todo) => /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(TaskRow, { todo }, todo.id)),
+    pendingHidden > 0 && /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(Text3, { color: theme.ui.comment, children: [
       " \u2026 +",
-      openHidden,
-      " more open"
+      pendingHidden,
+      " pending"
     ] }),
     completedShown.map((todo) => /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(TaskRow, { todo }, todo.id)),
     completedHidden > 0 && /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(Text3, { color: theme.ui.comment, children: [
       " \u2026 +",
       completedHidden,
-      " completed"
+      " done"
     ] })
   ] });
 }, "StickyTaskList");
 var TaskRow = /* @__PURE__ */ __name(({ todo }) => {
   const isCompleted = todo.status === "completed";
   const isInProgress = todo.status === "in_progress";
+  const glyph = isCompleted ? "\u2714" : isInProgress ? "\u25A0" : "\u25A1";
+  const glyphColor = isCompleted ? theme.status.success : isInProgress ? theme.status.warning : theme.ui.comment;
+  const textColor = isCompleted ? theme.ui.comment : isInProgress ? theme.text.primary : theme.text.secondary;
   return /* @__PURE__ */ (0, import_jsx_runtime129.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Box_default, { width: 2, children: /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text3, { color: isCompleted ? theme.status.success : theme.ui.comment, children: isCompleted ? "\u2714" : "\u25FB" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Text3, { color: glyphColor, children: glyph }) }),
     /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime129.jsx)(
       Text3,
       {
-        color: isCompleted ? theme.ui.comment : isInProgress ? theme.status.success : theme.text.primary,
+        bold: isInProgress,
+        color: textColor,
         strikethrough: isCompleted,
         wrap: "truncate-end",
         children: todo.content
@@ -496470,7 +496663,7 @@ var QwenAgent = class {
   async initialize(args2) {
     this.clientCapabilities = args2.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version2 = "0.47.0";
+    const version2 = "0.47.1";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protolabsai/proto",
-  "version": "0.47.0",
+  "version": "0.47.1",
   "description": "proto - AI-powered coding agent",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "bundled"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.47.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.47.1"
   },
   "dependencies": {},
   "optionalDependencies": {