shortcutxl 0.4.0 → 0.4.2

package/native-app/main/index.js

@@ -2,19 +2,19 @@ import { app, session, BrowserWindow, ipcMain, dialog, shell, powerSaveBlocker }
 import { rmSync, mkdirSync as mkdirSync$1, writeFileSync as writeFileSync$1, chmodSync, renameSync, readFileSync as readFileSync$1, existsSync as existsSync$1, openAsBlob, createWriteStream, mkdtempSync } from "node:fs";
 import { readFile, open, stat, rm, mkdir, mkdtemp, writeFile, cp, readdir as readdir$1, chmod, unlink, rename, appendFile } from "node:fs/promises";
 import { join, resolve, extname, basename, dirname, delimiter, sep, relative, isAbsolute } from "node:path";
-import { c as chalk, g as getAgentDir, C as CONFIG_DIR_NAME, a as getPackageDir, b as getUpdateCachePath, V as VERSION, N as NPM_PACKAGE_NAME, d as NPM_REGISTRY_URL, e as getUpdateLaunchCommand, f as getUpdateCommand, h as getUpdateInstruction, i as getBinDir, A as APP_NAME, j as isSetupWorkerMessage } from "./chunks/setup-worker-protocol-QUVpcuEb.js";
+import { c as chalk, g as getAgentDir, C as CONFIG_DIR_NAME, a as getPackageDir, b as getRuntimePackageDir, N as NPM_PACKAGE_NAME, A as APP_NAME, d as getUpdateCachePath, V as VERSION, e as NPM_REGISTRY_URL, f as getUpdateLaunchCommand, h as getUpdateCommand, i as getUpdateInstruction, j as getBinDir, k as isSetupWorkerMessage } from "./chunks/setup-worker-protocol-CHVmPxBP.js";
 import require$$1 from "tty";
 import require$$1$1 from "util";
 import require$$0, { platform, arch, homedir as homedir$1 } from "os";
 import { createRequire } from "module";
 import * as path from "path";
-import path__default, { join as join$1, dirname as dirname$1, basename as basename$1 } from "path";
+import path__default, { join as join$1, win32, posix, dirname as dirname$1, basename as basename$1 } from "path";
 import { fileURLToPath } from "url";
 import { spawn, fork } from "node:child_process";
 import { randomUUID, createHash } from "node:crypto";
 import * as readline from "node:readline";
 import { createRequire as createRequire$1 } from "node:module";
-import require$$0$3, { existsSync, mkdirSync, readFileSync, writeFileSync, chmodSync as chmodSync$1, renameSync as renameSync$1, rmSync as rmSync$1, readdirSync, statSync } from "fs";
+import require$$0$3, { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync, chmodSync as chmodSync$1, renameSync as renameSync$1, rmSync as rmSync$1, readdirSync, statSync } from "fs";
 import { readdir, readFile as readFile$1, stat as stat$1 } from "fs/promises";
 import { randomUUID as randomUUID$1, createHash as createHash$1 } from "crypto";
 import { homedir, hostname } from "node:os";
@@ -273,7 +273,7 @@ const MODEL_CATALOG = {
             control: "adaptive-effort",
             defaultLevel: "medium",
             levels: ["low", "medium", "high", "xhigh", "max"],
-            supportsOff: true
+            supportsOff: false
           }
         },
         protocol: "anthropic-messages"
