primcli 1.74.1 → 3.0.0-preview.1

package/dist/{cli-config-C0Y_Ppol.js → cli-config-Ms_0vNjq.js}

@@ -1,10 +1,10 @@
-import { n as createConfig, t as createClient } from "./client.gen-CaaMP86o.js";
-import { c as mailTime, d as readMailJson, h as writeMailJson, i as mailId, l as privateMailDirectory, o as mailObject, r as mailAddress, s as mailString } from "./shared-mail-files-CZfm7E2k.js";
+import { n as createConfig, t as createClient } from "./client.gen-6rZvmHfx.js";
+import { c as mailTime, d as readMailJson, h as writeMailJson, i as mailId, l as privateMailDirectory, o as mailObject, r as mailAddress, s as mailString } from "./shared-mail-files-BAQSGxxz.js";
 import { Errors } from "@oclif/core";
 import { chmodSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { dirname, join } from "node:path";
-//#region ../packages/api-core/src/client.ts
+// ../packages/api-core/src/client.ts
 /**
 * Host-aware Primitive API client and shared error type.
 *
@@ -38,8 +38,7 @@ var PrimitiveApiClient = class {
 		return this.client.setConfig(config);
 	}
 };
-//#endregion
-//#region src/oclif/connected-agent-profile.ts
+// src/oclif/connected-agent-profile.ts
 const AGENT_PROFILE_ENV = "PRIMITIVE_AGENT_PROFILE";
 /**
 * The selected agent's email address, exported next to AGENT_PROFILE_ENV for
@@ -192,8 +191,7 @@ function profileAlreadyConnectedMessage(profileName, address) {
 		`If they choose to disconnect it, run \`primitive agent disconnect --profile ${profileName}\` (or rerun this command with --replace-existing when it is bound to this session), then connect again. If they want a second address on purpose, rerun with a new --profile and --keep-existing.`
 	].join(" ");
 }
-//#endregion
-//#region src/oclif/chat-state.ts
+// src/oclif/chat-state.ts
 const CHAT_STATE_FILE = "chat-state.json";
 const CHAT_STATE_VERSION = 2;
 const MAX_CONVERSATIONS = 50;
@@ -355,8 +353,7 @@ function saveActiveChatState(configDir, input, options = {}) {
 	});
 	return conversation;
 }
-//#endregion
-//#region src/oclif/auth.ts
+// src/oclif/auth.ts
 const CREDENTIALS_FILE = "credentials.json";
 const CREDENTIALS_LOCK_DIR = "credentials.lock";
 const CREDENTIALS_LOCK_OWNER_FILE = "owner.json";
@@ -394,6 +391,7 @@ var LegacyApiKeyCredentialFormatError = class extends Error {
 };
 function parseCredentials(raw) {
 	if (!isRecord$1(raw)) throw new Error(`Stored Primitive CLI credentials are malformed: expected a JSON object. ${MALFORMED_CREDENTIALS_HINT}`);
+	if (raw.auth_method === "user_grant") return parseUserGrantCredentials(raw);
 	if (raw.auth_method !== "oauth") {
 		if (typeof raw.api_key === "string" || typeof raw.key_id === "string" || typeof raw.base_url === "string") throw new LegacyApiKeyCredentialFormatError();
 		throw new Error(`Stored Primitive CLI credentials are malformed: auth_method must be oauth. ${MALFORMED_CREDENTIALS_HINT}`);
@@ -415,6 +413,63 @@ function parseCredentials(raw) {
 		created_at: requireString(raw, "created_at")
 	};
 }
+function malformed(detail) {
+	return /* @__PURE__ */ new Error(`Stored Primitive CLI credentials are malformed: ${detail}. ${MALFORMED_CREDENTIALS_HINT}`);
+}
+function requireText(value, key, options = {}) {
+	const raw = value[key];
+	if (typeof raw !== "string" || !options.allowEmpty && raw.trim().length === 0) throw malformed(`${key} must be a non-empty string`);
+	return raw;
+}
+function nullableText(value, key) {
+	const raw = value[key];
+	if (raw === void 0 || raw === null) return null;
+	if (typeof raw !== "string") throw malformed(`${key} must be a string or null`);
+	return raw;
+}
+function parseOrgToken(raw) {
+	if (!isRecord$1(raw)) throw malformed("user_grant.org_tokens entries must be objects");
+	return {
+		access_token: requireText(raw, "access_token"),
+		expires_at: requireText(raw, "expires_at"),
+		oauth_grant_id: requireText(raw, "oauth_grant_id"),
+		org_id: requireText(raw, "org_id"),
+		org_name: nullableText(raw, "org_name"),
+		role: nullableText(raw, "role")
+	};
+}
+function parseUserGrantCredentials(raw) {
+	const grantRaw = raw.user_grant;
+	if (!isRecord$1(grantRaw)) throw malformed("user_grant must be an object");
+	if (raw.token_type !== "Bearer") throw malformed("token_type must be Bearer");
+	const tokensRaw = grantRaw.org_tokens ?? {};
+	if (!isRecord$1(tokensRaw)) throw malformed("user_grant.org_tokens must be an object");
+	const orgTokens = {};
+	for (const [orgId, token] of Object.entries(tokensRaw)) orgTokens[orgId] = parseOrgToken(token);
+	const orgId = requireText(raw, "org_id", { allowEmpty: true });
+	return {
+		access_token: requireText(raw, "access_token", { allowEmpty: true }),
+		api_base_url: readStoredApiBaseUrl(raw),
+		auth_method: "user_grant",
+		created_at: requireText(raw, "created_at"),
+		expires_at: requireText(raw, "expires_at"),
+		oauth_client_id: requireText(raw, "oauth_client_id"),
+		oauth_grant_id: requireText(raw, "oauth_grant_id", { allowEmpty: true }),
+		org_id: orgId,
+		org_name: nullableText(raw, "org_name"),
+		refresh_token: requireText(raw, "refresh_token"),
+		token_type: "Bearer",
+		user_grant: {
+			access_token: requireText(grantRaw, "access_token"),
+			expires_at: requireText(grantRaw, "expires_at"),
+			org_role: nullableText(grantRaw, "org_role"),
+			org_tokens: orgTokens,
+			requested_grant: nullableText(grantRaw, "requested_grant"),
+			user_grant_id: requireText(grantRaw, "user_grant_id"),
+			user_id: requireText(grantRaw, "user_id")
+		}
+	};
+}
 function credentialsPath(configDir) {
 	return join(configDir, CREDENTIALS_FILE);
 }
