deepline 0.3.63 → 0.3.64

package/dist/cli/index.mjs

@@ -570,6 +570,8 @@ var ConfigError = class extends DeeplineError {
 // src/config.ts
 var HOST_URL_ENV = "DEEPLINE_HOST_URL";
 var API_KEY_ENV = "DEEPLINE_API_KEY";
+var ACTIVE_ORG_ID_ENV = "DEEPLINE_ACTIVE_ORG_ID";
+var ACTIVE_ORG_NAME_ENV = "DEEPLINE_ACTIVE_ORG_NAME";
 var PROD_URL = "https://code.deepline.com";
 var DEFAULT_TIMEOUT = 6e4;
 var DEFAULT_MAX_RETRIES = 3;
@@ -590,6 +592,12 @@ var COWORK_PROJECT_MARKERS = [
   "package.json",
   "pyproject.toml"
 ];
+var CLI_ENV_ALLOWED_KEYS = /* @__PURE__ */ new Set([
+  HOST_URL_ENV,
+  API_KEY_ENV,
+  ACTIVE_ORG_ID_ENV,
+  ACTIVE_ORG_NAME_ENV
+]);
 function baseUrlSlug(baseUrl) {
   let url;
   try {
@@ -616,7 +624,13 @@ function parseEnvFile(filePath) {
     if (eqIndex < 0) continue;
     const key = trimmed.slice(0, eqIndex).trim();
     let value = trimmed.slice(eqIndex + 1).trim();
-    if (value.length >= 2 && (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'"))) {
+    if (value.length >= 2 && value.startsWith('"') && value.endsWith('"')) {
+      try {
+        value = JSON.parse(value);
+      } catch {
+        value = value.slice(1, -1);
+      }
+    } else if (value.length >= 2 && value.startsWith("'") && value.endsWith("'")) {
       value = value.slice(1, -1);
     }
     if (key && value) {
@@ -774,6 +788,23 @@ function firstNonEmpty(...values) {
   }
   return "";
 }
+function formatEnvFileValue(value) {
+  return /^[a-zA-Z0-9_./:@%+=,-]+$/.test(value) ? value : JSON.stringify(value);
+}
+function mergePersistedEnvValues(existing, values) {
+  const merged = { ...existing, ...values };
+  const nextApiKey = values[API_KEY_ENV];
+  if (nextApiKey !== void 0 && nextApiKey !== existing[API_KEY_ENV] && values[ACTIVE_ORG_ID_ENV] === void 0) {
+    delete merged[ACTIVE_ORG_ID_ENV];
+    delete merged[ACTIVE_ORG_NAME_ENV];
+  }
+  return merged;
+}
+function persistedEnvLines(values) {
+  return Object.entries(values).filter(
+    ([key, value]) => CLI_ENV_ALLOWED_KEYS.has(key) && value.trim() !== ""
+  ).map(([key, value]) => `${key}=${formatEnvFileValue(value)}`);
+}
 function sdkCliConfigDir(baseUrl) {
   const home = process.env.HOME?.trim() || homedir();
   return join(home, ".local", "deepline", baseUrlSlug(baseUrl || PROD_URL));
@@ -806,9 +837,8 @@ function saveHostEnvValues(baseUrl, values) {
     mkdirSync(dir, { recursive: true });
   }
   const existing = parseEnvFile(filePath);
-  const merged = { ...existing, ...values };
-  const allowedKeys = /* @__PURE__ */ new Set([HOST_URL_ENV, API_KEY_ENV]);
-  const lines = Object.entries(merged).filter(([key, value]) => allowedKeys.has(key) && value !== "").map(([key, value]) => `${key}=${value}`);
+  const merged = mergePersistedEnvValues(existing, values);
+  const lines = persistedEnvLines(merged);
   writeFileSync(filePath, `${lines.join("\n")}
 `, "utf-8");
 }
@@ -884,12 +914,11 @@ function resolveConfig(options) {
 }
 function mergeProjectEnvFile(filePath, values) {
   const existing = parseEnvFile(filePath);
-  const merged = { ...existing, ...values };
+  const merged = mergePersistedEnvValues(existing, values);
   const dir = dirname(filePath);
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
   ensureProjectEnvIsIgnored(dir);
-  const allowedKeys = /* @__PURE__ */ new Set([HOST_URL_ENV, API_KEY_ENV]);
-  const lines = Object.entries(merged).filter(([key, value]) => allowedKeys.has(key) && value !== "").map(([key, value]) => `${key}=${value}`);
+  const lines = persistedEnvLines(merged);
   writeFileSync(filePath, `${lines.join("\n")}
 `, "utf-8");
 }
@@ -1055,6 +1084,71 @@ function resolveCliAuthProvenance(config, startDir = process.cwd()) {
     folderAuthPath: folderAuth?.filePath ?? null
   };
 }
+function activeOrganizationFromEnv(env) {
+  const orgId = env[ACTIVE_ORG_ID_ENV]?.trim();
+  if (!orgId) return null;
+  const orgName = env[ACTIVE_ORG_NAME_ENV]?.trim() || null;
+  return { org_id: orgId, org_name: orgName };
+}
+function resolveCliCommandContext(inputConfig, requestedScope) {
+  let config = inputConfig;
+  if (!config) {
+    try {
+      config = resolveConfig();
+    } catch {
+      return {
+        active_organization: null,
+        auth_scope: null,
+        metadata_source: null
+      };
+    }
+  }
+  const contextForScope = (scope) => {
+    if (scope === "env") {
+      const processApiKey = process.env[API_KEY_ENV]?.trim();
+      return processApiKey && processApiKey === config.apiKey ? {
+        active_organization: activeOrganizationFromEnv(process.env),
+        auth_scope: "env",
+        metadata_source: "process_env"
+      } : null;
+    }
+    if (scope === "folder") {
+      const projectAuth = getResolvedProjectAuthSource(
+        config.baseUrl,
+        config.apiKey
+      );
+      return projectAuth ? {
+        active_organization: activeOrganizationFromEnv(projectAuth.env),
+        auth_scope: "folder",
+        metadata_source: "folder_env"
+      } : null;
+    }
+    const hostEnv = loadCliEnv(config.baseUrl);
+    return (hostEnv[API_KEY_ENV] ?? "").trim() === config.apiKey ? {
+      active_organization: activeOrganizationFromEnv(hostEnv),
+      auth_scope: "global",
+      metadata_source: "host_env"
+    } : null;
+  };
+  const processContext = contextForScope("env");
+  if (processContext) return processContext;
+  if (requestedScope) {
+    return contextForScope(requestedScope) ?? {
+      active_organization: null,
+      auth_scope: requestedScope,
+      metadata_source: null
+    };
+  }
+  for (const scope of ["folder", "global"]) {
+    const context = contextForScope(scope);
+    if (context) return context;
+  }
+  return {
+    active_organization: null,
+    auth_scope: null,
+    metadata_source: null
+  };
+}
 
 // ../plays/artifact-contract-version.ts
 var CURRENT_PLAY_ARTIFACT_CONTRACT_VERSION = 2;
@@ -1105,7 +1199,7 @@ var SDK_RELEASE = {
   // available at toolResponse.rawV2 while toolResponse.raw and all declared
   // getters keep their established compatibility behavior.
   // 0.3.1 deprecated the legacy `deepline enrich` command in favor of Plays.
-  version: "0.3.63",
+  version: "0.3.64",
   updateSummary: "Automatic CLI updates are now enabled by default. To opt out, run `deepline settings autoupdate off`; use `deepline settings autoupdate on` to re-enable updates or `deepline settings autoupdate pin <version>` to hold an exact release. This release also adds raw-v2 tool responses at toolResponse.rawV2 while preserving existing toolResponse.raw and declared getters.",
   packageCapabilities: {
     updatePreferences: 1
@@ -7996,8 +8090,21 @@ function markdownTableFromRows(rows, preferredColumns = []) {
   return `${[header, separator, ...body].join("\n")}
 `;
 }
+function withAgentCommandContext(value) {
+  const valueRecord = value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+  return detectAgentRuntime() !== "unknown" && valueRecord && !Object.prototype.hasOwnProperty.call(valueRecord, "command_context") ? {
+    ...valueRecord,
+    command_context: resolveCliCommandContext()
+  } : value;
+}
 function printJson(value) {
-  process.stdout.write(`${JSON.stringify(value, null, 2)}
+  process.stdout.write(
+    `${JSON.stringify(withAgentCommandContext(value), null, 2)}
+`
+  );
+}
+function printCompactJson(value) {
+  process.stdout.write(`${JSON.stringify(withAgentCommandContext(value))}
 `);
 }
 function errorToJsonPayload(error) {
@@ -8221,7 +8328,9 @@ function shouldWaitForRegisterClaim(mode) {
 function saveEnvValues(values, baseUrl, scope) {
   const filtered = {
     ...values[HOST_URL_ENV] ? { [HOST_URL_ENV]: values[HOST_URL_ENV] } : {},
-    ...values[API_KEY_ENV] ? { [API_KEY_ENV]: values[API_KEY_ENV] } : {}
+    ...values[API_KEY_ENV] ? { [API_KEY_ENV]: values[API_KEY_ENV] } : {},
+    ...values[ACTIVE_ORG_ID_ENV] ? { [ACTIVE_ORG_ID_ENV]: values[ACTIVE_ORG_ID_ENV] } : {},
+    ...Object.prototype.hasOwnProperty.call(values, ACTIVE_ORG_NAME_ENV) ? { [ACTIVE_ORG_NAME_ENV]: values[ACTIVE_ORG_NAME_ENV] } : {}
   };
   if (scope === "folder") {
     saveProjectDeeplineEnvValues(filtered);
@@ -8229,6 +8338,15 @@ function saveEnvValues(values, baseUrl, scope) {
     saveHostEnvValues(baseUrl, filtered);
   }
 }
+function activeOrgEnvValues(data) {
+  const orgId = typeof data.org_id === "string" ? data.org_id.trim() : "";
+  if (!orgId) return {};
+  const orgName = typeof data.org_name === "string" ? data.org_name.trim() : "";
+  return {
+    [ACTIVE_ORG_ID_ENV]: orgId,
+    [ACTIVE_ORG_NAME_ENV]: orgName
+  };
+}
 async function httpJson(method, url, apiKey, body) {
   const headers = {
     "Content-Type": "application/json",
@@ -8464,7 +8582,8 @@ async function handleRegister(args) {
         saveEnvValues(
           {
             [HOST_URL_ENV]: baseUrl,
-            [API_KEY_ENV]: apiKey
+            [API_KEY_ENV]: apiKey,
+            ...activeOrgEnvValues(statusData)
           },
           baseUrl,
           authScope
@@ -8545,7 +8664,8 @@ async function handleWait(args) {
         saveEnvValues(
           {
             [HOST_URL_ENV]: baseUrl,
-            [API_KEY_ENV]: apiKey
+            [API_KEY_ENV]: apiKey,
+            ...activeOrgEnvValues(data)
           },
           baseUrl,
           authScope
@@ -8728,7 +8848,8 @@ async function handleStatus(args) {
       saveEnvValues(
         {
           [HOST_URL_ENV]: baseUrl,
-          [API_KEY_ENV]: apiKeyResp
+          [API_KEY_ENV]: apiKeyResp,
+          ...activeOrgEnvValues(data)
         },
         baseUrl,
         resolvedAuthScope
@@ -8744,6 +8865,12 @@ async function handleStatus(args) {
   printCommandEnvelope(
     {
       ...payload,
+      ...detectAgentRuntime() !== "unknown" ? {
+        command_context: resolveCliCommandContext(
+          { baseUrl, apiKey },
+          resolvedAuthScope
+        )
+      } : {},
       ...savedApiKeyPath ? { saved_api_key_path: savedApiKeyPath } : {},
       render: {
         sections: [
@@ -21695,8 +21822,7 @@ async function handlePlayCheck(args) {
         note: "Named/prebuilt play contract is available. No run was started."
       };
       if (options.jsonOutput) {
-        process.stdout.write(`${JSON.stringify(result)}
-`);
+        printCompactJson(result);
       } else {
         console.log(`\u2713 ${result.reference} passed named play contract check`);
         console.log("  no run started; no Deepline credits spent");
@@ -21714,14 +21840,11 @@ async function handlePlayCheck(args) {
       const resolved = resolve11(options.target);
       const message = error instanceof Error && error.message ? error.message : `File not found: ${resolved}`;
       if (options.jsonOutput) {
-        process.stdout.write(
-          `${JSON.stringify({
-            valid: false,
-            target: options.target,
-            errors: [message]
-          })}
-`
-        );
+        printCompactJson({
+          valid: false,
+          target: options.target,
+          errors: [message]
+        });
       } else {
         console.error(message);
       }
@@ -21744,8 +21867,7 @@ async function handlePlayCheck(args) {
   }
   const merged = mergePlayCheckExportOutcomes(outcomes);
   if (options.jsonOutput) {
-    process.stdout.write(`${JSON.stringify(merged.json)}
-`);
+    printCompactJson(merged.json);
   } else {
     printPlayCheckOutcomes(outcomes, options.target);
   }
@@ -22956,21 +23078,18 @@ async function handlePlayGet(args) {
   }
   const loadedMessage = materializedFile ? formatLoadedPlayMessage(materializedFile) : null;
   if (jsonOutput) {
-    process.stdout.write(
-      `${JSON.stringify({
-        ...detail,
-        ...materializedFile ? {
-          message: loadedMessage,
-          materializedFile: {
-            path: materializedFile.path,
-            created: materializedFile.created,
-            status: materializedFile.status,
-            message: loadedMessage
-          }
-        } : {}
-      })}
-`
-    );
+    printCompactJson({
+      ...detail,
+      ...materializedFile ? {
+        message: loadedMessage,
+        materializedFile: {
+          path: materializedFile.path,
+          created: materializedFile.created,
+          status: materializedFile.status,
+          message: loadedMessage
+        }
+      } : {}
+    });
     return 0;
   }
   if (sourceOutput) {
@@ -23055,8 +23174,7 @@ async function handlePlayVersions(args) {
     parseReferencedPlayTarget2(playName).playName
   );
   if (jsonOutput) {
-    process.stdout.write(`${JSON.stringify({ versions })}
-`);
+    printCompactJson({ versions });
     return 0;
   }
   if (versions.length === 0) {
@@ -23142,13 +23260,11 @@ async function handlePlayPin(args, pinned) {
   const name = parsedTarget.playName;
   const plan = { name, pinned, dryRun };
   if (dryRun) {
-    process.stdout.write(`${JSON.stringify(plan)}
-`);
+    printCompactJson(plan);
     return 0;
   }
   const result = await new DeeplineClient().setPlayPinned(name, pinned);
-  if (jsonOutput) process.stdout.write(`${JSON.stringify(result)}
-`);
+  if (jsonOutput) printCompactJson(result);
   else console.log(`${result.pinned ? "Pinned" : "Unpinned"} ${result.name}.`);
   return 0;
 }
@@ -23350,21 +23466,18 @@ async function handlePlaySearch(args) {
       ...play,
       inputSchema: compactPlaySchema(play.inputSchema)
     })) : plays;
-    process.stdout.write(
-      `${JSON.stringify({
-        disclaimer,
-        search_policy: {
-          default_scope: "prebuilt",
-          included_origins: options.scope === "all" ? ["prebuilt", "owned"] : ["prebuilt"],
-          owned_plays_omitted: options.scope === "prebuilt",
-          include_owned_flag: "--all"
-        },
-        plays: jsonPlays,
-        total: jsonPlays.length,
-        truncated: false
-      })}
-`
-    );
+    printCompactJson({
+      disclaimer,
+      search_policy: {
+        default_scope: "prebuilt",
+        included_origins: options.scope === "all" ? ["prebuilt", "owned"] : ["prebuilt"],
+        owned_plays_omitted: options.scope === "prebuilt",
+        include_owned_flag: "--all"
+      },
+      plays: jsonPlays,
+      total: jsonPlays.length,
+      truncated: false
+    });
     return 0;
   }
   const displayPlays = options.scope === "prebuilt" ? plays.slice(0, 5) : plays;
@@ -23453,15 +23566,12 @@ async function handlePlayGrep(args) {
     )
   ).map((play) => summarizePlayListItemForCli(play, { compact }));
   if (argsWantJson(args)) {
-    process.stdout.write(
-      `${JSON.stringify({
-        plays,
-        count: plays.length,
-        query,
-        grep: { mode, terms: parsePlayGrepTerms(query, mode) }
-      })}
-`
-    );
+    printCompactJson({
+      plays,
+      count: plays.length,
+      query,
+      grep: { mode, terms: parsePlayGrepTerms(query, mode) }
+    });
     return 0;
   }
   process.stdout.write(`${plays.length} plays found:
@@ -23507,14 +23617,11 @@ async function handlePlayDescribe(args) {
       ...definedName ? [`deepline plays describe <workspace>/${definedName}`] : []
     ];
     if (argsWantJson(args)) {
-      process.stdout.write(
-        `${JSON.stringify({
-          ok: false,
-          error: { message },
-          next
-        })}
-`
-      );
+      printCompactJson({
+        ok: false,
+        error: { message },
+        next
+      });
     } else {
       console.error(message);
       console.error(`Try: ${next[0]}`);
@@ -23535,8 +23642,7 @@ async function handlePlayDescribe(args) {
     }
   );
   if (argsWantJson(args)) {
-    process.stdout.write(`${JSON.stringify(play)}
-`);
+    printCompactJson(play);
     return 0;
   }
   printPlayDescription(play);
@@ -23580,8 +23686,7 @@ async function handlePlaySave(args) {
       next: `deepline plays check ${shellQuote2(options.target)}`
     };
     if (options.jsonOutput) {
-      process.stdout.write(`${JSON.stringify(result)}
-`);
+      printCompactJson(result);
     } else {
       console.error(result.message);
       console.error(`  checked artifact: ${result.expectedArtifactHash}`);
@@ -23603,8 +23708,7 @@ async function handlePlaySave(args) {
   };
   if (options.dryRun) {
     if (options.jsonOutput) {
-      process.stdout.write(`${JSON.stringify(dryRun)}
-`);
+      printCompactJson(dryRun);
     } else {
       console.log(`Dry run: ${playName}`);
       console.log(`  source: ${dryRun.sourceHash}`);
@@ -23649,8 +23753,7 @@ async function handlePlaySave(args) {
       }
     };
     if (options.jsonOutput) {
-      process.stdout.write(`${JSON.stringify(result)}
-`);
+      printCompactJson(result);
     } else {
       console.log(
         `\u2713 Saved ${playName} working draft as v${result.version ?? "?"}`
@@ -23708,8 +23811,7 @@ async function handlePlayPublish(args) {
         next: `deepline plays check ${shellQuote2(playName)}`
       };
       if (options.jsonOutput) {
-        process.stdout.write(`${JSON.stringify(result3)}
-`);
+        printCompactJson(result3);
       } else {
         console.error(result3.message);
         console.error(`  checked artifact: ${result3.expectedArtifactHash}`);
@@ -23732,8 +23834,7 @@ async function handlePlayPublish(args) {
     };
     if (options.dryRun) {
       if (options.jsonOutput) {
-        process.stdout.write(`${JSON.stringify(dryRun)}
-`);
+        printCompactJson(dryRun);
       } else {
         console.log(`Dry run: ${rootPlayName}`);
         console.log(`  source: ${dryRun.sourceHash}`);
@@ -23801,8 +23902,7 @@ async function handlePlayPublish(args) {
       triggerBindings: published.triggerBindings ?? []
     };
     if (options.jsonOutput) {
-      process.stdout.write(`${JSON.stringify(result2)}
-`);
+      printCompactJson(result2);
     } else {
       printPublishReceipt({
         name: rootPlayName,
@@ -23833,8 +23933,7 @@ async function handlePlayPublish(args) {
       revisionId: revisionId ?? null,
       latest: useLatest
     };
-    process.stdout.write(`${JSON.stringify(result2)}
-`);
+    printCompactJson(result2);
     return 0;
   }
   const resolvedName = parseReferencedPlayTarget2(playName).playName;
@@ -23858,8 +23957,7 @@ async function handlePlayPublish(args) {
     revisionId ? { revisionId } : {}
   );
   if (options.jsonOutput) {
-    process.stdout.write(`${JSON.stringify(result)}
-`);
+    printCompactJson(result);
   } else {
     printPublishReceipt({
       name: result.name,
@@ -23924,8 +24022,7 @@ async function handlePlayDelete(args) {
       plannedMutation: "move saved org-owned play to Trash and stop triggers"
     };
     if (argsWantJson(args)) {
-      process.stdout.write(`${JSON.stringify(result2)}
-`);
+      printCompactJson(result2);
     } else {
       process.stdout.write(
         `Dry run: would move ${result2.name} to Trash and stop its active triggers.
@@ -23936,8 +24033,7 @@ async function handlePlayDelete(args) {
   }
   const result = await client2.deletePlay(resolvedName);
   if (argsWantJson(args)) {
-    process.stdout.write(`${JSON.stringify(result)}
-`);
+    printCompactJson(result);
     return result.archived || result.alreadyArchived ? 0 : 4;
   }
   if (result.alreadyArchived) {
@@ -23982,8 +24078,7 @@ async function handlePlayRestore(args) {
       parseReferencedPlayTarget2(playName).playName
     );
     if (argsWantJson(args)) {
-      process.stdout.write(`${JSON.stringify(result)}
-`);
+      printCompactJson(result);
       return result.restored || result.alreadyActive ? 0 : 4;
     }
     if (result.alreadyActive) {
@@ -24869,8 +24964,7 @@ async function handlePlayShareStatus(args) {
   const status = await new DeeplineClient().getSharePage(name);
   const outputStatus = shareStatusForOutput(status);
   if (argsWantJson(args)) {
-    process.stdout.write(`${JSON.stringify(outputStatus)}
-`);
+    printCompactJson(outputStatus);
     return 0;
   }
   if (!outputStatus.share) {
@@ -24941,10 +25035,12 @@ async function handlePlaySharePublish(args) {
     if (!hasCompleted) {
       const message = `No completed run for ${name}. Publish a play only after it has run successfully. (Override with --no-run-check.)`;
       if (argsWantJson(args)) {
-        process.stdout.write(
-          `${JSON.stringify({ ok: false, code: "NO_SUCCESSFUL_RUN", message, next: `deepline plays run ${name} --wait` })}
-`
-        );
+        printCompactJson({
+          ok: false,
+          code: "NO_SUCCESSFUL_RUN",
+          message,
+          next: `deepline plays run ${name} --wait`
+        });
       } else {
         console.error(message);
         console.error(`  deepline plays run ${name} --wait`);
@@ -24964,8 +25060,7 @@ async function handlePlaySharePublish(args) {
   if (args.includes("--dry-run")) {
     const plan = { dryRun: true, name, version: resolvedVersion, ...request };
     if (argsWantJson(args)) {
-      process.stdout.write(`${JSON.stringify(plan)}
-`);
+      printCompactJson(plan);
     } else {
       console.log(
         `Would publish ${name}${resolvedVersion ? ` v${resolvedVersion}` : ""} (revision ${revisionId}).`
@@ -24976,8 +25071,7 @@ async function handlePlaySharePublish(args) {
   const status = await client2.publishSharePage(name, request);
   const outputStatus = shareStatusForOutput(status);
   if (argsWantJson(args)) {
-    process.stdout.write(`${JSON.stringify(outputStatus)}
-`);
+    printCompactJson(outputStatus);
     return 0;
   }
   const urls = shareUrlFields(outputStatus);
@@ -25010,8 +25104,7 @@ async function handlePlayShareUpdate(args) {
   };
   const status = await new DeeplineClient().updateSharePage(name, request);
   if (argsWantJson(args)) {
-    process.stdout.write(`${JSON.stringify(status)}
-`);
+    printCompactJson(status);
     return 0;
   }
   console.log(`Updated ${name} share settings.`);
@@ -25044,8 +25137,7 @@ async function handlePlayShareRegenerate(args) {
   );
   const outputStatus = shareStatusForOutput(status);
   if (argsWantJson(args)) {
-    process.stdout.write(`${JSON.stringify(outputStatus)}
-`);
+    printCompactJson(outputStatus);
     return 0;
   }
   const urls = shareUrlFields(outputStatus);
@@ -25072,8 +25164,7 @@ async function handlePlayShareUnpublish(args) {
   const name = parseReferencedPlayTarget2(target).playName;
   const status = await new DeeplineClient().unpublishSharePage(name);
   if (argsWantJson(args)) {
-    process.stdout.write(`${JSON.stringify(status)}
-`);
+    printCompactJson(status);
     return 0;
   }
   console.log(`Unpublished ${name}; the public page has been removed.`);
@@ -33640,6 +33731,27 @@ function redactApiKey(value) {
 function processEnvValue(name) {
   return process.env[name]?.trim() ?? "";
 }
+function organizationAuthValues(input2) {
+  return {
+    [HOST_URL_ENV]: input2.baseUrl,
+    [API_KEY_ENV]: input2.apiKey,
+    [ACTIVE_ORG_ID_ENV]: input2.orgId,
+    [ACTIVE_ORG_NAME_ENV]: input2.orgName
+  };
+}
+function organizationCommandContext(input2) {
+  return {
+    active_organization: {
+      org_id: input2.orgId,
+      org_name: input2.orgName
+    },
+    auth_scope: input2.authScope,
+    metadata_source: input2.authScope === "folder" ? "folder_env" : "host_env"
+  };
+}
+function agentCommandContext(commandContext) {
+  return detectAgentRuntime() !== "unknown" ? { command_context: commandContext } : {};
+}
 function resolveOrgSwitchAuthTarget(scope, config) {
   const activeProject = getResolvedProjectAuthSource(
     config.baseUrl,
@@ -33836,10 +33948,16 @@ async function handleOrgSwitch(selection, options) {
   const config = resolveConfig();
   const provenance = resolveCliAuthProvenance(config);
   if (!selection && !options.orgId && authScope === "folder" && provenance.scope === "global" && provenance.project.state === "project") {
+    const commandContext = resolveCliCommandContext(config);
+    const activeOrganization = commandContext.active_organization;
     const project_env_paths2 = saveProjectDeeplineEnvValues(
       {
         [HOST_URL_ENV]: config.baseUrl,
-        [API_KEY_ENV]: config.apiKey
+        [API_KEY_ENV]: config.apiKey,
+        ...activeOrganization ? {
+          [ACTIVE_ORG_ID_ENV]: activeOrganization.org_id,
+          [ACTIVE_ORG_NAME_ENV]: activeOrganization.org_name ?? ""
+        } : {}
       },
       provenance.project.dir
     );
@@ -33850,6 +33968,13 @@ async function handleOrgSwitch(selection, options) {
         requested_auth_scope: "folder",
         effective_auth_scope: "folder",
         auth_scope: "folder",
+        ...agentCommandContext(
+          activeOrganization ? organizationCommandContext({
+            orgId: activeOrganization.org_id,
+            orgName: activeOrganization.org_name,
+            authScope: "folder"
+          }) : resolveCliCommandContext(config, "folder")
+        ),
         project_env_paths: project_env_paths2,
         next: { status: "deepline org status --json" },
         render: {
@@ -33912,10 +34037,12 @@ async function handleOrgSwitch(selection, options) {
   const authTarget = resolveOrgSwitchAuthTarget(authScope, config);
   if (target.is_current) {
     let project_env_paths2 = [];
-    const authValues2 = {
-      [HOST_URL_ENV]: config.baseUrl,
-      [API_KEY_ENV]: config.apiKey
-    };
+    const authValues2 = organizationAuthValues({
+      baseUrl: config.baseUrl,
+      apiKey: config.apiKey,
+      orgId: target.org_id,
+      orgName: target.name
+    });
     if (authTarget.kind === "folder") {
       project_env_paths2 = saveProjectDeeplineEnvValues(authValues2);
     } else {
@@ -33952,6 +34079,13 @@ async function handleOrgSwitch(selection, options) {
         effective_auth_scope: authTarget.effective_scope,
         auth_scope_reason: authTarget.reason,
         auth_scope: authTarget.effective_scope,
+        ...agentCommandContext(
+          organizationCommandContext({
+            orgId: target.org_id,
+            orgName: target.name,
+            authScope: authTarget.effective_scope
+          })
+        ),
         host_env_path: authTarget.kind === "global" ? hostEnvFilePath(config.baseUrl) : null,
         project_env_paths: project_env_paths2,
         deprecated_command: options.deprecatedSwitch ? "org switch" : null,
@@ -33970,18 +34104,16 @@ async function handleOrgSwitch(selection, options) {
     org_id: target.org_id
   });
   let project_env_paths = [];
-  const authValues = {
-    [HOST_URL_ENV]: config.baseUrl,
-    [API_KEY_ENV]: switched.api_key
-  };
+  const authValues = organizationAuthValues({
+    baseUrl: config.baseUrl,
+    apiKey: switched.api_key,
+    orgId: switched.org_id,
+    orgName: switched.org_name
+  });
   if (authTarget.kind === "folder") {
     project_env_paths = saveProjectDeeplineEnvValues(authValues);
   } else {
-    saveHostEnvValues(config.baseUrl, {
-      ...authValues,
-      DEEPLINE_ACTIVE_ORG_ID: switched.org_id,
-      DEEPLINE_ACTIVE_ORG_NAME: switched.org_name
-    });
+    saveHostEnvValues(config.baseUrl, authValues);
   }
   const { api_key: _apiKey, ...publicSwitched } = switched;
   const renderLines = [`Switched to ${switched.org_name}.`];
@@ -34016,6 +34148,13 @@ async function handleOrgSwitch(selection, options) {
       effective_auth_scope: authTarget.effective_scope,
       auth_scope_reason: authTarget.reason,
       auth_scope: authTarget.effective_scope,
+      ...agentCommandContext(
+        organizationCommandContext({
+          orgId: switched.org_id,
+          orgName: switched.org_name,
+          authScope: authTarget.effective_scope
+        })
+      ),
       deprecated_command: options.deprecatedSwitch ? "org switch" : null,
       replacement_command: options.deprecatedSwitch ? "deepline org set" : null,
       warnings,
@@ -34038,15 +34177,13 @@ async function handleOrgCreate(name, options) {
     api_key: config.apiKey,
     name
   });
-  const authValues = {
-    [HOST_URL_ENV]: config.baseUrl,
-    [API_KEY_ENV]: created.api_key
-  };
-  saveHostEnvValues(config.baseUrl, {
-    ...authValues,
-    DEEPLINE_ACTIVE_ORG_ID: created.org_id,
-    DEEPLINE_ACTIVE_ORG_NAME: created.org_name
+  const authValues = organizationAuthValues({
+    baseUrl: config.baseUrl,
+    apiKey: created.api_key,
+    orgId: created.org_id,
+    orgName: created.org_name
   });
+  saveHostEnvValues(config.baseUrl, authValues);
   const { api_key: _apiKey, ...publicCreated } = created;
   printCommandEnvelope(
     {
@@ -34055,6 +34192,13 @@ async function handleOrgCreate(name, options) {
       api_key_saved: true,
       switched: true,
       host_env_path: hostEnvFilePath(config.baseUrl),
+      ...agentCommandContext(
+        organizationCommandContext({
+          orgId: created.org_id,
+          orgName: created.org_name,
+          authScope: "global"
+        })
+      ),
       render: {
         sections: [
           {
@@ -39962,26 +40106,20 @@ async function getTool(toolId, options = {}) {
     return 2;
   }
   if (options.contractJson) {
-    process.stdout.write(
-      `${JSON.stringify({
-        ...toolContractJsonForDescribe(tool, toolId),
-        ...modelDescription ? { modelOptions: modelDescription } : {},
-        ...inferenceQuote ? { inferenceQuote } : {}
-      })}
-`
-    );
+    printCompactJson({
+      ...toolContractJsonForDescribe(tool, toolId),
+      ...modelDescription ? { modelOptions: modelDescription } : {},
+      ...inferenceQuote ? { inferenceQuote } : {}
+    });
     return 0;
   }
   const emitJson = options.json === true;
   if (emitJson) {
-    process.stdout.write(
-      `${JSON.stringify({
-        ...toolMetadataJsonForDescribe(tool, toolId),
-        ...modelDescription ? { modelOptions: modelDescription } : {},
-        ...inferenceQuote ? { inferenceQuote } : {}
-      })}
-`
-    );
+    printCompactJson({
+      ...toolMetadataJsonForDescribe(tool, toolId),
+      ...modelDescription ? { modelOptions: modelDescription } : {},
+      ...inferenceQuote ? { inferenceQuote } : {}
+    });
     return 0;
   }
   const onlyModes = [
@@ -40026,14 +40164,11 @@ ${formatModelDescription(modelDescription)}`);
     return 0;
   }
   if (shouldEmitJson()) {
-    process.stdout.write(
-      `${JSON.stringify({
-        ...toolContractJsonForDescribe(tool, toolId),
-        ...modelDescription ? { modelOptions: modelDescription } : {},
-        ...inferenceQuote ? { inferenceQuote } : {}
-      })}
-`
-    );
+    printCompactJson({
+      ...toolContractJsonForDescribe(tool, toolId),
+      ...modelDescription ? { modelOptions: modelDescription } : {},
+      ...inferenceQuote ? { inferenceQuote } : {}
+    });
     return 0;
   }
   printCompactToolContract(tool, toolId);
@@ -42704,8 +42839,7 @@ Examples:
   ).action(async (options) => {
     const data = await runPreflightCheck();
     if (shouldEmitJson(options.json)) {
-      process.stdout.write(`${JSON.stringify(data, null, 2)}
-`);
+      printJson(data);
     } else {
       printPreflightHuman(data);
     }
@@ -42730,14 +42864,12 @@ Examples:
     try {
       if (options.playRunner) {
         const data2 = await runPlayRunnerHealthCheck();
-        process.stdout.write(`${JSON.stringify(data2, null, 2)}
-`);
+        printJson(data2);
         return;
       }
       const client2 = new DeeplineClient();
       const data = await client2.health();
-      process.stdout.write(`${JSON.stringify(data, null, 2)}
-`);
+      printJson(data);
     } catch (error) {
       throw new Error(
         `Cannot reach Deepline API: ${error instanceof Error ? error.message : String(error)}`
@@ -42758,8 +42890,7 @@ Examples:
 `
   ).option("--json", "Emit JSON output").action((options) => {
     if (options.json) {
-      process.stdout.write(`${JSON.stringify({ version: SDK_VERSION })}
-`);
+      printCompactJson({ version: SDK_VERSION });
       return;
     }
     process.stdout.write(`deepline ${SDK_VERSION}