@doist/twist-cli 2.39.0 → 2.40.0

package/dist/lib/twist-account.js

@@ -0,0 +1,23 @@
+/** Canonical `TwistAccount` factory. Applies the `'unknown'` / `''` defaults. */
+export function makeTwistAccount(input) {
+    return {
+        id: input.id,
+        label: input.label,
+        authMode: input.authMode ?? 'unknown',
+        authScope: input.authScope ?? '',
+    };
+}
+/**
+ * Adapt a Twist `getSessionUser` payload to a `TwistAccount`. Lives in its
+ * own module so `migrate-auth.ts` can import it without pulling in
+ * `auth-provider.ts`'s runtime graph.
+ */
+export function toTwistAccount(sessionUser, metadata = {}) {
+    return makeTwistAccount({
+        id: String(sessionUser.id),
+        label: sessionUser.name,
+        authMode: metadata.authMode,
+        authScope: metadata.authScope,
+    });
+}
+//# sourceMappingURL=twist-account.js.map

package/dist/lib/twist-account.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"twist-account.js","sourceRoot":"","sources":["../../src/lib/twist-account.ts"],"names":[],"mappings":"AAGA,iFAAiF;AACjF,MAAM,UAAU,gBAAgB,CAAC,KAKhC;IACG,OAAO;QACH,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS;QACrC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE;KACnC,CAAA;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC1B,WAAyC,EACzC,WAAwD,EAAE;IAE1D,OAAO,gBAAgB,CAAC;QACpB,EAAE,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC1B,KAAK,EAAE,WAAW,CAAC,IAAI;QACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,SAAS,EAAE,QAAQ,CAAC,SAAS;KAChC,CAAC,CAAA;AACN,CAAC"}

package/dist/lib/user-records.d.ts

@@ -0,0 +1,15 @@
+import type { UserRecord, UserRecordStore } from '@doist/cli-core/auth';
+import type { TwistAccount } from './auth-provider.js';
+import { type Config } from './config.js';
+/**
+ * `UserRecordStore` adapter over `config.users[]`. `StoredUser.token` is
+ * surfaced as `fallbackToken` — cli-core's name for the plaintext copy
+ * persisted only when the keyring is unreachable.
+ */
+export declare function createTwistUserRecordStore(): UserRecordStore<TwistAccount>;
+/**
+ * Resolve the default-or-first `UserRecord` from an already-loaded config.
+ * Returns `null` when no users are stored.
+ */
+export declare function getDefaultUserRecord(config: Config): UserRecord<TwistAccount> | null;
+//# sourceMappingURL=user-records.d.ts.map

package/dist/lib/user-records.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-records.d.ts","sourceRoot":"","sources":["../../src/lib/user-records.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,KAAK,MAAM,EAA4C,MAAM,aAAa,CAAA;AAGnF;;;;GAIG;AACH,wBAAgB,0BAA0B,IAAI,eAAe,CAAC,YAAY,CAAC,CAmC1E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,IAAI,CAMpF"}

package/dist/lib/user-records.js

@@ -0,0 +1,84 @@
+import { getConfig, updateConfig } from './config.js';
+import { makeTwistAccount } from './twist-account.js';
+/**
+ * `UserRecordStore` adapter over `config.users[]`. `StoredUser.token` is
+ * surfaced as `fallbackToken` — cli-core's name for the plaintext copy
+ * persisted only when the keyring is unreachable.
+ */
+export function createTwistUserRecordStore() {
+    return {
+        async list() {
+            const config = await getConfig();
+            return (config.users ?? []).map(toRecord);
+        },
+        async upsert(record) {
+            const config = await getConfig();
+            const existing = config.users ?? [];
+            const next = fromRecord(record);
+            const index = existing.findIndex((u) => u.id === record.account.id);
+            const users = index >= 0
+                ? [...existing.slice(0, index), next, ...existing.slice(index + 1)]
+                : [...existing, next];
+            await updateConfig({ users });
+        },
+        async remove(id) {
+            const config = await getConfig();
+            const existing = config.users ?? [];
+            const index = existing.findIndex((u) => u.id === id);
+            if (index < 0)
+                return;
+            const users = [...existing.slice(0, index), ...existing.slice(index + 1)];
+            const updates = { users };
+            if (config.defaultUserId === id)
+                updates.defaultUserId = undefined;
+            await updateConfig(updates);
+        },
+        async getDefaultId() {
+            const config = await getConfig();
+            return config.defaultUserId ?? null;
+        },
+        async setDefaultId(id) {
+            await updateConfig({ defaultUserId: id ?? undefined });
+        },
+    };
+}
+/**
+ * Resolve the default-or-first `UserRecord` from an already-loaded config.
+ * Returns `null` when no users are stored.
+ */
+export function getDefaultUserRecord(config) {
+    const users = config.users ?? [];
+    if (users.length === 0)
+        return null;
+    const defaultId = config.defaultUserId;
+    const user = (defaultId && users.find((u) => u.id === defaultId)) || users[0];
+    return toRecord(user);
+}
+function toRecord(user) {
+    const account = makeTwistAccount({
+        id: user.id,
+        label: user.name,
+        authMode: user.authMode,
+        authScope: user.authScope,
+    });
+    const trimmed = user.token?.trim();
+    const record = { account };
+    if (trimmed)
+        record.fallbackToken = trimmed;
+    return record;
+}
+function fromRecord(record) {
+    // Replace, don't merge: an absent `fallbackToken` strips the plaintext
+    // slot so it can't shadow a fresh keyring-backed write. cli-core contract.
+    const trimmed = record.fallbackToken?.trim();
+    const next = {
+        id: record.account.id,
+        name: record.account.label,
+        authMode: record.account.authMode,
+        authScope: record.account.authScope,
+    };
+    if (trimmed && trimmed.length > 0)
+        next.token = trimmed;
+    return next;
+}
+//# sourceMappingURL=user-records.js.map

package/dist/lib/user-records.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-records.js","sourceRoot":"","sources":["../../src/lib/user-records.ts"],"names":[],"mappings":"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"}

package/dist/postinstall.js

@@ -1,3 +1,7 @@
+import { runMigrateLegacyAuth } from './lib/migrate-auth.js';
 import { updateAllInstalledSkills } from './lib/skills/update-installed.js';
+// Failures must not break `npm install`. `createTwistTokenStore` re-runs the
+// migration lazily for users who installed with `--ignore-scripts`.
 updateAllInstalledSkills({ local: false }).catch(() => { });
+runMigrateLegacyAuth({ silent: true }).catch(() => { });
 //# sourceMappingURL=postinstall.js.map

package/dist/postinstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"postinstall.js","sourceRoot":"","sources":["../src/postinstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAA;AAE3E,wBAAwB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"postinstall.js","sourceRoot":"","sources":["../src/postinstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAA;AAE3E,6EAA6E;AAC7E,oEAAoE;AACpE,wBAAwB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;AAC1D,oBAAoB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doist/twist-cli",
-    "version": "2.39.0",
+    "version": "2.40.0",
     "description": "TypeScript CLI for Twist",
     "type": "module",
     "main": "dist/index.js",