@@ -677,21 +732,6 @@ function detectPrimitiveKeyEnvMisname(env = process.env) {
 	if ((primitiveKey?.length ?? 0) > 0 && (primitiveApiKey?.length ?? 0) === 0) return "PRIMITIVE_KEY is set but the CLI reads PRIMITIVE_API_KEY. Rename your env var, or re-run with PRIMITIVE_API_KEY=$PRIMITIVE_KEY.";
 	return null;
 }
-/**
-* True when a usable OAuth login session is saved on disk. Used by `pay-email`
-* to decide whether it can safely ignore an env-only `PRIMITIVE_API_KEY` in
-* favor of the payer's logged-in account (which owns the inbound challenge
-* inbox). Returns false when nothing is stored or the stored credential is
-* unreadable/legacy, so the caller falls back to whatever key did resolve
-* rather than silently dropping the user's only auth.
-*/
-function hasStoredCliLogin(configDir) {
-	try {
-		return loadCliCredentials(configDir) !== null;
-	} catch {
-		return false;
-	}
-}
 function resolveCliAuth(params) {
 	const apiKey = params.apiKey?.trim();
 	const apiBaseUrl = normalizeApiBaseUrl(params.apiBaseUrl);
@@ -728,8 +768,7 @@ function resolveCliAuth(params) {
 		source: "none"
 	};
 }
-//#endregion
-//#region src/oclif/cli-config.ts
+// src/oclif/cli-config.ts
 const CONFIG_FILE = "config.json";
 const CONFIG_VERSION = 1;
 const DEFAULT_ENVIRONMENT = "default";
@@ -907,5 +946,4 @@ function redactCliEnvironment(environment) {
 		...headers ? { headers } : {}
 	};
 }
