@serviceme/devtools-cli 0.1.7 → 0.1.9

package/dist/bridgeServer.js

@@ -8751,7 +8751,7 @@ var require_yauzl = __commonJS({
     var Transform = require("stream").Transform;
     var PassThrough = require("stream").PassThrough;
     var Writable = require("stream").Writable;
-    exports2.open = open2;
+    exports2.open = open;
     exports2.fromFd = fromFd;
     exports2.fromBuffer = fromBuffer;
     exports2.fromRandomAccessReader = fromRandomAccessReader;
@@ -8763,7 +8763,7 @@ var require_yauzl = __commonJS({
     exports2.Entry = Entry;
     exports2.LocalFileHeader = LocalFileHeader;
     exports2.RandomAccessReader = RandomAccessReader;
-    function open2(path12, options2, callback) {
+    function open(path12, options2, callback) {
       if (typeof options2 === "function") {
         callback = options2;
         options2 = null;
@@ -9638,7 +9638,7 @@ function normalizeServicemeError(error, fallbackCode = "internal_error") {
 }
 
 // src/version.ts
-var SERVICEME_CLI_VERSION = "0.1.7";
+var SERVICEME_CLI_VERSION = "0.1.9";
 
 // src/bridge/AgentBridgeHandler.ts
 var fs12 = __toESM(require("fs/promises"));
@@ -9653,10 +9653,10 @@ var AgentCatalogClient = class {
   }
   async getCatalog() {
     if (!this.baseUrl) {
-      return {
-        agents: [],
-        fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
-      };
+      throw createServicemeError(
+        "workspace_not_found",
+        "Agent catalog baseUrl is not configured."
+      );
     }
     const response = await this.fetchImpl(
       `${this.baseUrl}/api/v1/marketplace/agents`
@@ -10211,10 +10211,8 @@ var GithubCopilotCliExecutor = class {
       windowsHide: true
     });
     if (child.pid) {
-      writeDiagnostic(
-        `[GithubCopilotCliExecutor] spawned child PID=${child.pid}
-`
-      );
+      writeDiagnostic(`[GithubCopilotCliExecutor] spawned child PID=${child.pid}
+`);
     }
     const timeoutMs = execution.timeoutMs;
     const timer = timeoutMs != null ? setTimeout(() => {
@@ -10232,15 +10230,13 @@ var GithubCopilotCliExecutor = class {
     child.stdout.on("data", (chunk) => {
       const data = chunk.toString();
       stdoutBuf += data;
-      if (stdoutBuf.length > MAX_OUTPUT_BYTES)
-        stdoutBuf = stdoutBuf.slice(-MAX_OUTPUT_BYTES);
+      if (stdoutBuf.length > MAX_OUTPUT_BYTES) stdoutBuf = stdoutBuf.slice(-MAX_OUTPUT_BYTES);
       onOutput("stdout", data);
     });
     child.stderr.on("data", (chunk) => {
       const data = chunk.toString();
       stderrBuf += data;
-      if (stderrBuf.length > MAX_OUTPUT_BYTES)
-        stderrBuf = stderrBuf.slice(-MAX_OUTPUT_BYTES);
+      if (stderrBuf.length > MAX_OUTPUT_BYTES) stderrBuf = stderrBuf.slice(-MAX_OUTPUT_BYTES);
       onOutput("stderr", data);
     });
     child.on("close", (code) => {
@@ -10563,10 +10559,7 @@ function isRecord3(value) {
 }
 function requireNonEmptyString(payload, field, taskType) {
   if (!isRecord3(payload) || typeof payload[field] !== "string" || !payload[field].trim()) {
-    throw createServicemeError(
-      "invalid_payload",
-      `${taskType} payload ${field} is required`
-    );
+    throw createServicemeError("invalid_payload", `${taskType} payload ${field} is required`);
   }
 }
 function validateTaskPayload(taskType, payload) {
@@ -10626,9 +10619,7 @@ var TaskExecutionEngine = class {
     if (policy === "reject") {
       const existingIds = this.taskExecutions.get(snapshot.taskId);
       if (existingIds && existingIds.size > 0) {
-        throw new Error(
-          `TASK_ALREADY_RUNNING: Task ${snapshot.taskId} is already running`
-        );
+        throw new Error(`TASK_ALREADY_RUNNING: Task ${snapshot.taskId} is already running`);
       }
     }
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -10787,10 +10778,10 @@ var SkillCatalogClient = class {
   }
   async getCatalog() {
     if (!this.baseUrl) {
-      return {
-        skills: [],
-        fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
-      };
+      throw createServicemeError(
+        "workspace_not_found",
+        "Skill catalog baseUrl is not configured."
+      );
     }
     const response = await this.fetchImpl(
       `${this.baseUrl}/api/v1/marketplace/skills`
@@ -10982,6 +10973,16 @@ var SkillStore = class {
   }
 };
 
+// src/bridge/marketplaceEnv.ts
+var SERVICEME_MARKETPLACE_BASE_URL_ENV = "SERVICEME_MARKETPLACE_BASE_URL";
+function readMarketplaceBaseUrl() {
+  const raw = process.env[SERVICEME_MARKETPLACE_BASE_URL_ENV];
+  if (typeof raw !== "string" || raw.length === 0) {
+    return void 0;
+  }
+  return raw;
+}
+
 // src/bridge/AgentBridgeHandler.ts
 function normalizeAgentIdOrThrow(store, remoteId) {
   try {
@@ -11025,10 +11026,7 @@ var AgentBridgeHandler = class {
           context.workspacePath,
           context.store.getWorkspaceAgentsRootPath(),
           `${agentId}.agent.md`
-        ) : path10.join(
-          context.store.getUserAgentsRootPath(),
-          `${agentId}.agent.md`
-        ) : void 0,
+        ) : path10.join(context.store.getUserAgentsRootPath(), `${agentId}.agent.md`) : void 0,
         canPublish: agent.canPublish,
         workspaceState: this.makeScopeState(
           "workspace",
@@ -11042,10 +11040,7 @@ var AgentBridgeHandler = class {
         userState: this.makeScopeState(
           "user",
           userInstalled,
-          path10.join(
-            context.store.getUserAgentsRootPath(),
-            `${agentId}.agent.md`
-          )
+          path10.join(context.store.getUserAgentsRootPath(), `${agentId}.agent.md`)
         )
       });
     }
@@ -11082,10 +11077,7 @@ var AgentBridgeHandler = class {
         userState: this.makeScopeState(
           "user",
           userSet.has(agentId),
-          path10.join(
-            context.store.getUserAgentsRootPath(),
-            `${agentId}.agent.md`
-          )
+          path10.join(context.store.getUserAgentsRootPath(), `${agentId}.agent.md`)
         )
       });
     }
@@ -11105,10 +11097,7 @@ var AgentBridgeHandler = class {
         hasConflict: false,
         tools: [],
         source: "local",
-        localAgentPath: path10.join(
-          context.store.getUserAgentsRootPath(),
-          `${agentId}.agent.md`
-        ),
+        localAgentPath: path10.join(context.store.getUserAgentsRootPath(), `${agentId}.agent.md`),
         workspaceState: this.makeScopeState(
           "workspace",
           workspaceSet.has(agentId),
@@ -11121,18 +11110,12 @@ var AgentBridgeHandler = class {
         userState: this.makeScopeState(
           "user",
           true,
-          path10.join(
-            context.store.getUserAgentsRootPath(),
-            `${agentId}.agent.md`
-          )
+          path10.join(context.store.getUserAgentsRootPath(), `${agentId}.agent.md`)
         )
       });
     }
     return {
-      configPath: path10.join(
-        context.workspacePath,
-        context.store.getWorkspaceStateFilePath()
-      ),
+      configPath: path10.join(context.workspacePath, context.store.getWorkspaceStateFilePath()),
       userAgentsPath: context.userAgentsRoot,
       agents: [...byId.values()].sort((a, b) => a.id.localeCompare(b.id)),
       installedAgentIds: [.../* @__PURE__ */ new Set([...workspaceAgentIds, ...userAgentIds])],
@@ -11179,7 +11162,10 @@ var AgentBridgeHandler = class {
       workspacePath: resolvedWorkspacePath,
       userAgentsRoot
     });
-    const catalogClient = new AgentCatalogClient();
+    const marketplaceBaseUrl = readMarketplaceBaseUrl();
+    const catalogClient = new AgentCatalogClient(
+      marketplaceBaseUrl ? { baseUrl: marketplaceBaseUrl } : {}
+    );
     const reconciler = new AgentReconciler({
       agentStore: store,
       catalogClient
@@ -11277,10 +11263,7 @@ tools:
     );
   }
   async readAgentContent(context, agentId, scope) {
-    const root = scope === "workspace" ? path10.join(
-      context.workspacePath,
-      context.store.getWorkspaceAgentsRootPath()
-    ) : context.store.getUserAgentsRootPath();
+    const root = scope === "workspace" ? path10.join(context.workspacePath, context.store.getWorkspaceAgentsRootPath()) : context.store.getUserAgentsRootPath();
     const candidates = [
       path10.join(root, `${agentId}.agent.md`),
       path10.join(root, agentId, `${agentId}.agent.md`)
@@ -11351,18 +11334,12 @@ var SkillBridgeHandler = class {
         hasScripts: skill.hasScripts,
         hasHooks: skill.hasHooks,
         source: skill.source,
-        localSkillPath: workspaceInstalled || userInstalled ? workspaceInstalled ? path11.join(
-          context.workspacePath,
-          context.store.getWorkspaceSkillPath(skillId)
-        ) : context.store.getUserSkillPath(skillId) : void 0,
+        localSkillPath: workspaceInstalled || userInstalled ? workspaceInstalled ? path11.join(context.workspacePath, context.store.getWorkspaceSkillPath(skillId)) : context.store.getUserSkillPath(skillId) : void 0,
         canPublish: skill.canPublish,
         workspaceState: this.makeScopeState(
           "workspace",
           workspaceInstalled,
-          path11.join(
-            context.workspacePath,
-            context.store.getWorkspaceSkillPath(skillId)
-          )
+          path11.join(context.workspacePath, context.store.getWorkspaceSkillPath(skillId))
         ),
         userState: this.makeScopeState(
           "user",
@@ -11393,10 +11370,7 @@ var SkillBridgeHandler = class {
         workspaceState: this.makeScopeState(
           "workspace",
           true,
-          path11.join(
-            context.workspacePath,
-            context.store.getWorkspaceSkillPath(skillId)
-          )
+          path11.join(context.workspacePath, context.store.getWorkspaceSkillPath(skillId))
         ),
         userState: this.makeScopeState(
           "user",
@@ -11424,23 +11398,13 @@ var SkillBridgeHandler = class {
         workspaceState: this.makeScopeState(
           "workspace",
           workspaceSet.has(skillId),
-          path11.join(
-            context.workspacePath,
-            context.store.getWorkspaceSkillPath(skillId)
-          )
+          path11.join(context.workspacePath, context.store.getWorkspaceSkillPath(skillId))
         ),
-        userState: this.makeScopeState(
-          "user",
-          true,
-          context.store.getUserSkillPath(skillId)
-        )
+        userState: this.makeScopeState("user", true, context.store.getUserSkillPath(skillId))
       });
     }
     return {
-      configPath: path11.join(
-        context.workspacePath,
-        context.store.getWorkspaceMarkerPath()
-      ),
+      configPath: path11.join(context.workspacePath, context.store.getWorkspaceMarkerPath()),
       userSkillsPath: context.userSkillsRoot,
       skills: [...byId.values()].sort((a, b) => a.id.localeCompare(b.id)),
       enabledSkillIds: [],
@@ -11494,10 +11458,7 @@ var SkillBridgeHandler = class {
       skills: workspaceSkillIds.map((skillId) => ({
         id: skillId,
         displayName: skillId,
-        path: path11.join(
-          context.workspacePath,
-          context.store.getWorkspaceSkillPath(skillId)
-        )
+        path: path11.join(context.workspacePath, context.store.getWorkspaceSkillPath(skillId))
       }))
     };
   }
@@ -11508,7 +11469,10 @@ var SkillBridgeHandler = class {
       workspacePath: resolvedWorkspacePath,
       userSkillsRoot
     });
-    const catalogClient = new SkillCatalogClient();
+    const marketplaceBaseUrl = readMarketplaceBaseUrl();
+    const catalogClient = new SkillCatalogClient(
+      marketplaceBaseUrl ? { baseUrl: marketplaceBaseUrl } : {}
+    );
     const reconciler = new SkillReconciler({
       skillStore: store,
       catalogClient
@@ -11594,9 +11558,7 @@ var TaskBridgeHandler = class {
   constructor(logger, emitEvent) {
     this.logger = logger;
     this.emitEvent = emitEvent;
-    this.engine = new TaskExecutionEngine(
-      (taskType) => getExecutor(taskType)
-    );
+    this.engine = new TaskExecutionEngine((taskType) => getExecutor(taskType));
     this.engine.setListener({
       onStarted: (params) => this.emitEvent("task.started", params),
       onOutput: (params) => this.emitEvent("task.output", params),
@@ -11733,10 +11695,7 @@ var BridgeServer = class {
           } catch (err) {
             const message = err instanceof Error ? err.message : String(err);
             if (message.includes("TASK_ALREADY_RUNNING")) {
-              this.writeError(
-                request.id,
-                createServicemeError("task_already_running", message)
-              );
+              this.writeError(request.id, createServicemeError("task_already_running", message));
             } else {
               this.writeError(request.id, err);
             }
@@ -11756,9 +11715,7 @@ var BridgeServer = class {
         }
         case "skill.marketplace-state": {
           const skillRequest = request;
-          const result = await this.skillHandler.getMarketplaceState(
-            skillRequest.params
-          );
+          const result = await this.skillHandler.getMarketplaceState(skillRequest.params);
           this.writeSuccess(request.id, result);
           return;
         }
@@ -11776,17 +11733,13 @@ var BridgeServer = class {
         }
         case "skill.publishable": {
           const skillRequest = request;
-          const result = await this.skillHandler.publishable(
-            skillRequest.params
-          );
+          const result = await this.skillHandler.publishable(skillRequest.params);
           this.writeSuccess(request.id, result);
           return;
         }
         case "agent.marketplace-state": {
           const agentRequest = request;
-          const result = await this.agentHandler.getMarketplaceState(
-            agentRequest.params
-          );
+          const result = await this.agentHandler.getMarketplaceState(agentRequest.params);
           this.writeSuccess(request.id, result);
           return;
         }
@@ -11798,19 +11751,14 @@ var BridgeServer = class {
         }
         case "agent.permissions": {
           const agentRequest = request;
-          const result = await this.agentHandler.permissions(
-            agentRequest.params
-          );
+          const result = await this.agentHandler.permissions(agentRequest.params);
           this.writeSuccess(request.id, result);
           return;
         }
         default:
           this.writeError(
             request.id,
-            createServicemeError(
-              "invalid_params",
-              "Unsupported bridge method."
-            )
+            createServicemeError("invalid_params", "Unsupported bridge method.")
           );
       }
     } catch (error) {