linkshell-cli 0.10.42 → 0.10.45

package/src/commands/login.ts

@@ -42,14 +42,14 @@ export async function runLogin(): Promise<LoginResult | null> {
   const hash = window.location.hash.substring(1);
   if (hash) {
     fetch('/token?' + hash, { method: 'POST' })
-      .then(() => { document.body.innerHTML = '<h2>Login successful! You can close this tab.</h2>'; })
+      .then(response => { if (!response.ok) throw new Error('Login failed'); document.body.innerHTML = '<h2>Login successful! You can close this tab.</h2>'; })
       .catch(() => { document.body.innerHTML = '<h2>Login failed. Please try again.</h2>'; });
   } else {
     // Try query params (iTool may pass tokens as query params)
     const params = window.location.search.substring(1);
     if (params) {
       fetch('/token?' + params, { method: 'POST' })
-        .then(() => { document.body.innerHTML = '<h2>Login successful! You can close this tab.</h2>'; })
+        .then(response => { if (!response.ok) throw new Error('Login failed'); document.body.innerHTML = '<h2>Login successful! You can close this tab.</h2>'; })
         .catch(() => { document.body.innerHTML = '<h2>Login failed. Please try again.</h2>'; });
     } else {
       document.body.innerHTML = '<h2>No auth data received. Please try again.</h2>';
@@ -120,10 +120,16 @@ export async function runLogin(): Promise<LoginResult | null> {
           }
         } catch {}
 
+        if (!userId) {
+          res.writeHead(401);
+          res.end("无法验证账号，请重新登录。");
+          return;
+        }
+
         const tokens: AuthTokens = {
           accessToken,
           refreshToken,
-          expiresAt: Date.now() + expiresIn * 1000,
+          expiresAt: Date.now() + (Number.isFinite(expiresIn) && expiresIn > 0 ? expiresIn : 3600) * 1000,
           userId,
           email,
         };
@@ -156,6 +162,8 @@ export async function runLogin(): Promise<LoginResult | null> {
       res.end("Not found");
     });
 
+    server.on("error", () => { clearTimeout(timeout); resolve(null); });
+
     server.listen(0, "127.0.0.1", () => {
       const addr = server.address();
       if (!addr || typeof addr === "string") {

package/src/commands/upgrade.ts

@@ -1,6 +1,8 @@
 import { execFileSync, type ExecFileSyncOptionsWithStringEncoding } from "node:child_process";
 import { realpathSync } from "node:fs";
 import { join, sep } from "node:path";
+import { standaloneBundle } from "../utils/standalone.js";
+import { linkshellDir } from "../utils/daemon.js";
 import { runUpgradeWorker, type CliCommand } from "./upgrade-worker.js";
 
 function isBrewInstall(): boolean {
@@ -34,6 +36,13 @@ async function fetchLatestVersion(): Promise<string | null> {
 }
 
 export async function runUpgrade(current: string): Promise<void> {
+  const app = standaloneBundle();
+  if (app) {
+    execFileSync("/usr/bin/open", ["-n", "-a", app, "--args", "--dashboard", "--check-updates", "--home", linkshellDir()]);
+    process.stderr.write("  已打开 LinkShell 软件更新；App、内置 CLI 和 Host 将一起更新。\n");
+    return;
+  }
+
   process.stderr.write(`\n  Current version: ${current}\n  Checking for updates...\n\n`);
   const latest = await fetchLatestVersion();
   if (!latest) {

package/src/index.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { standaloneBundle } from "./utils/standalone.js";
 import { Command, Option } from "commander";
 import { runDoctor } from "./commands/doctor.js";
 import { runSetup } from "./commands/setup.js";
@@ -10,6 +11,10 @@ import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
 const pkg = require("../../../package.json") as { version: string };
 
+const bundledApp = standaloneBundle();
+if (bundledApp) process.env.LINKSHELL_APP_BUNDLE = bundledApp;
+else delete process.env.LINKSHELL_APP_BUNDLE;
+
 const program = new Command();
 
 program
@@ -19,6 +24,14 @@ program
   )
   .version(pkg.version);
 
+program.command("app")
+  .description("Open the native Mac status app (included with the CLI)")
+  .action(async () => { const { openDesktop } = await import("./commands/desktop.js"); await openDesktop(); });
+
+program.command("desktop", { hidden: true })
+  .option("--action <action>", "snapshot, start, stop or restart", "snapshot")
+  .action(async (options) => { const { runDesktop } = await import("./commands/desktop.js"); await runDesktop(pkg.version, options.action); });
+
 // ── host ────────────────────────────────────────────────────────────
 
 const hostCmd = program

package/src/utils/daemon.ts

@@ -12,7 +12,7 @@ const hostLaunchFile = join(LINKSHELL_DIR, "host-launch.json");
 export function saveHostLaunch(pid: number, tcpPort?: number): void {
   const env = Object.fromEntries(HOST_ENV.flatMap((key) => process.env[key] === undefined ? [] : [[key, process.env[key]]]));
   if (tcpPort !== undefined) env.LINKSHELL_DEV_PORT = String(tcpPort);
-  writeFileSync(hostLaunchFile, `${JSON.stringify({ pid, env })}\n`, { mode: 0o600 });
+  writeFileSync(hostLaunchFile, `${JSON.stringify({ pid, env, executable: process.execPath, entry: process.argv[1], appBundle: process.env.LINKSHELL_APP_BUNDLE })}\n`, { mode: 0o600 });
 }
 
 export function readHostLaunch(pid: number): NodeJS.ProcessEnv {
@@ -26,6 +26,14 @@ export function readHostLaunch(pid: number): NodeJS.ProcessEnv {
   }
 }
 
+/** Ownership is recorded by the host itself, and is valid only for that live PID. */
+export function readHostOwner(pid: number): string | undefined {
+  try {
+    const saved = JSON.parse(readFileSync(hostLaunchFile, "utf8")) as { pid?: number; appBundle?: string };
+    return saved.pid === pid && typeof saved.appBundle === "string" ? saved.appBundle : undefined;
+  } catch { return undefined; }
+}
+
 // "bridge" is the 1.x daemon: nothing starts one any more, but `linkshell stop` still ends one left running.
 type ServiceName = "gateway" | "bridge" | "host";
 
@@ -110,7 +118,7 @@ export function spawnDaemon(service: ServiceName, args: string[], env: NodeJS.Pr
       detached: true,
       stdio: ["ignore", out, err],
       // The launching terminal's environment is the most faithful one agents can get.
-      env: { ...env, LINKSHELL_ENV_FROM_TERMINAL: "1" },
+      env: { ...env, LINKSHELL_ENV_FROM_TERMINAL: env.LINKSHELL_APP_BUNDLE ? "0" : "1" },
     },
   );
 

package/src/utils/standalone.ts

@@ -0,0 +1,13 @@
+import { existsSync, realpathSync } from "node:fs";
+import { join } from "node:path";
+
+/** Only an entry point physically inside a complete app may claim app-managed updates. */
+export function standaloneBundle(entry = process.argv[1] ?? ""): string | undefined {
+  let path: string;
+  try { path = realpathSync(entry); } catch { return undefined; }
+  const marker = ".app/Contents/Resources/runtime/cli/";
+  const index = path.lastIndexOf(marker);
+  if (index < 0) return undefined;
+  const app = path.slice(0, index + 4);
+  return existsSync(join(app, "Contents/Resources/standalone.json")) && existsSync(join(app, "Contents/MacOS/node")) ? app : undefined;
+}