@wayai/cli 0.3.340 → 0.3.341

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -18903,6 +18903,7 @@ __export(workspace_exports, {
18903
18903
  findHubByFolderName: () => findHubByFolderName,
18904
18904
  findLocalHubFolder: () => findLocalHubFolder,
18905
18905
  findRepoRootSync: () => findRepoRootSync,
18906
+ findSkillRootSync: () => findSkillRootSync,
18906
18907
  getHubFolderSlug: () => getHubFolderSlug,
18907
18908
  isPreviewHub: () => isPreviewHub,
18908
18909
  localHubEnvironment: () => localHubEnvironment,
@@ -18944,6 +18945,16 @@ function findRepoRootSync() {
18944
18945
  current = parent;
18945
18946
  }
18946
18947
  }
18948
+ function findSkillRootSync() {
18949
+ const repoRoot = findRepoRootSync();
18950
+ if (repoRoot) return repoRoot;
18951
+ const cwd = process.cwd();
18952
+ try {
18953
+ return ownedByAnotherUser(fs3.lstatSync(cwd)) ? null : cwd;
18954
+ } catch {
18955
+ return null;
18956
+ }
18957
+ }
18947
18958
  function detectWorkspace() {
18948
18959
  const gitRoot = findGitRoot();
18949
18960
  if (!gitRoot) return null;
@@ -22184,9 +22195,6 @@ function writeConfig(config) {
22184
22195
  } catch {
22185
22196
  }
22186
22197
  }
22187
- delete existing.token;
22188
- delete existing.access_token;
22189
- delete existing.refresh_token;
22190
22198
  Object.assign(existing, config);
22191
22199
  fs7.writeFileSync(configPath(), JSON.stringify(existing, null, 2) + "\n", {
22192
22200
  mode: 384
@@ -22229,6 +22237,13 @@ async function clearSlot(keyring, account, confirm2 = keyring) {
22229
22237
  return false;
22230
22238
  }
22231
22239
  }
22240
+ async function clearWaySlotForOAuth(keyring) {
22241
+ await keyring.deletePassword(KEYRING_SERVICE, KEY_WAY_TOKEN);
22242
+ const confirm2 = await getStrictKeyring() ?? keyring;
22243
+ if (await confirm2.getPassword(KEYRING_SERVICE, KEY_WAY_TOKEN) !== null) {
22244
+ throw new StaleKeyringSlotError(KEY_WAY_TOKEN);
22245
+ }
22246
+ }
22232
22247
  async function getKeyring() {
22233
22248
  if (keyringCache !== void 0) return keyringCache;
22234
22249
  try {
@@ -22311,8 +22326,7 @@ async function migrateLegacyTokens() {
22311
22326
  } catch (err) {
22312
22327
  console.warn(`wayai: failed to strip legacy token from ~/.wayai/config.json (${err.message}); will retry next run.`);
22313
22328
  }
22314
- } catch (err) {
22315
- console.warn(`wayai: keyring migration failed (${err.message}); continuing with file-backed token.`);
22329
+ } catch {
22316
22330
  }
22317
22331
  }
22318
22332
  return { kind: "way", token: legacy.token };
@@ -22320,6 +22334,7 @@ async function migrateLegacyTokens() {
22320
22334
  if (legacy.access_token) {
22321
22335
  if (keyring) {
22322
22336
  try {
22337
+ await clearWaySlotForOAuth(keyring);
22323
22338
  await keyring.setPassword(KEYRING_SERVICE, KEY_OAUTH_ACCESS, legacy.access_token);
22324
22339
  if (legacy.refresh_token) {
22325
22340
  await keyring.setPassword(KEYRING_SERVICE, KEY_OAUTH_REFRESH, legacy.refresh_token);
@@ -22330,7 +22345,7 @@ async function migrateLegacyTokens() {
22330
22345
  console.warn(`wayai: failed to strip legacy tokens from ~/.wayai/config.json (${err.message}); will retry next run.`);
22331
22346
  }
22332
22347
  } catch (err) {
22333
- console.warn(`wayai: keyring migration failed (${err.message}); continuing with file-backed tokens.`);
22348
+ if (err instanceof StaleKeyringSlotError) throw err;
22334
22349
  }
22335
22350
  }
22336
22351
  return {
@@ -22353,6 +22368,16 @@ async function getToken() {
22353
22368
  }
22354
22369
  return { kind: "oauth", access_token: envToken };
22355
22370
  }
22371
+ const legacy = readLegacyConfigFile();
22372
+ if (legacy?.token) return { kind: "way", token: legacy.token };
22373
+ if (legacy?.access_token) {
22374
+ return {
22375
+ kind: "oauth",
22376
+ access_token: legacy.access_token,
22377
+ refresh_token: legacy.refresh_token,
22378
+ expires_at: legacy.token_expires_at
22379
+ };
22380
+ }
22356
22381
  const keyring = await getKeyring();
22357
22382
  if (keyring) {
22358
22383
  const wayToken = await keyring.getPassword(KEYRING_SERVICE, KEY_WAY_TOKEN);
@@ -22360,26 +22385,14 @@ async function getToken() {
22360
22385
  const accessToken = await keyring.getPassword(KEYRING_SERVICE, KEY_OAUTH_ACCESS);
22361
22386
  if (accessToken) {
22362
22387
  const refreshToken = await keyring.getPassword(KEYRING_SERVICE, KEY_OAUTH_REFRESH);
22363
- const expiresAt = readMetadataExpiresAt();
22364
22388
  return {
22365
22389
  kind: "oauth",
22366
22390
  access_token: accessToken,
22367
22391
  refresh_token: refreshToken ?? void 0,
22368
- expires_at: expiresAt ?? void 0
22392
+ expires_at: legacy?.token_expires_at ?? void 0
22369
22393
  };
22370
22394
  }
22371
22395
  }
22372
- const legacy = readLegacyConfigFile();
22373
- if (!legacy) return null;
22374
- if (legacy.token) return { kind: "way", token: legacy.token };
22375
- if (legacy.access_token) {
22376
- return {
22377
- kind: "oauth",
22378
- access_token: legacy.access_token,
22379
- refresh_token: legacy.refresh_token,
22380
- expires_at: legacy.token_expires_at
22381
- };
22382
- }
22383
22396
  return null;
22384
22397
  }
22385
22398
  async function setWayToken(token) {
@@ -22415,9 +22428,7 @@ async function setOAuthTokens(access_token, refresh_token, expires_at) {
22415
22428
  const keyring = await getKeyring();
22416
22429
  if (keyring) {
22417
22430
  try {
22418
- if (!await clearSlot(keyring, KEY_WAY_TOKEN)) {
22419
- throw new StaleKeyringSlotError(KEY_WAY_TOKEN);
22420
- }
22431
+ await clearWaySlotForOAuth(keyring);
22421
22432
  await keyring.setPassword(KEYRING_SERVICE, KEY_OAUTH_ACCESS, access_token);
22422
22433
  if (refresh_token) {
22423
22434
  await keyring.setPassword(KEYRING_SERVICE, KEY_OAUTH_REFRESH, refresh_token);
@@ -22431,16 +22442,23 @@ async function setOAuthTokens(access_token, refresh_token, expires_at) {
22431
22442
  }
22432
22443
  writeFileFallback({ access_token, refresh_token, token_expires_at: expires_at });
22433
22444
  }
22445
+ async function keyringMayHoldToken() {
22446
+ const keyring = await getStrictKeyring();
22447
+ if (!keyring) return false;
22448
+ const reads = await Promise.allSettled(
22449
+ TOKEN_SLOTS.map((account) => keyring.getPassword(KEYRING_SERVICE, account))
22450
+ );
22451
+ return reads.some((read) => read.status === "rejected" || read.value !== null);
22452
+ }
22434
22453
  async function clearTokens() {
22435
22454
  const stuck = [];
22436
22455
  const keyring = await getKeyring();
22437
22456
  if (keyring) {
22438
22457
  const confirm2 = await getStrictKeyring() ?? keyring;
22439
- const slots = [KEY_WAY_TOKEN, KEY_OAUTH_ACCESS, KEY_OAUTH_REFRESH];
22440
- const cleared = await Promise.all(slots.map((account) => clearSlot(keyring, account, confirm2)));
22458
+ const cleared = await Promise.all(TOKEN_SLOTS.map((account) => clearSlot(keyring, account, confirm2)));
22441
22459
  for (const [i, ok] of cleared.entries()) {
22442
22460
  if (!ok) {
22443
- const account = slots[i];
22461
+ const account = TOKEN_SLOTS[i];
22444
22462
  stuck.push(account);
22445
22463
  console.warn(
22446
22464
  `wayai: could not clear keyring slot "${account}". Subsequent commands may still pick the stale token. Manually:
@@ -22454,10 +22472,6 @@ async function clearTokens() {
22454
22472
  }
22455
22473
  return stuck;
22456
22474
  }
22457
- function readMetadataExpiresAt() {
22458
- const legacy = readLegacyConfigFile();
22459
- return legacy?.token_expires_at ?? null;
22460
- }
22461
22475
  function writeMetadataExpiresAt(expires_at) {
22462
22476
  const existing = readLegacyConfigFile() ?? {};
22463
22477
  delete existing.token;
@@ -22492,7 +22506,7 @@ function writeFileFallback(tokens2) {
22492
22506
  ensureConfigDir();
22493
22507
  fs8.writeFileSync(configPath2(), JSON.stringify(existing, null, 2) + "\n", { mode: 384 });
22494
22508
  }
22495
- var KEYRING_SERVICE, KEY_WAY_TOKEN, KEY_OAUTH_ACCESS, KEY_OAUTH_REFRESH, keyringCache, StaleKeyringSlotError, strictKeyringCache, keyringOverridden;
22509
+ var KEYRING_SERVICE, KEY_WAY_TOKEN, KEY_OAUTH_ACCESS, KEY_OAUTH_REFRESH, TOKEN_SLOTS, keyringCache, StaleKeyringSlotError, strictKeyringCache, keyringOverridden;
22496
22510
  var init_token_store = __esm({
22497
22511
  "src/lib/token-store.ts"() {
22498
22512
  "use strict";
@@ -22501,6 +22515,7 @@ var init_token_store = __esm({
22501
22515
  KEY_WAY_TOKEN = "way_token";
22502
22516
  KEY_OAUTH_ACCESS = "oauth_access_token";
22503
22517
  KEY_OAUTH_REFRESH = "oauth_refresh_token";
22518
+ TOKEN_SLOTS = [KEY_WAY_TOKEN, KEY_OAUTH_ACCESS, KEY_OAUTH_REFRESH];
22504
22519
  StaleKeyringSlotError = class extends Error {
22505
22520
  constructor(account) {
22506
22521
  super(
@@ -23032,7 +23047,7 @@ __export(logout_exports, {
23032
23047
  });
23033
23048
  async function logoutCommand() {
23034
23049
  const token = await getToken();
23035
- if (!token) {
23050
+ if (!token && !await keyringMayHoldToken()) {
23036
23051
  console.log("Not logged in.");
23037
23052
  return;
23038
23053
  }
@@ -23348,8 +23363,8 @@ function parseArgs2(args2) {
23348
23363
  return { json: args2.includes("--json") };
23349
23364
  }
23350
23365
  function buildSkillState() {
23351
- const projectRoot = findGitRoot() ?? process.cwd();
23352
- const installs = findInstalledSkills(projectRoot);
23366
+ const skillRoot = findSkillRootSync();
23367
+ const installs = skillRoot ? findInstalledSkills(skillRoot) : [];
23353
23368
  if (installs.length === 0) {
23354
23369
  return { installed: false, version: null, latest: null, paths: [] };
23355
23370
  }
@@ -46660,8 +46675,8 @@ function componentStatus(current, latest) {
46660
46675
  }
46661
46676
  function resolveVersionStatus(cliVersion) {
46662
46677
  const cliLatest = readVersionCache(CLI_CACHE_FILE)?.latest ?? null;
46663
- const repoRoot = findRepoRootSync() ?? process.cwd();
46664
- const skillCurrent = lowestInstalledVersion(findInstalledSkills(repoRoot));
46678
+ const skillRoot = findSkillRootSync();
46679
+ const skillCurrent = skillRoot ? lowestInstalledVersion(findInstalledSkills(skillRoot)) : null;
46665
46680
  const skillLatest = skillCurrent ? readVersionCache(SKILL_CACHE_FILE)?.latest ?? null : null;
46666
46681
  return { cli: componentStatus(cliVersion, cliLatest), skill: componentStatus(skillCurrent, skillLatest) };
46667
46682
  }
@@ -49635,8 +49650,8 @@ function showUpdateNudges(currentVersion, entryPath) {
49635
49650
  Update available: ${currentVersion} \u2192 ${cliLatest}
49636
49651
  Run \`wayai update\` to update.`);
49637
49652
  }
49638
- const repoRoot = findRepoRootSync() ?? process.cwd();
49639
- const installs = findInstalledSkills(repoRoot);
49653
+ const skillRoot = findSkillRootSync();
49654
+ const installs = skillRoot ? findInstalledSkills(skillRoot) : [];
49640
49655
  const localSkillVersion = installs.length > 0 ? lowestInstalledVersion(installs) : null;
49641
49656
  if (localSkillVersion) {
49642
49657
  const skillLatest = readVersionCache(SKILL_CACHE_FILE)?.latest ?? null;
@@ -49646,7 +49661,7 @@ Skill update available: ${localSkillVersion} \u2192 ${skillLatest}
49646
49661
  Run \`npx skills add wayai-pro/wayai-skill -y\` to update.`);
49647
49662
  }
49648
49663
  }
49649
- const adminInstalls = findInstalledSkills(repoRoot, ADMIN_SKILL_INSTALL_PATHS);
49664
+ const adminInstalls = skillRoot ? findInstalledSkills(skillRoot, ADMIN_SKILL_INSTALL_PATHS) : [];
49650
49665
  const localAdminVersion = adminInstalls.length > 0 ? lowestInstalledVersion(adminInstalls) : null;
49651
49666
  if (localAdminVersion) {
49652
49667
  const adminLatest = readVersionCache(ADMIN_SKILL_CACHE_FILE)?.latest ?? null;