@postplus/cli 0.1.32 → 0.1.34

package/build/account-binding-display.js

@@ -0,0 +1,21 @@
+export function formatAccountBindingLines(input) {
+    if (input.accountType === 'team') {
+        return [
+            `Workspace: ${formatAccountBindingName(input)}`,
+            ...(input.accountSlug ? [`Workspace slug: ${input.accountSlug}`] : []),
+            `Account ID: ${input.accountId ?? 'not bound'}`,
+        ];
+    }
+    return [
+        `Account: ${input.accountName ?? 'not bound'}`,
+        `Account ID: ${input.accountId ?? 'not bound'}`,
+    ];
+}
+export function formatAccountBindingName(input) {
+    if (!input.accountName) {
+        return input.accountId ? `Account ${input.accountId}` : 'not bound';
+    }
+    return input.accountType === 'team'
+        ? `${input.accountName} (team)`
+        : input.accountName;
+}

package/build/auth-lifecycle.js

@@ -1,3 +1,4 @@
+import { formatAccountBindingLines } from './account-binding-display.js';
 import { refreshRemoteAuthSession } from './auth-session.js';
 import { clearAuthState, generateAuthStatusReport } from './auth.js';
 import { buildPostPlusClientCompatibilityHeaders, formatPostPlusCompatibilityError, } from './client-compatibility.js';
