@oxygen-agent/cli 1.50.37 → 1.64.5

package/README.md

@@ -34,4 +34,4 @@ oxygen update
 
 For product documentation and support, visit https://oxygen-agent.com.
 
-Version: 1.50.37
+Version: 1.64.5

package/dist/credentials.d.ts

@@ -1,6 +1,19 @@
+export type StoredProfileIdentity = {
+    organization: {
+        id: string;
+        slug: string | null;
+        name: string;
+    };
+    user: {
+        id: string;
+        email: string | null;
+    };
+    capturedAt: string;
+};
 export type StoredCredentials = {
     token: string;
     apiUrl: string;
+    identity?: StoredProfileIdentity;
 };
 export type CredentialProfile = StoredCredentials & {
     name: string;
@@ -23,5 +36,17 @@ export declare function clearCredentials(env?: NodeJS.ProcessEnv, options?: {
     remainingProfiles: number;
 }>;
 export declare function listCredentialProfiles(env?: NodeJS.ProcessEnv): Promise<CredentialProfilesState>;
+export type ProfileResolution = {
+    name: string;
+    source: "env" | "file" | "default";
+    credentials: StoredCredentials | null;
+    exists: boolean;
+};
+export declare function resolveActiveProfile(env?: NodeJS.ProcessEnv): Promise<ProfileResolution>;
+export declare function findProfileNameByOrganizationId(organizationId: string, env?: NodeJS.ProcessEnv): Promise<string | null>;
+export declare function pickProfileNameForIdentity(organizationId: string, candidateSeed: string, env?: NodeJS.ProcessEnv): Promise<{
+    name: string;
+    renamed: boolean;
+}>;
 export declare function switchCredentialProfile(profile: string, env?: NodeJS.ProcessEnv): Promise<CredentialProfile>;
 export declare function normalizeApiUrl(value: string): string;

package/dist/credentials.js

@@ -43,9 +43,17 @@ export async function saveCredentials(credentials, env = process.env, options =
         token: credentials.token,
         apiUrl: normalizeApiUrl(credentials.apiUrl),
     };
+    if (credentials.identity)
+        normalized.identity = credentials.identity;
     const existing = await readSystemCredentialDocument(env);
     const profile = normalizeProfileName(options.profile ?? readEnvProfile(env) ?? existing?.activeProfile ?? DEFAULT_PROFILE_NAME);
     const profiles = existing ? readProfiles(existing) : {};
+    if (!normalized.identity) {
+        const prior = profiles[profile];
+        if (prior?.identity && prior.token === normalized.token) {
+            normalized.identity = prior.identity;
+        }
+    }
     profiles[profile] = normalized;
     const activeProfile = options.activate === false
         ? readProfileName(existing?.activeProfile) ?? profile
@@ -116,6 +124,50 @@ export async function listCredentialProfiles(env = process.env) {
         }),
     };
 }