-//#endregion
-export { saveActiveChatState as A, parseConnectedAgentProfile as B, resolveCliAuth as C, deleteChatState as D, chatStatePath as E, agentProfileName as F, PrimitiveApiClient as G, profileAlreadyConnectedMessage as H, agentProfilesDirectory as I, connectedAgentIdentity as L, AGENT_PROFILE_ENV as M, AgentConnectionSetupError as N, loadActiveChatState as O, agentProfileDirectory as P, connectedApiBaseUrl as R, normalizeApiBaseUrl as S, saveSignupCredentials as T, requireDefaultLoginProfile as U, parseOwnerMemberAddress as V, saveConnectedAgentProfile as W, deleteCliCredentials as _, normalizeCliEnvironmentName as a, hasStoredCliLogin as b, resolveConfigEnvironment as c, validateCliHeaderName as d, validateCliHeaderValue as f, credentialsPath as g, credentialsLockPath as h, loadCliConfig as i, AGENT_ADDRESS_ENV as j, loadChatConversationByLocalId as k, saveCliConfig as l, cliAccessTokenExpiresAt as m, deleteCliConfig as n, redactCliEnvironment as o, acquireCliCredentialsLock as p, emptyCliConfig as r, removeCliEnvironment as s, DEFAULT_ENVIRONMENT as t, upsertCliEnvironment as u, deleteCliCredentialsLock as v, saveCliCredentials as w, loadCliCredentials as x, detectPrimitiveKeyEnvMisname as y, loadConnectedAgentProfile as z };
+export { AGENT_ADDRESS_ENV as A, parseOwnerMemberAddress as B, saveCliCredentials as C, loadActiveChatState as D, deleteChatState as E, agentProfilesDirectory as F, requireDefaultLoginProfile as H, connectedAgentIdentity as I, connectedApiBaseUrl as L, AgentConnectionSetupError as M, agentProfileDirectory as N, loadChatConversationByLocalId as O, agentProfileName as P, loadConnectedAgentProfile as R, resolveCliAuth as S, chatStatePath as T, saveConnectedAgentProfile as U, profileAlreadyConnectedMessage as V, PrimitiveApiClient as W, deleteCliCredentials as _, normalizeCliEnvironmentName as a, loadCliCredentials as b, resolveConfigEnvironment as c, validateCliHeaderName as d, validateCliHeaderValue as f, credentialsPath as g, credentialsLockPath as h, loadCliConfig as i, AGENT_PROFILE_ENV as j, saveActiveChatState as k, saveCliConfig as l, cliAccessTokenExpiresAt as m, deleteCliConfig as n, redactCliEnvironment as o, acquireCliCredentialsLock as p, emptyCliConfig as r, removeCliEnvironment as s, DEFAULT_ENVIRONMENT as t, upsertCliEnvironment as u, deleteCliCredentialsLock as v, saveSignupCredentials as w, normalizeApiBaseUrl as x, detectPrimitiveKeyEnvMisname as y, parseConnectedAgentProfile as z };

package/dist/{client.gen-CaaMP86o.js → client.gen-6rZvmHfx.js}

@@ -1,7 +1,6 @@
-//#region ../packages/api-core/src/api/core/bodySerializer.gen.ts
+// ../packages/api-core/src/api/core/bodySerializer.gen.ts
 const jsonBodySerializer = { bodySerializer: (body) => JSON.stringify(body, (_key, value) => typeof value === "bigint" ? value.toString() : value) };