@@ -8,6 +9,9 @@ export async function refreshRemoteAuth() {
     const refreshed = await refreshRemoteAuthSession();
     return {
         accountId: refreshed.accountId,
+        accountName: refreshed.accountName,
+        accountSlug: refreshed.accountSlug,
+        accountType: refreshed.accountType,
         apiBaseUrl: refreshed.apiBaseUrl,
         ok: true,
         subscriptionStatus: refreshed.subscriptionStatus,
@@ -21,7 +25,7 @@ export function formatAuthRefreshReport(report) {
         '',
         `Remote auth: ${report.ok ? 'OK' : 'FAILED'}`,
         `PostPlus Cloud: ${report.apiBaseUrl}`,
-        `Account: ${report.accountId}`,
+        ...formatAccountBindingLines(report),
         `User: ${report.userEmail ?? report.userId}`,
         `Subscription: ${readSubscriptionStatusField(report).label}`,
     ].join('\n');

package/build/auth-login.js

@@ -34,6 +34,9 @@ export async function loginWithCloudHandoff() {
     });
     await setLocalSession({
         accountId: validated.accountId,
+        accountName: validated.accountName,
+        accountSlug: validated.accountSlug,
+        accountType: validated.accountType,
         apiBaseUrl: baseUrl,
         cliSessionToken: handoffPayload.cliSessionToken,
         sessionExpiresAt: validated.sessionExpiresAt ?? handoffPayload.sessionExpiresAt ?? null,
@@ -43,6 +46,9 @@ export async function loginWithCloudHandoff() {
     await writeCurrentCliVersionToLocalConfig();
     return {
         accountId: validated.accountId,
+        accountName: validated.accountName,
+        accountSlug: validated.accountSlug,
+        accountType: validated.accountType,
         apiBaseUrl: baseUrl,
         ok: true,
         userEmail: validated.userEmail,
@@ -135,6 +141,9 @@ export async function validateCliSession(input) {
     if (!response.ok) {
         throw new Error(formatCliSessionAuthError(payload));
     }
+    if (!isValidatedCliSessionPayload(payload)) {
+        throw new Error('PostPlus CLI auth validation returned incomplete data.');
+    }
     return payload;
 }
 export function formatCliSessionAuthError(payload) {
@@ -168,11 +177,25 @@ function isCliAuthLoginCompletedPayload(payload) {
         payload.status === 'completed' &&
         typeof payload.cliSessionToken === 'string' &&
         typeof payload.accountId === 'string' &&
+        typeof payload.accountName === 'string' &&
+        (payload.accountSlug === null || typeof payload.accountSlug === 'string') &&
+        (payload.accountType === 'personal' || payload.accountType === 'team') &&
         typeof payload.userId === 'string');
 }
 function isCliAuthLoginPendingPayload(payload) {
     return 'status' in payload && payload.status === 'pending';
 }
+function isValidatedCliSessionPayload(payload) {
+    return (typeof payload === 'object' &&
+        payload !== null &&
+        typeof payload.accountId === 'string' &&
+        typeof payload.accountName === 'string' &&
+        (payload.accountSlug === null ||
+            typeof payload.accountSlug === 'string') &&
+        (payload.accountType === 'personal' ||
+            payload.accountType === 'team') &&
+        typeof payload.userId === 'string');
+}
 function formatRemoteAuthLoginError(payload) {
     const compatibilityError = formatPostPlusCompatibilityError(payload);
     if (compatibilityError) {

package/build/auth-session.js

@@ -66,6 +66,9 @@ export async function refreshRemoteAuthSession(input) {
     }
     await setLocalSession({
         accountId: payload.accountId,
+        accountName: payload.accountName,
+        accountSlug: payload.accountSlug,
+        accountType: payload.accountType,
         apiBaseUrl,
         cliSessionToken: payload.cliSessionToken,
         sessionExpiresAt: payload.sessionExpiresAt,
@@ -86,5 +89,10 @@ function isRemoteAuthRefreshSuccessPayload(payload) {
         payload.cliSessionToken.trim().length >
             0 &&
         typeof payload.accountId === 'string' &&
+        typeof payload.accountName === 'string' &&
+        (payload.accountSlug === null ||
+            typeof payload.accountSlug === 'string') &&
+        (payload.accountType === 'personal' ||
+            payload.accountType === 'team') &&
         typeof payload.userId === 'string');
 }

package/build/auth-validate.js

@@ -1,3 +1,4 @@
+import { formatAccountBindingLines } from './account-binding-display.js';
 import { resolveFreshRemoteAuth } from './auth-session.js';
 import { buildPostPlusClientCompatibilityHeaders, formatPostPlusCompatibilityError, } from './client-compatibility.js';
 import { readSubscriptionStatusField } from './subscription-status.js';
@@ -22,10 +23,16 @@ export async function validateRemoteAuth() {
     }
     const hasSubscriptionStatus = Object.prototype.hasOwnProperty.call(payload, 'subscriptionStatus');
     const accountId = readRequiredString(payload, 'accountId');
+    const accountName = readRequiredString(payload, 'accountName');
+    const accountSlug = readNullableString(payload, 'accountSlug');
+    const accountType = readAccountType(payload);
     const userId = readRequiredString(payload, 'userId');
     const userEmail = readNullableString(payload, 'userEmail');
     return {
         accountId,
+        accountName,
+        accountSlug,
+        accountType,
         apiBaseUrl: auth.apiBaseUrl,
         ok: true,
         source: auth.source,
@@ -42,11 +49,18 @@ export function formatAuthValidateReport(report) {
         '',
         `Remote auth: ${report.ok ? 'OK' : 'FAILED'}`,
         `PostPlus Cloud: ${report.apiBaseUrl}`,
-        `Account: ${report.accountId}`,
+        ...formatAccountBindingLines(report),
         `User: ${report.userEmail ?? report.userId}`,
         `Subscription: ${readSubscriptionStatusField(report).label}`,
     ].join('\n');
 }
+function readAccountType(payload) {
+    const value = payload.accountType;
+    if (value !== 'personal' && value !== 'team') {
+        throw new Error('Invalid PostPlus auth response: accountType must be personal or team.');
+    }
+    return value;
+}
 async function fetchWhoami(input) {
     const compatibilityHeaders = await buildPostPlusClientCompatibilityHeaders();
     return fetch(`${input.apiBaseUrl}/api/postplus-cli/auth/whoami`, {

package/build/auth.js

@@ -1,3 +1,4 @@
+import { formatAccountBindingLines } from './account-binding-display.js';
 import { clearLocalAuthState, getPostPlusConfigPath, hasLocalConfigFile, maskSecret, readLocalConfig, resolveApiBaseUrlState, resolveLocalSessionState, setLocalApiBaseUrl, } from './local-state.js';
 export async function generateAuthStatusReport() {
     const [sessionState, apiBaseUrlState, configExists, config] = await Promise.all([
@@ -22,6 +23,15 @@ export async function generateAuthStatusReport() {
             path: getPostPlusConfigPath(),
             exists: configExists,
             accountId: config?.accountId?.trim() || null,
+            accountName: typeof config?.accountName === 'string'
+                ? config.accountName.trim() || null
+                : null,
+            accountSlug: typeof config?.accountSlug === 'string'
+                ? config.accountSlug.trim() || null
+                : null,
+            accountType: config?.accountType === 'personal' || config?.accountType === 'team'
+                ? config.accountType
+                : null,
             sessionExpiresAt: typeof config?.sessionExpiresAt === 'number'
                 ? config.sessionExpiresAt
                 : null,
@@ -47,7 +57,12 @@ export function formatAuthStatusReport(report) {
     lines.push(report.config.exists
         ? `[PASS] local config: ${report.config.path}`
         : `[PASS] local config path: ${report.config.path}`);
-    lines.push(`  Account: ${report.config.accountId ?? 'not bound'}`);
+    lines.push(...formatAccountBindingLines({
+        accountId: report.config.accountId,
+        accountName: report.config.accountName,
+        accountSlug: report.config.accountSlug,
+        accountType: report.config.accountType,
+    }).map((line) => `  ${line}`));
     lines.push(`  User: ${report.config.userEmail ?? report.config.userId ?? 'not bound'}`);
     lines.push(`  Expires: ${report.config.sessionExpiresAt
         ? new Date(report.config.sessionExpiresAt * 1000).toISOString()

package/build/client-compatibility.js

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises';
 import { readLocalConfig, updateLocalConfig } from './local-state.js';
-export const POSTPLUS_CLIENT_CONTRACT_VERSION = 1;
+export const POSTPLUS_CLIENT_CONTRACT_VERSION = 2;
 export const POSTPLUS_CLIENT_RUNTIME = 'postplus-cli';
 export const POSTPLUS_CLIENT_COMPATIBILITY_HEADERS = {
     cliVersion: 'x-postplus-cli-version',

package/build/doctor.js

@@ -1,3 +1,4 @@
+import { formatAccountBindingName } from './account-binding-display.js';
 import { resolveFreshRemoteAuth, } from './auth-session.js';
 import { buildPostPlusClientCompatibilityHeaders, formatPostPlusCompatibilityError, } from './client-compatibility.js';
 import { resolveHostedBaseUrl } from './hosted-release.js';
@@ -131,13 +132,21 @@ async function checkRemoteAuth(input) {
             return createFail('remote_auth', 'Remote auth', readErrorMessage(payload, 'PostPlus Cloud rejected the CLI session.'), 'Run `postplus auth login`.');
         }
         const accountId = typeof payload.accountId === 'string' ? payload.accountId : 'unknown';
+        const accountName = typeof payload.accountName === 'string' ? payload.accountName : null;
+        const accountType = payload.accountType === 'personal' || payload.accountType === 'team'
+            ? payload.accountType
+            : null;
         const user = typeof payload.userEmail === 'string'
             ? payload.userEmail
             : typeof payload.userId === 'string'
                 ? payload.userId
                 : 'unknown';
         const subscription = readSubscriptionStatusField(payload).label;
-        return createPass('remote_auth', 'Remote auth', `Account ${accountId}; user ${user}; subscription ${subscription}`);
+        return createPass('remote_auth', 'Remote auth', `${formatAccountBindingName({
+            accountId,
+            accountName,
+            accountType,
+        })}; account ${accountId}; user ${user}; subscription ${subscription}`);
     }
     catch (error) {
         return createFail('remote_auth', 'Remote auth', error instanceof Error
@@ -216,9 +225,7 @@ function readCapabilityFailureLabel(value, skillScope) {
             .map(readReadinessCheckFailureLabel)
             .filter((check) => check !== null)
         : [];
-    const labelWithFailures = failedChecks.length > 0
-        ? `${label} (${failedChecks.join(', ')})`
-        : label;
+    const labelWithFailures = failedChecks.length > 0 ? `${label} (${failedChecks.join(', ')})` : label;
     return skillScope
         ? `${labelWithFailures} for ${skillScope.skill.skillId}`
         : labelWithFailures;

package/build/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { readFile } from 'node:fs/promises';
+import { formatAccountBindingLines } from './account-binding-display.js';
 import { formatAuthRefreshReport, refreshRemoteAuth, revokeRemoteAuthAndReport, } from './auth-lifecycle.js';
 import { loginWithCloudHandoff } from './auth-login.js';
 import { formatAuthValidateReport, validateRemoteAuth, } from './auth-validate.js';
@@ -8,11 +9,11 @@ import { readCurrentCliVersion } from './client-compatibility.js';
 import { formatDoctorReport, generateDoctorReport } from './doctor.js';
 import { assertConfigFilePermissions } from './local-state.js';
 import { readLargeCreditQuoteConfirmationChallenge, resolveLargeCreditQuoteConfirmation, } from './quote-confirmation.js';
-import { POSTPLUS_SKILLS_CURRENT_DIRECTORY_INSTALL_COMMAND, POSTPLUS_SKILLS_INSTALL_COMMAND, loadPublicSkillCatalog, formatPostPlusSkillsInstallCommand, } from './skill-catalog.js';
+import { POSTPLUS_SKILLS_CURRENT_DIRECTORY_INSTALL_COMMAND, POSTPLUS_SKILLS_INSTALL_COMMAND, formatPostPlusSkillsInstallCommand, loadPublicSkillCatalog, } from './skill-catalog.js';
 import { formatSkillBaselineVerifyReport, runPostPlusSkillUninstall, runPostPlusSkillUpdate, runPostPlusSkillVerify, } from './skill-management.js';
 import { formatStatusReport, generateStatusReport } from './status.js';
-import { refreshUpdateCheckCache, runCliSelfUpdateIfOutdated, } from './update-check.js';
 import { runStudioCommand } from './studio.js';
+import { refreshUpdateCheckCache, runCliSelfUpdateIfOutdated, } from './update-check.js';
 function printAuthHelp() {
     process.stdout.write(`PostPlus CLI — auth commands
 
@@ -297,7 +298,7 @@ async function runAuthLogin() {
     process.stdout.write([
         '',
         'PostPlus CLI login complete.',
-        `Account: ${report.accountId}`,
+        ...formatAccountBindingLines(report),
         `PostPlus Cloud: ${report.apiBaseUrl}`,
         `User: ${report.userEmail ?? 'unknown'}`,
         '',

package/build/local-state.js

@@ -94,6 +94,9 @@ export async function clearLocalAuthState() {
         };
         delete next.accessToken;
         delete next.accountId;
+        delete next.accountName;
+        delete next.accountSlug;
+        delete next.accountType;
         delete next.apiKey;
         delete next.cliSessionToken;
         delete next.machineId;
@@ -162,6 +165,9 @@ export async function setLocalSession(input) {
     return updateLocalConfig((current) => ({
         ...omitLegacyAuthFields(current),
         accountId: input.accountId,
+        accountName: input.accountName ?? null,
+        accountSlug: input.accountSlug ?? null,
+        accountType: input.accountType ?? null,
         apiBaseUrl,
         cliSessionToken,
         sessionExpiresAt: input.sessionExpiresAt,

package/build/skill-management.js

@@ -2,6 +2,7 @@ import { writeCurrentCliVersionToLocalConfig } from './client-compatibility.js';
 import { runCommand, runInteractiveCommand } from './command-runner.js';
 import { clearManagedSkillBaseline, readManagedSkillBaseline, writeManagedSkillBaseline, } from './local-state.js';
 import { POSTPLUS_SKILLS_AGENT_TARGETS, formatPostPlusSkillsInstallCommand, resolvePostPlusSkillsSource, loadPublicSkillCatalog, } from './skill-catalog.js';
+import { clearUpdateCheckCache } from './update-check.js';
 const NPX_SKILLS = ['-y', 'skills'];
 const DEFAULT_SKILL_MUTATION_OPTIONS = {
     scope: 'global',
@@ -31,6 +32,7 @@ export async function runPostPlusSkillUpdate(dependencies = {
         skillNames,
     });
     await writeCurrentCliVersionToLocalConfig();
+    await clearUpdateCheckCache();
     return 0;
 }
 export async function runPostPlusSkillUninstall(dependencies = {
@@ -46,13 +48,14 @@ export async function runPostPlusSkillUninstall(dependencies = {
     const exitCode = await dependencies.runInteractiveCommand('npx', buildPostPlusSkillUninstallArgs(allKnownSkillNames, options.scope));
     if (exitCode === 0) {
         await clearManagedSkillBaseline();
+        await clearUpdateCheckCache();
     }
     return exitCode;
 }
 export async function generateSkillInstallStatusReport(dependencies = {
     runCommand,
-}) {
-    return (await inspectPostPlusSkillInstall(dependencies)).report;
+}, options = {}) {
+    return (await inspectPostPlusSkillInstall(dependencies, options)).report;
 }
 export async function runPostPlusSkillVerify(dependencies = {
     runCommand,
@@ -72,6 +75,7 @@ export async function runPostPlusSkillVerify(dependencies = {
         skillNames: inspection.requiredSkillNames,
     });
     await writeCurrentCliVersionToLocalConfig();
+    await clearUpdateCheckCache();
     return {
         ...inspection.report,
         baselineUpdated: true,
@@ -80,7 +84,7 @@ export async function runPostPlusSkillVerify(dependencies = {
         verifiedSkillsReleaseId: inspection.catalog.releaseId,
     };
 }
-async function inspectPostPlusSkillInstall(dependencies) {
+async function inspectPostPlusSkillInstall(dependencies, options = {}) {
     const catalog = await loadPublicSkillCatalog();
     const requiredSkillNames = catalog.skills.map((skill) => skill.skillId);
     const requiredSkills = new Set(requiredSkillNames);
@@ -91,6 +95,24 @@ async function inspectPostPlusSkillInstall(dependencies) {
         const postPlusInstalled = installed.filter((skill) => requiredSkills.has(skill.name));
         const installedNames = new Set(postPlusInstalled.map((skill) => skill.name));
         const missingSkills = [...requiredSkills].filter((skill) => !installedNames.has(skill));
+        let managedSkillsReleaseId = baseline.releaseId;
+        let currentRetiredManagedSkills = retiredManagedSkills;
+        if (options.repairManagedBaseline === true &&
+            missingSkills.length === 0 &&
+            shouldRepairManagedBaseline({
+                baseline,
+                releaseId: catalog.releaseId,
+                skillNames: requiredSkillNames,
+            })) {
+            await writeManagedSkillBaseline({
+                releaseId: catalog.releaseId,
+                skillNames: requiredSkillNames,
+            });
+            await writeCurrentCliVersionToLocalConfig();
+            await clearUpdateCheckCache();
+            managedSkillsReleaseId = catalog.releaseId;
+            currentRetiredManagedSkills = [];
+        }
         const scopes = [
             ...new Set(postPlusInstalled
                 .map((skill) => skill.scope)
@@ -103,10 +125,10 @@ async function inspectPostPlusSkillInstall(dependencies) {
                 error: null,
                 installCommand: formatPostPlusSkillsInstallCommand(catalog.source),
                 installedCount: installedNames.size,
-                managedSkillsReleaseId: baseline.releaseId,
+                managedSkillsReleaseId,
                 missingSkills,
                 requiredCount: requiredSkills.size,
-                retiredManagedSkills,
+                retiredManagedSkills: currentRetiredManagedSkills,
                 scopes,
                 source: catalog.source,
                 updateCommand: formatPostPlusSkillUpdateCommand(),
@@ -233,6 +255,18 @@ function buildSkillScopeArgs(scope) {
 function mergeSkillNames(left, right) {
     return [...new Set([...left, ...right])].sort((a, b) => a.localeCompare(b));
 }
+function shouldRepairManagedBaseline(input) {
+    if (input.baseline.releaseId !== input.releaseId) {
+        return true;
+    }
+    return !haveSameSkillNames(input.baseline.skillNames, input.skillNames);
+}
+function haveSameSkillNames(left, right) {
+    const normalizedLeft = mergeSkillNames(left, []);
+    const normalizedRight = mergeSkillNames(right, []);
+    return (normalizedLeft.length === normalizedRight.length &&
+        normalizedLeft.every((value, index) => value === normalizedRight[index]));
+}
 async function listInstalledSkills(dependencies) {
     const project = await listInstalledSkillsForScope(dependencies, []);
     const global = await listInstalledSkillsForScope(dependencies, ['--global']);

package/build/status.js

@@ -10,12 +10,15 @@ export async function generateStatusReportWithDependencies(dependencies = {}, op
     await writeCurrentCliVersionToLocalConfig();
     const generateAuthStatus = dependencies.generateAuthStatus ?? generateAuthStatusReport;
     const generateDoctor = dependencies.generateDoctor ?? generateDoctorReport;
-    const generateSkillStatus = dependencies.generateSkillStatus ?? generateSkillInstallStatusReport;
+    const generateSkillStatus = dependencies.generateSkillStatus ??
+        (() => generateSkillInstallStatusReport(undefined, {
+            repairManagedBaseline: true,
+        }));
     const generateUpdateStatus = dependencies.generateUpdateStatus ?? generateUpdateStatusReport;
-    const [doctor, auth, skills, updates] = await Promise.all([
+    const skills = await generateSkillStatus();
+    const [doctor, auth, updates] = await Promise.all([
         generateDoctor({ skillId: options.skillId }),
         generateAuthStatus(),
-        generateSkillStatus(),
         generateUpdateStatus(),
     ]);
     return {

package/build/update-check.js

@@ -1,4 +1,4 @@
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { readCurrentCliVersion } from './client-compatibility.js';
 import { runInteractiveCommand as runDefaultInteractiveCommand, } from './command-runner.js';
@@ -88,6 +88,11 @@ export async function refreshUpdateCheckCache() {
         force: true,
     });
 }
+export async function clearUpdateCheckCache() {
+    await rm(getUpdateCheckCachePath(), {
+        force: true,
+    });
+}
 export async function runCliSelfUpdateIfOutdated(dependencies = {}) {
     const fetchFn = dependencies.fetchFn ?? fetch;
     const runInteractiveCommand = dependencies.runInteractiveCommand ?? runDefaultInteractiveCommand;

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@postplus/cli",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "packageManager": "pnpm@10.30.3+sha512.c961d1e0a2d8e354ecaa5166b822516668b7f44cb5bd95122d590dd81922f606f5473b6d23ec4a5be05e7fcd18e8488d47d978bbe981872f1145d06e9a740017",
   "type": "module",
   "description": "PostPlus CLI for PostPlus Cloud auth, status, and diagnostics.",
   "license": "SEE LICENSE IN LICENSE",
   "files": [
+    "build/account-binding-display.js",
     "build/auth-lifecycle.js",
     "build/auth-login.js",
     "build/auth-session.js",