@@ -2539,7 +2539,8 @@ async function fetchUserInfo(accessToken, options) {
         plan: hasPlan ? data.plan ?? null : void 0,
         proCreditsTier: data.proCreditsTier ?? null,
         authorizedSkillTeamIds: parseAuthorizedSkillTeamIds(data),
-        ...additionalModelPickerEntries.length > 0 ? { additionalModelPickerEntries } : {}
+        ...additionalModelPickerEntries.length > 0 ? { additionalModelPickerEntries } : {},
+        ...typeof data.defaultModelPickerEntryKey === "string" ? { defaultModelPickerEntryKey: data.defaultModelPickerEntryKey } : {}
       };
     } catch (error) {
       if (error instanceof ShortcutIdentityError)
@@ -8779,6 +8780,164 @@ class UpdateCheckScheduler {
 function formatUpdateReminder(update) {
   return `Update available: ${update.currentVersion} → ${update.latestVersion}. Quit all Shortcut terminals and apps, then rerun \`shortcut\` or \`shortcut app\` to update.`;
 }
+function resolveDeps(deps) {
+  return {
+    platform: deps.platform ?? process.platform,
+    env: deps.env ?? process.env,
+    exists: deps.exists ?? existsSync,
+    readFile: deps.readFile ?? ((path2) => readFileSync(path2, "utf-8")),
+    realpath: deps.realpath ?? ((path2) => {
+      try {
+        return realpathSync(path2);
+      } catch {
+        return path2;
+      }
+    })
+  };
+}
+const pathApi = (platform2) => platform2 === "win32" ? win32 : posix;
+function shimNames(platform2) {
+  return platform2 === "win32" ? [`${APP_NAME}.ps1`, `${APP_NAME}.cmd`, `${APP_NAME}.exe`, `${APP_NAME}.bat`] : [APP_NAME];
+}
+function resolveActiveInstallation(deps = {}) {
+  const resolved = resolveDeps(deps);
+  const runningDir = deps.packageDir ?? getRuntimePackageDir();
+  const packageDir = pnpmStableLinkOf(runningDir, resolved) ?? runningDir;
+  const pnpmShim = pnpmShimOf(runningDir, resolved);
+  return {
+    packageDir,
+    npmPrefix: npmGlobalPrefixOf(packageDir, resolved),
+    ...pnpmShim ? { pnpmShim } : {}
+  };
+}
+function pnpmStableLinkOf(packageDir, deps) {
+  const path2 = pathApi(deps.platform);
+  const nodeModules = path2.dirname(packageDir);
+  const storeEntry = path2.dirname(nodeModules);
+  const virtualStore = path2.dirname(storeEntry);
+  if (path2.basename(packageDir) !== NPM_PACKAGE_NAME || path2.basename(nodeModules) !== "node_modules" || !path2.basename(storeEntry).startsWith(`${NPM_PACKAGE_NAME}@`) || path2.basename(virtualStore) !== ".pnpm")
+    return void 0;
+  const root = path2.dirname(virtualStore);
+  const candidates = [path2.join(root, "node_modules", NPM_PACKAGE_NAME)];
+  if (path2.basename(root) === "node_modules")
+    candidates.push(path2.join(root, NPM_PACKAGE_NAME));
+  return candidates.find((candidate) => isShortcutPackage(candidate, deps));
+}
+function pnpmHomeOf(packageDir, deps) {
+  const path2 = pathApi(deps.platform);
+  let directory = packageDir;
+  let child;
+  while (path2.dirname(directory) !== directory) {
+    const name = path2.basename(directory);
+    if ((name === "global" || name === "store") && child && /^v?\d+$/.test(child)) {
+      return path2.dirname(directory);
+    }
+    child = name;
+    directory = path2.dirname(directory);
+  }
+  return void 0;
+}
+function pnpmShimOf(packageDir, deps) {
+  const path2 = pathApi(deps.platform);
+  const homes = [pnpmHomeOf(deps.realpath(packageDir), deps), deps.env.PNPM_HOME].filter((home) => Boolean(home));
+  for (const home of new Set(homes)) {
+    for (const directory of [path2.join(home, "bin"), home]) {
+      for (const name of shimNames(deps.platform)) {
+        const shim = path2.join(directory, name);
+        if (!deps.exists(shim))
+          continue;
+        const target = packageDirOfShim(shim, deps);
+        if (target && isSameInstallation(target, packageDir, deps))
+          return shim;
+      }
+    }
+  }
+  return void 0;
+}
+function npmGlobalPrefixOf(packageDir, deps) {
+  const path2 = pathApi(deps.platform);
+  const nodeModules = path2.dirname(packageDir);
+  if (path2.basename(packageDir) !== NPM_PACKAGE_NAME || path2.basename(nodeModules) !== "node_modules")
+    return void 0;
+  if (deps.platform === "win32") {
+    const prefix2 = path2.dirname(nodeModules);
+    return deps.exists(path2.join(prefix2, `${APP_NAME}.cmd`)) ? prefix2 : void 0;
+  }
+  const lib = path2.dirname(nodeModules);
+  if (path2.basename(lib) !== "lib")
+    return void 0;
+  const prefix = path2.dirname(lib);
+  return deps.exists(path2.join(prefix, "bin", APP_NAME)) ? prefix : void 0;
+}
+const MAX_SHIM_HOPS = 4;
+function packageDirOfShim(shim, deps, hops = 0) {
+  const path2 = pathApi(deps.platform);
+  if (deps.platform !== "win32") {
+    let directory = path2.dirname(deps.realpath(shim));
+    for (let depth = 0; depth < 6; depth += 1) {
+      if (isShortcutPackage(directory, deps))
+        return directory;
+      const parent = path2.dirname(directory);
+      if (parent === directory)
+        break;
+      directory = parent;
+    }
+  }
+  let text;
+  try {
+    text = deps.readFile(shim);
+  } catch {
+  }
+  if (text !== void 0) {
+    for (const target of shimTargets(text, path2.dirname(shim), deps)) {
+      const name = path2.basename(target);
+      if (name === "cli.js" && path2.basename(path2.dirname(target)) === "dist") {
+        const packageDir = path2.dirname(path2.dirname(target));
+        if (isShortcutPackage(packageDir, deps))
+          return packageDir;
+      } else if (hops < MAX_SHIM_HOPS && target !== shim && isShimName(name, deps.platform) && deps.exists(target)) {
+        const packageDir = packageDirOfShim(target, deps, hops + 1);
+        if (packageDir)
+          return packageDir;
+      }
+    }
+  }
+  if (deps.platform !== "win32")
+    return void 0;
+  const npmLayout = path2.join(path2.dirname(shim), "node_modules", NPM_PACKAGE_NAME);
+  return isShortcutPackage(npmLayout, deps) ? npmLayout : void 0;
+}
+function shimTargets(text, shimDir, deps) {
+  const path2 = pathApi(deps.platform);
+  const targets = [];
+  for (const match of text.matchAll(/(?:%~?dp0%?|\$basedir(?:_abs|_win)?)[\\/]+([^"'\s%$*]+)/gi)) {
+    const relative2 = deps.platform === "win32" ? match[1].replaceAll("/", "\\") : match[1].replaceAll("\\", "/");
+    const target = path2.resolve(shimDir, relative2);
+    if (!targets.includes(target))
+      targets.push(target);
+  }
+  return targets;
+}
+function isShimName(name, platform2) {
+  const lower = platform2 === "win32" ? name.toLowerCase() : name;
+  return lower === APP_NAME || shimNames(platform2).includes(lower);
+}
+function isShortcutPackage(directory, deps) {
+  try {
+    const manifest = JSON.parse(deps.readFile(pathApi(deps.platform).join(directory, "package.json")));
+    return manifest?.name === NPM_PACKAGE_NAME;
+  } catch {
+    return false;
+  }
+}
+function isSameInstallation(left, right, deps = {}) {
+  const resolved = resolveDeps(deps);
+  const normalize = (value) => {
+    const real = pathApi(resolved.platform).resolve(resolved.realpath(value));
+    return resolved.platform === "win32" ? real.toLowerCase() : real;
+  };
+  return normalize(left) === normalize(right);
+}
 async function resolveStartupUpdateStatus(options = {}) {
   const cachePath = options.cachePath ?? getUpdateCachePath();
   const currentVersion = options.currentVersion ?? VERSION;
@@ -8787,7 +8946,11 @@ async function resolveStartupUpdateStatus(options = {}) {
     return { kind: "none", currentVersion };
   }
   const cache = readUpdateCache(cachePath);
-  return getUpdateStatusFromCache(cache, { currentVersion, packageName });
+  return getUpdateStatusFromCache(cache, {
+    currentVersion,
+    packageName,
+    installation: options.installation
+  });
 }
 async function refreshUpdateStatus(options = {}, deps = {}) {
   const cachePath = options.cachePath ?? getUpdateCachePath();
@@ -8797,14 +8960,22 @@ async function refreshUpdateStatus(options = {}, deps = {}) {
   const now = options.now ?? /* @__PURE__ */ new Date();
   const cache = readUpdateCache(cachePath);
   if (options.skipCheck || options.offline) {
-    return getUpdateStatusFromCache(cache, { currentVersion, packageName });
+    return getUpdateStatusFromCache(cache, {
+      currentVersion,
+      packageName,
+      installation: options.installation
+    });
   }
   let refreshed;
   try {
     refreshed = await fetchAndPersistUpdateCache({ cachePath, registryUrl, now }, deps);
   } catch {
   }
-  return getUpdateStatusFromCache(refreshed ?? cache, { currentVersion, packageName });
+  return getUpdateStatusFromCache(refreshed ?? cache, {
+    currentVersion,
+    packageName,
+    installation: options.installation
+  });
 }
 function getUpdateStatusFromCache(cache, options) {
   const noUpdate = {
@@ -8819,13 +8990,16 @@ function getUpdateStatusFromCache(cache, options) {
     return noUpdate;
   }
   const packageName = options.packageName ?? NPM_PACKAGE_NAME;
+  const installation = options.installation ?? resolveActiveInstallation();
+  const target = { version: cache.latestVersion, npmPrefix: installation.npmPrefix };
   return {
     kind: "available",
     currentVersion: options.currentVersion,
     latestVersion: cache.latestVersion,
     instruction: getUpdateInstruction(packageName),
-    command: getUpdateCommand(packageName),
-    launch: getUpdateLaunchCommand(packageName),
+    command: getUpdateCommand(packageName, target),
+    launch: getUpdateLaunchCommand(packageName, target),
+    installation,
     lastCheckedAt: cache.lastCheckedAt
   };
 }
@@ -14138,8 +14312,8 @@ function createDeviceRunnerService(options) {
       Promise.resolve().then(() => shortcutDeployment),
       Promise.resolve().then(() => auth),
       import("./chunks/secret-store-CbWo_9sG.js"),
-      import("./chunks/config-CwtqLhpn.js"),
-      import("./chunks/setup-worker-protocol-QUVpcuEb.js").then((n) => n.w)
+      import("./chunks/config-DSoKsgPT.js"),
+      import("./chunks/setup-worker-protocol-CHVmPxBP.js").then((n) => n.x)
     ]);
     const apiUrl = getShortcutApiUrl2();
     const agentDir = config.getAgentDir();
@@ -18235,7 +18409,7 @@ const startupDiagnostics = createStartupDiagnosticWriter({
   resolveRemoteContext: (cwd, binding) => resolveDesktopStartupLogContext({ cwd, binding }),
   directory: join(app.getPath("userData"), "logs"),
   appVersion: app.getVersion(),
-  runtimeBundleVersion: "0.4.0",
+  runtimeBundleVersion: "0.4.2",
   launchRoute: readLaunchArgument("shortcut-runtime-cli") ? "explicit" : app.isPackaged ? "packaged" : "unpackaged"
 });
 const agents = new AgentProcessManager({
@@ -18251,7 +18425,7 @@ const fileMentions = new FileMentionSearchService();
 let mainWindow = null;
 let attachmentTempDirectory;
 const updateOptions = {
-  currentVersion: "0.4.0",
+  currentVersion: "0.4.2",
   offline: isTruthyEnvFlag(process.env.SHORTCUT_OFFLINE),
   skipCheck: isTruthyEnvFlag(process.env.SHORTCUT_SKIP_VERSION_CHECK),
   onNotice: (notice) => mainWindow?.webContents.send(AgentIpcChannel.UpdateNoticeEvent, notice)
@@ -18271,7 +18445,7 @@ const setup = new AppSetupManager({
 });
 const deviceRunner = createDeviceRunnerService({
   userDataDir: app.getPath("userData"),
-  appVersion: "0.4.0",
+  appVersion: "0.4.2",
   nodePath: process.execPath,
   cliPath: runtimeLayout.cliPath,
   defaultRuntimeDir: join(process.resourcesPath, "automation-runtime"),
@@ -18524,7 +18698,7 @@ function createWindow() {
         `${JSON.stringify({
           appReady: true,
           packaged: app.isPackaged,
-          version: "0.4.0",
+          version: "0.4.2",
           runtimeCliPath: runtimeLayout.cliPath,
           runtimeExists: existsSync$1(runtimeLayout.cliPath)
         })}

package/native-app/main/setup-worker.js

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import "node:fs";
-import { c as chalk, k as getStableXllDir, a as getPackageDir, V as VERSION, l as getXllPath, g as getAgentDir, m as getEmbeddedPythonExe, n as getWordBridgePath, o as getPowerPointBridgePath, p as isInstalled, q as isSourceCheckout, r as isSetupWorkerResponse } from "./chunks/setup-worker-protocol-QUVpcuEb.js";
+import { c as chalk, l as getStableXllDir, a as getPackageDir, V as VERSION, m as getXllPath, g as getAgentDir, n as getEmbeddedPythonExe, o as getWordBridgePath, p as getPowerPointBridgePath, q as isInstalled, r as isSourceCheckout, s as isSetupWorkerResponse } from "./chunks/setup-worker-protocol-CHVmPxBP.js";
 import { spawn, spawnSync } from "child_process";
 import { createInterface } from "readline";
 import { existsSync, readdirSync, mkdirSync, readFileSync, writeFileSync, rmSync, unlinkSync, statSync, copyFileSync, utimesSync, openSync, readSync, closeSync } from "fs";
@@ -167,7 +167,7 @@ async function runPreflight(options = {}) {
   let passed;
   let diagnostics;
   if (process.platform === "darwin") {
-    const mac = await import("./chunks/mac-Bt_bFwUg.js");
+    const mac = await import("./chunks/mac-Dg93p_2s.js");
     const uvReady = await mac.ensureUv();
     if (uvReady) {
       const pythonReady = await mac.ensureUvPython();
@@ -179,7 +179,7 @@ async function runPreflight(options = {}) {
     mac.ensureNewSheet();
     passed = mac.smokeTestSheetEngine();
   } else if (process.platform === "linux") {
-    const linux = await import("./chunks/linux-C5J5oKJy.js");
+    const linux = await import("./chunks/linux-TBGGGecs.js");
     const uvReady = await linux.ensureUv();
     if (uvReady) {
       const pythonReady = await linux.ensureUvPython();

package/native-app/package.json

@@ -4,5 +4,5 @@
   "private": true,
   "type": "module",
   "main": "main/index.js",
-  "version": "0.4.0"
+  "version": "0.4.2"
 }