-//#endregion
-//#region ../packages/api-core/src/api/core/serverSentEvents.gen.ts
+// ../packages/api-core/src/api/core/serverSentEvents.gen.ts
 function createSseClient({ onRequest, onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url, ...options }) {
 	let lastEventId;
 	const sleep = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -93,8 +92,7 @@ function createSseClient({ onRequest, onSseError, onSseEvent, responseTransforme
 	};
 	return { stream: createStream() };
 }
-//#endregion
-//#region ../packages/api-core/src/api/core/pathSerializer.gen.ts
+// ../packages/api-core/src/api/core/pathSerializer.gen.ts
 const separatorArrayExplode = (style) => {
 	switch (style) {
 		case "label": return ".";
@@ -172,8 +170,7 @@ const serializeObjectParam = ({ allowReserved, explode, name, style, value, valu
 	})).join(separator);
 	return style === "label" || style === "matrix" ? separator + joinedValues : joinedValues;
 };
-//#endregion
-//#region ../packages/api-core/src/api/core/utils.gen.ts
+// ../packages/api-core/src/api/core/utils.gen.ts
 const PATH_PARAM_RE = /\{[^{}]+\}/g;
 const defaultPathSerializer = ({ path, url: _url }) => {
 	let url = _url;
@@ -246,8 +243,7 @@ function getValidRequestBody(options) {
 	}
 	if (hasBody) return options.body;
 }
-//#endregion
-//#region ../packages/api-core/src/api/core/auth.gen.ts
+// ../packages/api-core/src/api/core/auth.gen.ts
 const getAuthToken = async (auth, callback) => {
 	const token = typeof callback === "function" ? await callback(auth) : callback;
 	if (!token) return;
@@ -255,8 +251,7 @@ const getAuthToken = async (auth, callback) => {
 	if (auth.scheme === "basic") return `Basic ${btoa(token)}`;
 	return token;
 };
-//#endregion
-//#region ../packages/api-core/src/api/client/utils.gen.ts
+// ../packages/api-core/src/api/client/utils.gen.ts
 const createQuerySerializer = ({ parameters = {}, ...args } = {}) => {
 	const querySerializer = (queryParams) => {
 		const search = [];
@@ -425,8 +420,7 @@ const createConfig = (override = {}) => ({
 	querySerializer: defaultQuerySerializer,
 	...override
 });
-//#endregion
-//#region ../packages/api-core/src/api/client/client.gen.ts
+// ../packages/api-core/src/api/client/client.gen.ts
 const createClient = (config = {}) => {
 	let _config = mergeConfigs(createConfig(), config);
 	const getConfig = () => ({ ..._config });
@@ -593,5 +587,4 @@ const createClient = (config = {}) => {
 		trace: makeMethodFn("TRACE")
 	};
 };
-//#endregion
 export { createConfig as n, createClient as t };

package/dist/{json-output-Ce10AsSb.js → json-output-BzSBR-KX.js}

@@ -1,5 +1,5 @@
 import { format } from "node:util";
-//#region src/oclif/json-output.ts
+// src/oclif/json-output.ts
 /**
 * Parse-safe `--json` output.
 *
@@ -318,5 +318,4 @@ function guardJsonOutputCommands(commands) {
 		if (flags && "json" in flags || enableJsonFlag === true) guardJsonOutput(command);
 	}
 }
-//#endregion
 export { jsonOutputRequested as n, runStreamingJson as r, guardJsonOutputCommands as t };

package/dist/{listen-background-cD6n8VYO.js → listen-background-C0F9gNDD.js}

@@ -1,10 +1,10 @@
-import { _ as acquireListenLock, a as mailLockBusy, d as readMailJson, f as removeMailFile, g as ListenStateError, h as writeMailJson, i as mailId, l as privateMailDirectory, o as mailObject, s as mailString, v as compareListenProcessIdentity, x as listenProcessIdentity } from "./shared-mail-files-CZfm7E2k.js";
+import { _ as acquireListenLock, a as mailLockBusy, d as readMailJson, f as removeMailFile, g as ListenStateError, h as writeMailJson, i as mailId, l as privateMailDirectory, o as mailObject, s as mailString, v as compareListenProcessIdentity, x as listenProcessIdentity } from "./shared-mail-files-BAQSGxxz.js";
 import { lstatSync, realpathSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { join } from "node:path";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { spawn } from "node:child_process";
-//#region src/oclif/listen-background.ts
+// src/oclif/listen-background.ts
 const BACKGROUND_LISTEN_TOKEN_ENV = "PRIMITIVE_LISTEN_BACKGROUND_TOKEN";
 const BACKGROUND_LISTEN_TARGET_ENV = "PRIMITIVE_LISTEN_BACKGROUND_TARGET";
 const SUPERVISOR_ENV = "PRIMITIVE_LISTEN_SUPERVISOR";
@@ -837,5 +837,4 @@ async function startBackgroundListen(options) {
 		release();
 	}
 }
-//#endregion
 export { claimBackgroundListenRestart as a, startBackgroundListen as c, backgroundListenToken as i, stopBackgroundListen as l, backgroundListenRestartable as n, runBackgroundListen as o, backgroundListenStatus as r, runBackgroundListenSupervisor as s, BACKGROUND_LISTEN_TOKEN_ENV as t, verifyBackgroundListenTarget as u };