+export async function resolveActiveProfile(env = process.env) {
+    const envProfile = readEnvProfile(env);
+    const document = await readSystemCredentialDocument(env);
+    const profiles = document ? readProfiles(document) : {};
+    const fileActive = readProfileName(document?.activeProfile);
+    const candidate = envProfile ?? fileActive ?? DEFAULT_PROFILE_NAME;
+    const credentials = profiles[candidate] ?? null;
+    const source = envProfile
+        ? "env"
+        : fileActive
+            ? "file"
+            : "default";
+    return { name: candidate, source, credentials, exists: Boolean(credentials) };
+}
+export async function findProfileNameByOrganizationId(organizationId, env = process.env) {
+    const document = await readSystemCredentialDocument(env);
+    if (!document)
+        return null;
+    const profiles = readProfiles(document);
+    for (const [name, credentials] of Object.entries(profiles)) {
+        if (credentials.identity?.organization.id === organizationId)
+            return name;
+    }
+    return null;
+}
+export async function pickProfileNameForIdentity(organizationId, candidateSeed, env = process.env) {
+    const document = await readSystemCredentialDocument(env);
+    const profiles = document ? readProfiles(document) : {};
+    const existingForOrg = Object.entries(profiles).find(([, credentials]) => credentials.identity?.organization.id === organizationId);
+    if (existingForOrg)
+        return { name: existingForOrg[0], renamed: false };
+    const base = normalizeProfileName(candidateSeed);
+    if (!profiles[base])
+        return { name: base, renamed: false };
+    for (let suffix = 2; suffix < 1000; suffix++) {
+        const next = `${base}-${suffix}`;
+        if (!profiles[next])
+            return { name: next, renamed: true };
+    }
+    throw new OxygenError("profile_collision", "Unable to derive a unique CLI profile name.", {
+        details: { base },
+        exitCode: 1,
+    });
+}
 export async function switchCredentialProfile(profile, env = process.env) {
     const document = await readSystemCredentialDocument(env);
     if (!document) {
@@ -231,6 +283,8 @@ async function writeCredentialDocument(input, env) {
         activeProfile: input.activeProfile,
         profiles: input.profiles,
     };
+    if (activeCredentials.identity)
+        document.identity = activeCredentials.identity;
     await writeSystemCredentialPayload(serializeCredentialDocument(document), env);
 }
 function credentialStore(env) {
@@ -392,7 +446,7 @@ async function deleteWindowsCredentialManager(env) {
 [void][OxygenCredMan]::CredDelete("${SERVICE_NAME}", 1, 0)
 `, env).catch(() => undefined);
 }
-async function runPowerShell(script, env) {
+function runPowerShell(script, env) {
     const encodedCommand = Buffer.from(script, "utf16le").toString("base64");
     return execFileAsync(windowsPowerShellCommand(env), [
         "-NoProfile",
@@ -516,16 +570,60 @@ function parseStoredCredentialsObject(value) {
         return null;
     if (typeof apiUrl !== "string" || !apiUrl.trim())
         return null;
-    return { token: token.trim(), apiUrl: normalizeApiUrl(apiUrl) };
+    const credentials = {
+        token: token.trim(),
+        apiUrl: normalizeApiUrl(apiUrl),
+    };
+    const identity = parseStoredProfileIdentity(value.identity);
+    if (identity)
+        credentials.identity = identity;
+    return credentials;
+}
+function parseStoredProfileIdentity(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    const record = value;
+    const org = record.organization;
+    const user = record.user;
+    if (!org || typeof org !== "object" || Array.isArray(org))
+        return null;
+    if (!user || typeof user !== "object" || Array.isArray(user))
+        return null;
+    const orgRecord = org;
+    const userRecord = user;
+    const orgId = typeof orgRecord.id === "string" ? orgRecord.id.trim() : "";
+    const orgName = typeof orgRecord.name === "string" ? orgRecord.name : "";
+    if (!orgId || !orgName)
+        return null;
+    const orgSlug = typeof orgRecord.slug === "string" && orgRecord.slug.trim()
+        ? orgRecord.slug.trim()
+        : null;
+    const userId = typeof userRecord.id === "string" ? userRecord.id.trim() : "";
+    if (!userId)
+        return null;
+    const userEmail = typeof userRecord.email === "string" && userRecord.email.trim()
+        ? userRecord.email.trim()
+        : null;
+    const capturedAt = typeof record.capturedAt === "string" && record.capturedAt.trim()
+        ? record.capturedAt.trim()
+        : new Date(0).toISOString();
+    return {
+        organization: { id: orgId, slug: orgSlug, name: orgName },
+        user: { id: userId, email: userEmail },
+        capturedAt,
+    };
 }
 function readProfiles(document) {
     const profiles = {};
     const rawProfiles = document.profiles ?? {};
     for (const [name, credentials] of Object.entries(rawProfiles)) {
-        profiles[normalizeProfileName(name)] = {
+        const normalized = {
             token: credentials.token,
             apiUrl: normalizeApiUrl(credentials.apiUrl),
         };
+        if (credentials.identity)
+            normalized.identity = credentials.identity;
+        profiles[normalizeProfileName(name)] = normalized;
     }
     if (Object.keys(profiles).length === 0) {
         const defaultCredentials = parseStoredCredentialsObject(document);