@orchagent/cli 0.3.68 → 0.3.69

package/dist/commands/run.js

@@ -407,7 +407,7 @@ async function buildInjectedPayload(options) {
     return { body: JSON.stringify(merged), sourceLabel };
 }
 // ─── Local execution helpers ────────────────────────────────────────────────
-async function downloadAgent(config, org, agent, version) {
+async function downloadAgent(config, org, agent, version, workspaceId) {
     // Try public endpoint first
     try {
         return await (0, api_1.publicRequest)(config, `/public/agents/${org}/${agent}/${version}/download`);
@@ -421,7 +421,7 @@ async function downloadAgent(config, org, agent, version) {
                 // Try owner path if authenticated
                 if (config.apiKey) {
                     try {
-                        const myAgents = await (0, api_1.listMyAgents)(config);
+                        const myAgents = await (0, api_1.listMyAgents)(config, workspaceId);
                         const matchingAgent = myAgents.find(a => a.name === agent && a.version === version && a.org_slug === org);
                         if (matchingAgent) {
                             // Owner! Fetch from authenticated endpoint
@@ -470,12 +470,12 @@ async function downloadAgent(config, org, agent, version) {
     if (!config.apiKey) {
         throw new api_1.ApiError(`Agent '${org}/${agent}@${version}' not found`, 404);
     }
-    const userOrg = await (0, api_1.getOrg)(config);
+    const userOrg = await (0, api_1.getOrg)(config, workspaceId);
     if (userOrg.slug !== org) {
         throw new api_1.ApiError(`Agent '${org}/${agent}@${version}' not found`, 404);
     }
     // Find agent in user's list
-    const agents = await (0, api_1.listMyAgents)(config);
+    const agents = await (0, api_1.listMyAgents)(config, workspaceId);
     const matching = agents.filter(a => a.name === agent);
     if (matching.length === 0) {
         throw new api_1.ApiError(`Agent '${org}/${agent}@${version}' not found`, 404);
@@ -1616,7 +1616,9 @@ async function executeCloud(agentRef, file, options) {
     if (!org) {
         throw new errors_1.CliError('Missing org. Use org/agent or set default org.');
     }
-    const agentMeta = await (0, api_1.getAgentWithFallback)(resolved, org, parsed.agent, parsed.version);
+    // Resolve workspace context for the target org
+    const workspaceId = await (0, api_1.resolveWorkspaceIdForOrg)(resolved, org);
+    const agentMeta = await (0, api_1.getAgentWithFallback)(resolved, org, parsed.agent, parsed.version, workspaceId);
     const cloudType = canonicalAgentType(agentMeta.type);
     const cloudEngine = resolveExecutionEngine({
         type: agentMeta.type,
@@ -1630,22 +1632,19 @@ async function executeCloud(agentRef, file, options) {
         const agentRequiredSecrets = agentMeta.required_secrets;
         if (agentRequiredSecrets?.length) {
             try {
-                const wsSlug = configFile.workspace;
-                if (wsSlug) {
-                    const { workspaces } = await (0, api_1.request)(resolved, 'GET', '/workspaces');
-                    const ws = workspaces.find((w) => w.slug === wsSlug);
-                    if (ws) {
-                        const secretsResult = await (0, api_1.request)(resolved, 'GET', `/workspaces/${ws.id}/secrets`);
-                        const existingNames = new Set(secretsResult.secrets.map((s) => s.name));
-                        const missing = agentRequiredSecrets.filter((s) => !existingNames.has(s));
-                        if (missing.length > 0) {
-                            throw new errors_1.CliError(`Agent requires secrets not found in workspace '${wsSlug}':\n` +
-                                missing.map((s) => `  - ${s}`).join('\n') + '\n\n' +
-                                `Set them before running:\n` +
-                                missing.map((s) => `  orch secrets set ${s} <value>`).join('\n') + '\n\n' +
-                                `Secrets are injected as environment variables into the agent sandbox.\n` +
-                                `View existing secrets: orch secrets list`);
-                        }
+                // Use already-resolved workspaceId (or fall back to config workspace slug)
+                const wsId = workspaceId ?? (configFile.workspace ? (await (0, api_1.resolveWorkspaceIdForOrg)(resolved, configFile.workspace)) : undefined);
+                if (wsId) {
+                    const secretsResult = await (0, api_1.request)(resolved, 'GET', `/workspaces/${wsId}/secrets`);
+                    const existingNames = new Set(secretsResult.secrets.map((s) => s.name));
+                    const missing = agentRequiredSecrets.filter((s) => !existingNames.has(s));
+                    if (missing.length > 0) {
+                        throw new errors_1.CliError(`Agent requires secrets not found in workspace '${org}':\n` +
+                            missing.map((s) => `  - ${s}`).join('\n') + '\n\n' +
+                            `Set them before running:\n` +
+                            missing.map((s) => `  orch secrets set ${s} <value>`).join('\n') + '\n\n' +
+                            `Secrets are injected as environment variables into the agent sandbox.\n` +
+                            `View existing secrets: orch secrets list`);
                     }
                 }
             }
@@ -1661,7 +1660,7 @@ async function executeCloud(agentRef, file, options) {
     if ((0, pricing_1.isPaidAgent)(agentMeta)) {
         let isOwner = false;
         try {
-            const callerOrg = await (0, api_1.getOrg)(resolved);
+            const callerOrg = await (0, api_1.getOrg)(resolved, workspaceId);
             const agentOrgId = agentMeta.org_id;
             const agentOrgSlug = agentMeta.org_slug;
             if (agentOrgId && callerOrg.id === agentOrgId) {
@@ -1714,6 +1713,9 @@ async function executeCloud(agentRef, file, options) {
         'X-CLI-Version': package_json_1.default.version,
         'X-OrchAgent-Client': 'cli',
     };
+    if (workspaceId) {
+        headers['X-Workspace-Id'] = workspaceId;
+    }
     if (options.tenant) {
         headers['X-OrchAgent-Tenant'] = options.tenant;
     }
@@ -2299,10 +2301,12 @@ async function executeLocal(agentRef, args, options) {
     if (!org) {
         throw new errors_1.CliError('Missing org. Use org/agent format.');
     }
+    // Resolve workspace context for the target org
+    const workspaceId = await (0, api_1.resolveWorkspaceIdForOrg)(resolved, org);
     // Download agent definition with spinner
     const agentData = await (0, spinner_1.withSpinner)(`Downloading ${org}/${parsed.agent}@${parsed.version}...`, async () => {
         try {
-            return await downloadAgent(resolved, org, parsed.agent, parsed.version);
+            return await downloadAgent(resolved, org, parsed.agent, parsed.version, workspaceId);
         }
         catch (err) {
             const agentMeta = await (0, api_1.getPublicAgent)(resolved, org, parsed.agent, parsed.version);

package/dist/commands/schedule.js

@@ -143,8 +143,8 @@ function registerScheduleCommand(program) {
         }
         const workspaceId = await resolveWorkspaceId(config, options.workspace);
         const ref = (0, agent_ref_1.parseAgentRef)(agentArg);
-        // Resolve agent to get the ID
-        const agent = await (0, api_2.getAgentWithFallback)(config, ref.org, ref.agent, ref.version);
+        // Resolve agent to get the ID (pass workspace context for private agents)
+        const agent = await (0, api_2.getAgentWithFallback)(config, ref.org, ref.agent, ref.version, workspaceId);
         // Parse input data
         let inputData;
         if (options.input) {

package/dist/lib/api.js

@@ -51,6 +51,7 @@ exports.downloadCodeBundle = downloadCodeBundle;
 exports.uploadCodeBundle = uploadCodeBundle;
 exports.getMyAgent = getMyAgent;
 exports.getAgentWithFallback = getAgentWithFallback;
+exports.resolveWorkspaceIdForOrg = resolveWorkspaceIdForOrg;
 exports.downloadCodeBundleAuthenticated = downloadCodeBundleAuthenticated;
 exports.checkAgentDelete = checkAgentDelete;
 exports.deleteAgent = deleteAgent;
@@ -290,8 +291,11 @@ async function updateOrg(config, payload) {
 async function getPublicAgent(config, org, agent, version) {
     return publicRequest(config, `/public/agents/${org}/${agent}/${version}`);
 }
-async function listMyAgents(config) {
-    return request(config, 'GET', '/agents');
+async function listMyAgents(config, workspaceId) {
+    const headers = {};
+    if (workspaceId)
+        headers['X-Workspace-Id'] = workspaceId;
+    return request(config, 'GET', '/agents', { headers });
 }
 async function createAgent(config, data, workspaceId) {
     const headers = { 'Content-Type': 'application/json' };
@@ -354,8 +358,8 @@ async function uploadCodeBundle(config, agentId, bundlePath, entrypoint, workspa
 /**
  * Get single agent by name/version from authenticated endpoint.
  */
-async function getMyAgent(config, agentName, version) {
-    const agents = await listMyAgents(config);
+async function getMyAgent(config, agentName, version, workspaceId) {
+    const agents = await listMyAgents(config, workspaceId);
     const matching = agents.filter(a => a.name === agentName);
     if (matching.length === 0)
         return null;
@@ -367,7 +371,7 @@ async function getMyAgent(config, agentName, version) {
 /**
  * Try public endpoint first, fallback to authenticated for private agents.
  */
-async function getAgentWithFallback(config, org, agentName, version) {
+async function getAgentWithFallback(config, org, agentName, version, workspaceId) {
     try {
         return await getPublicAgent(config, org, agentName, version);
     }
@@ -378,16 +382,31 @@ async function getAgentWithFallback(config, org, agentName, version) {
     if (!config.apiKey) {
         throw new ApiError(`Agent '${org}/${agentName}@${version}' not found`, 404);
     }
-    const userOrg = await getOrg(config);
+    const userOrg = await getOrg(config, workspaceId);
     if (userOrg.slug !== org) {
         throw new ApiError(`Agent '${org}/${agentName}@${version}' not found`, 404);
     }
-    const myAgent = await getMyAgent(config, agentName, version);
+    const myAgent = await getMyAgent(config, agentName, version, workspaceId);
     if (!myAgent) {
         throw new ApiError(`Agent '${org}/${agentName}@${version}' not found`, 404);
     }
     return myAgent;
 }
+/**
+ * Resolve a workspace ID from an org slug.
+ * Returns undefined for personal orgs or if unauthenticated.
+ */
+async function resolveWorkspaceIdForOrg(config, orgSlug) {
+    if (!config.apiKey)
+        return undefined;
+    try {
+        const { workspaces } = await request(config, 'GET', '/workspaces');
+        return workspaces.find(w => w.slug === orgSlug)?.id;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Download a tool bundle for a private agent using authenticated endpoint.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orchagent/cli",
-  "version": "0.3.68",
+  "version": "0.3.69",
   "description": "Command-line interface for orchagent — deploy and run AI agents for your team",
   "license": "MIT",
   "author": "orchagent <hello@orchagent.io>",