@co0ontty/wand 4.48.0 → 4.49.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "2c450db11f34504be1a3e73354679a0231a91c43",
-  "builtAt": "2026-08-23T13:37:45.889Z",
-  "version": "4.48.0",
+  "commit": "e521372a025630229f6976b2c6800084e851a8e7",
+  "builtAt": "2026-08-23T23:10:59.104Z",
+  "version": "4.49.0",
   "channel": "stable"
 }

package/dist/config.d.ts

@@ -10,6 +10,12 @@ import type { WandStorage } from "./storage.js";
 export declare const PREFERENCE_KEYS: readonly ["defaultProvider", "defaultSessionKind", "defaultTaskWorktree", "defaultMode", "defaultCwd", "defaultModel", "defaultCodexModel", "defaultOpenCodeModel", "defaultGrokModel", "defaultQoderModel", "defaultPiModel", "commitCli", "commitModel", "commitAiSource", "systemAi", "defaultThinkingEffort", "structuredRunner", "language", "cardDefaults", "inheritEnv"];
 export type PreferenceKey = (typeof PREFERENCE_KEYS)[number];
 export declare function isPreferenceKey(key: string): key is PreferenceKey;
+/**
+ * The user's login shell from passwd, then $SHELL, then a platform default.
+ * Launchd / systemd usually omit $SHELL, so falling back to /bin/bash made PTY
+ * sessions look like a generic sh even when the account default is zsh.
+ */
+export declare function resolveDefaultShell(): string;
 export declare const defaultConfig: () => WandConfig;
 export declare function resolveConfigPath(inputPath?: string): string;
 export declare function resolveConfigDir(configPath: string): string;

package/dist/config.js

@@ -1,6 +1,7 @@
 import crypto from "node:crypto";
 import { existsSync } from "node:fs";
 import { chmod, mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
+import os from "node:os";
 import path from "node:path";
 import process from "node:process";
 import { isRunningAsRoot } from "./env-utils.js";
@@ -50,6 +51,28 @@ function preferenceStorageKey(key) {
 export function isPreferenceKey(key) {
     return PREFERENCE_KEY_SET.has(key);
 }
+/**
+ * The user's login shell from passwd, then $SHELL, then a platform default.
+ * Launchd / systemd usually omit $SHELL, so falling back to /bin/bash made PTY
+ * sessions look like a generic sh even when the account default is zsh.
+ */
+export function resolveDefaultShell() {
+    if (process.platform === "win32") {
+        return process.env.COMSPEC || "cmd.exe";
+    }
+    try {
+        const loginShell = os.userInfo().shell?.trim();
+        if (loginShell)
+            return loginShell;
+    }
+    catch {
+        // userInfo() throws when the process has no passwd entry.
+    }
+    const envShell = process.env.SHELL?.trim();
+    if (envShell)
+        return envShell;
+    return process.platform === "darwin" ? "/bin/zsh" : "/bin/bash";
+}
 export const defaultConfig = () => ({
     host: "127.0.0.1",
     port: 8443,
@@ -64,7 +87,7 @@ export const defaultConfig = () => ({
     // 注意：defaultMode 是偏好字段，只存 SQLite、不写 config.json（见 stripPreferenceFields），
     // 这里仅作为「用户从未在设置里显式选过模式」时的回落值——显式选择始终优先。
     defaultMode: isRunningAsRoot() ? "default" : "managed",
-    shell: process.env.SHELL || "/bin/bash",
+    shell: resolveDefaultShell(),
     defaultCwd: process.cwd(),
     startupCommands: [],
     allowedCommandPrefixes: [],

package/dist/distribution-manager.d.ts

@@ -16,7 +16,13 @@ export interface ResolvedDistributionAsset {
     size: number;
     source: "local" | "github";
     releaseNotes?: string;
-    /** 本地分发文件的 SHA-256（hex）；GitHub 来源不提供，客户端据此跳过校验。 */
+    /** 本地文件哈希或 GitHub Release asset.digest；客户端下载后校验。 */
+    sha256?: string;
+}
+export interface GitHubApkDownload {
+    remoteUrl: string;
+    fileName: string;
+    size: number;
     sha256?: string;
 }
 export interface DistributionSettings {
@@ -37,6 +43,15 @@ export interface DistributionManagerOptions {
  * 不该出现在 Android 的更新弹窗。保留分隔线前的变更摘要，并兼容旧版正文。
  */
 export declare function extractUpdateSummary(releaseBody: string): string;
+/**
+ * GitHub Release 文件名带 semver build metadata（`wand-v4.48.0+202608232136.apk`）。
+ * `+` 在 content URI / 部分 OEM 安装器里会被当成空格，下载成功后无法拉起安装。
+ * 落盘和对外 fileName 都改成 `-`，版本比较仍用原始 GitHub 文件名提取的 version。
+ */
+export declare function sanitizeApkFileName(fileName: string): string;
+/** 解析 GitHub Release asset.digest（`sha256:<hex>`）；格式不对返回 undefined。 */
+export declare function parseGithubDigest(digest: string | undefined): string | undefined;
+export declare function githubApkProxyPath(channel?: ApkUpdateChannel): string;
 export declare class DistributionManager {
     private readonly options;
     private readonly fetchImpl;
@@ -44,6 +59,11 @@ export declare class DistributionManager {
     private readonly githubCache;
     constructor(options: DistributionManagerOptions);
     resolveLatestApk(channel: ApkUpdateChannel): Promise<ResolvedDistributionAsset | null>;
+    /**
+     * 给 `/android/download?source=github` 用：原始 GitHub URL 只留在服务端，
+     * 客户端只拿到同源代理地址。fileName 已去掉 `+`。
+     */
+    resolveGitHubApkDownload(): Promise<GitHubApkDownload | null>;
     resolveAndroidDownload(channel?: ApkUpdateChannel): Promise<LocalDistributionAsset | null>;
     /**
      * 清理 Android 分发目录，只保留最新的一个 APK。在设备开始下载 Beta 包时

package/dist/distribution-manager.js

@@ -12,6 +12,30 @@ export function extractUpdateSummary(releaseBody) {
     const summary = releaseBody.split(/\r?\n---\s*(?:\r?\n|$)/, 1)[0]?.trim() ?? "";
     return summary.slice(0, 500);
 }
+/**
+ * GitHub Release 文件名带 semver build metadata（`wand-v4.48.0+202608232136.apk`）。
+ * `+` 在 content URI / 部分 OEM 安装器里会被当成空格，下载成功后无法拉起安装。
+ * 落盘和对外 fileName 都改成 `-`，版本比较仍用原始 GitHub 文件名提取的 version。
+ */
+export function sanitizeApkFileName(fileName) {
+    const base = fileName.replace(/^.*[/\\]/, "").trim() || "wand-update.apk";
+    const replaced = base.replaceAll("+", "-").replace(/[^A-Za-z0-9._-]+/g, "-");
+    if (!replaced.toLowerCase().endsWith(".apk"))
+        return `${replaced || "wand-update"}.apk`;
+    return replaced;
+}
+/** 解析 GitHub Release asset.digest（`sha256:<hex>`）；格式不对返回 undefined。 */
+export function parseGithubDigest(digest) {
+    if (!digest)
+        return undefined;
+    const match = /^sha256:([a-fA-F0-9]{64})$/.exec(digest.trim());
+    return match ? match[1].toLowerCase() : undefined;
+}
+export function githubApkProxyPath(channel) {
+    return channel
+        ? `/android/download?channel=${channel}&source=github`
+        : "/android/download?source=github";
+}
 function asRecord(value) {
     return value && typeof value === "object" ? value : null;
 }
@@ -70,7 +94,14 @@ export class DistributionManager {
             size: localApk.size,
             source: "local",
         } : null;
-        const github = githubApk ? { ...githubApk, source: "github" } : null;
+        const github = githubApk ? {
+            ...githubApk,
+            source: "github",
+            // 手机不要直连 GitHub CDN：检查接口能通只说明 wand server 能访问 api.github.com，
+            // objects/release-assets.githubusercontent.com 在移动网上经常被重置。
+            fileName: sanitizeApkFileName(githubApk.fileName),
+            downloadUrl: githubApkProxyPath(channel),
+        } : null;
         let winner;
         if (local && github) {
             winner = compareApkInstallOrder(github.version, local.version) > 0 ? github : local;
@@ -78,7 +109,7 @@ export class DistributionManager {
         else {
             winner = local ?? github;
         }
-        // 本地分发的 APK 附带 SHA-256，客户端下载后校验（GitHub 来源走正规 TLS，不提供）。
+        // 本地分发现算 SHA-256；GitHub 来源用 Release digest，随 spread 带上。
         if (winner?.source === "local" && localApk) {
             try {
                 const fileStat = await stat(localApk.filePath);
@@ -93,6 +124,21 @@ export class DistributionManager {
         }
         return winner;
     }
+    /**
+     * 给 `/android/download?source=github` 用：原始 GitHub URL 只留在服务端，
+     * 客户端只拿到同源代理地址。fileName 已去掉 `+`。
+     */
+    async resolveGitHubApkDownload() {
+        const asset = await this.fetchGitHubAsset(".apk");
+        if (!asset)
+            return null;
+        return {
+            remoteUrl: asset.downloadUrl,
+            fileName: sanitizeApkFileName(asset.fileName),
+            size: asset.size,
+            sha256: asset.sha256,
+        };
+    }
     async resolveAndroidDownload(channel = "beta") {
         await this.refreshConfig();
         const { config, configDir } = this.options;
@@ -376,11 +422,13 @@ export class DistributionManager {
             const version = extractArtifactVersion(hit.asset.name, extension)
                 ?? extractArtifactVersion(hit.tagName, extension)
                 ?? hit.tagName.replace(/^v/, "");
+            const sha256 = parseGithubDigest(hit.asset.digest);
             const asset = {
                 version,
                 downloadUrl: hit.asset.browser_download_url,
                 fileName: hit.asset.name,
                 size: hit.asset.size,
+                ...(sha256 ? { sha256 } : {}),
                 ...(extension === ".apk" && hit.body ? { releaseNotes: extractUpdateSummary(hit.body) } : {}),
             };
             this.githubCache.set(extension, { asset, timestamp: this.now() });
@@ -409,11 +457,18 @@ export class DistributionManager {
         return null;
     }
     buildSettings(kind, directory, enabled, local, github) {
-        const selected = local
+        let selected = local
             ? { ...local, source: "local" }
             : github
                 ? { ...github, updatedAt: null, source: "github" }
                 : null;
+        if (kind === "apk" && selected?.source === "github" && github) {
+            selected = {
+                ...selected,
+                fileName: sanitizeApkFileName(github.fileName),
+                downloadUrl: githubApkProxyPath(),
+            };
+        }
         const hasKey = kind === "apk" ? "hasApk" : kind === "dmg" ? "hasDmg" : "hasIpa";
         const dirKey = kind === "apk" ? "apkDir" : kind === "dmg" ? "dmgDir" : "ipaDir";
         return {

package/dist/process-manager.js

@@ -14,7 +14,7 @@ import { buildLanguageDirective, buildManagedAutonomyDirective } from "./languag
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { getProviderCommandSessionId, getProviderResumeCommandSessionId } from "./resume-policy.js";
 import { normalizeThinkingEffort, thinkingEffortToClaudeCliEffort, thinkingEffortToClaudeSlashEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToOpenCodeVariant, thinkingEffortToPiLevel } from "./structured-provider-common.js";
-import { SessionTopicCoordinator } from "./session-topic.js";
+import { SessionTopicCoordinator, shouldGenerateSessionTopicFromPtyInput } from "./session-topic.js";
 import { getErrorMessage } from "./error-utils.js";
 import { resolveSystemAiContext } from "./session-ai-context.js";
 import { resolveSessionCwd } from "./session-cwd.js";
@@ -1116,7 +1116,10 @@ export class ProcessManager extends EventEmitter {
                 env: buildChildEnv(this.config.inheritEnv !== false, {
                     WAND_MODE: effectiveMode,
                     WAND_AUTO_CONFIRM: record.autoApprovePermissions ? "1" : "0",
-                    WAND_AUTO_EDIT: effectiveMode === "auto-edit" ? "1" : "0"
+                    WAND_AUTO_EDIT: effectiveMode === "auto-edit" ? "1" : "0",
+                    SHELL: this.config.shell,
+                    LANG: process.env.LANG || process.env.LC_ALL || process.env.LC_CTYPE || "C.UTF-8",
+                    LC_CTYPE: process.env.LC_CTYPE || process.env.LANG || process.env.LC_ALL || "C.UTF-8",
                 }),
                 name: "xterm-256color",
                 // 使用 record 上由前端协商好的真实尺寸，避免"先 120 列、几百毫秒后再 resize"
@@ -1494,7 +1497,7 @@ export class ProcessManager extends EventEmitter {
             console.error(`[ProcessManager] Rejecting input: session ${id} has no PTY`);
             throw new SessionInputError("Session is not running.", "SESSION_NO_PTY", id, record.status);
         }
-        if (view !== "terminal")
+        if (shouldGenerateSessionTopicFromPtyInput(view, shortcutKey))
             this.maybeGenerateSessionTopic(id, input);
         // Log shortcut key interactions for auto-confirm and mode analysis
         if (shortcutKey) {

package/dist/pty-shell-launch.js

@@ -91,6 +91,15 @@ export class PtyCliExitMarker {
         return { data: combined, exitCode: null };
     }
 }
+function buildTerminalRestoreCommand() {
+    // Provider TUIs often die on Ctrl+C without leaving the alternate screen or
+    // resetting mouse / bracketed-paste / application-keypad modes. Restore a
+    // normal interactive tty before handing the session to the user's shell.
+    return [
+        "printf '\\033[?1049l\\033[?25h\\033[m\\033[?1000l\\033[?1002l\\033[?1003l\\033[?1006l\\033[?2004l\\r\\n'",
+        "stty sane 2>/dev/null || :",
+    ].join("; ");
+}
 function buildPosixProviderShellCommand(command, shell, marker) {
     // The non-default SIGINT trap keeps the launcher shell alive when Ctrl+C
     // terminates its foreground CLI. External commands reset caught traps to the
@@ -102,7 +111,10 @@ function buildPosixProviderShellCommand(command, shell, marker) {
         "trap ':' INT",
         `if ${command}; then __wand_cli_status=0; else __wand_cli_status=$?; fi`,
         `printf '\\036WAND_CLI_EXIT:${marker.token}:%s\\037' "$__wand_cli_status"`,
-        `exec ${quotePosixShell(shell)} -l`,
+        buildTerminalRestoreCommand(),
+        // -i forces an interactive prompt even if tty detection is confused after a
+        // TUI teardown; -l matches Terminal.app / iTerm login-shell startup files.
+        `exec ${quotePosixShell(shell)} -il`,
     ].join("; ");
 }
 /**
@@ -114,7 +126,7 @@ export function buildPtyShellLaunchPlan(options) {
     const platform = options.platform ?? os.platform();
     if (options.bareShell) {
         return {
-            shellArgs: platform === "win32" ? [] : ["-l"],
+            shellArgs: platform === "win32" ? [] : ["-il"],
             cliExitMarker: null,
         };
     }
@@ -130,7 +142,7 @@ export function buildPtyShellLaunchPlan(options) {
         const marker = new PtyCliExitMarker(options.markerToken);
         return {
             // Interactive + login initialization matches a real terminal before the
-            // provider starts; `exec <shell> -l` becomes the persistent prompt after it exits.
+            // provider starts; `exec <shell> -il` becomes the persistent prompt after it exits.
             shellArgs: ["-lic", buildPosixProviderShellCommand(options.command, options.shell, marker)],
             cliExitMarker: marker,
         };

package/dist/server-update-routes.d.ts

@@ -1,4 +1,5 @@
 import type { Express, RequestHandler } from "express";
+import type { GitHubApkDownload } from "./distribution-manager.js";
 import type { ModelCatalogService } from "./models.js";
 import type { PackageUpdateInfo, UpdateChannel } from "./npm-update-utils.js";
 import { type ProviderCliUpdateStatus } from "./provider-cli-updater.js";
@@ -21,6 +22,8 @@ interface ResolvedUpdateAsset {
 export interface PublicUpdateRoutesDependencies {
     resolveLatestApk(channel: "stable" | "beta"): Promise<ResolvedUpdateAsset | null>;
     resolveAndroidDownload(channel: "stable" | "beta"): Promise<DownloadAsset | null>;
+    /** GitHub 来源由服务端代拉，避免手机直连 CDN。测试 stub 可不实现。 */
+    resolveGitHubApkDownload?(): Promise<GitHubApkDownload | null>;
     /** Beta 包下发时清理分发目录，只保留最新一个 APK（可选，测试 stub 可不实现）。 */
     pruneAndroidApkDirectory?(keepFileName?: string): Promise<{
         deleted: string[];

package/dist/server-update-routes.js

@@ -1,9 +1,52 @@
+import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import { getErrorMessage } from "./error-utils.js";
 import { asyncRoute } from "./express-async.js";
 import { checkProviderCliUpdates, updateProviderClis, verifyProviderCliUpdateResults, } from "./provider-cli-updater.js";
 import { streamFileWithRange } from "./server-file-routes.js";
 import { compareApkInstallOrder, compareSemver } from "./version-utils.js";
 import { canUseDetachedUpdateHelper, startDetachedUpdateHelper } from "./update-helper.js";
+const GITHUB_PROXY_TIMEOUT_MS = 5 * 60 * 1000;
+async function proxyGitHubApk(_req, res, asset, fetchImpl = fetch) {
+    let remote;
+    try {
+        remote = await fetchImpl(asset.remoteUrl, {
+            headers: {
+                "User-Agent": "wand-server",
+                Accept: "application/octet-stream",
+            },
+            redirect: "follow",
+            signal: AbortSignal.timeout(GITHUB_PROXY_TIMEOUT_MS),
+        });
+    }
+    catch (error) {
+        res.status(502).json({ error: getErrorMessage(error, "从 GitHub 下载安装包失败。") });
+        return;
+    }
+    if (!remote.ok || !remote.body) {
+        res.status(502).json({ error: `从 GitHub 下载安装包失败（HTTP ${remote.status}）。` });
+        return;
+    }
+    const remoteLength = Number(remote.headers.get("content-length"));
+    const size = Number.isFinite(remoteLength) && remoteLength > 0 ? remoteLength : asset.size;
+    res.status(200);
+    res.setHeader("Content-Type", "application/vnd.android.package-archive");
+    res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(asset.fileName)}"`);
+    if (size > 0)
+        res.setHeader("Content-Length", String(size));
+    if (asset.sha256)
+        res.setHeader("X-APK-Sha256", asset.sha256);
+    try {
+        await pipeline(Readable.fromWeb(remote.body), res);
+    }
+    catch (error) {
+        if (!res.headersSent) {
+            res.status(502).json({ error: getErrorMessage(error, "从 GitHub 下载安装包失败。") });
+            return;
+        }
+        res.destroy();
+    }
+}
 export function registerPublicUpdateRoutes(app, deps) {
     app.get("/api/android-apk-update", asyncRoute(async (req, res) => {
         const currentVersion = typeof req.query.currentVersion === "string" ? req.query.currentVersion.trim() : "";
@@ -31,11 +74,20 @@ export function registerPublicUpdateRoutes(app, deps) {
             source: latest.source,
             channel,
             releaseNotes: updateAvailable ? (latest.releaseNotes ?? null) : null,
-            // 本地分发时为 hex SHA-256，Android 客户端下载后校验；GitHub 来源为 null。
+            // 本地文件哈希或 GitHub Release digest；客户端下载后校验。
             sha256: updateAvailable ? (latest.sha256 ?? null) : null,
         });
     }));
     app.get("/android/download", asyncRoute(async (req, res) => {
+        if (req.query.source === "github") {
+            const remote = deps.resolveGitHubApkDownload ? await deps.resolveGitHubApkDownload() : null;
+            if (!remote) {
+                res.status(404).json({ error: "当前没有可下载的 GitHub APK 文件。" });
+                return;
+            }
+            await proxyGitHubApk(req, res, remote);
+            return;
+        }
         const channel = req.query.channel === "beta" ? "beta" : "stable";
         const asset = await deps.resolveAndroidDownload(channel);
         if (!asset) {

package/dist/server-workspace-routes.js

@@ -285,6 +285,7 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             provider: session.provider,
             sessionKind: session.sessionKind,
             runner: session.runner,
+            command: session.command,
             title: resolveSessionDisplayTitle(session),
             status: session.status,
             cwd: session.cwd,

package/dist/session-topic.d.ts

@@ -1,5 +1,10 @@
 import { type QuickCommitAiOptions } from "./git-quick-commit.js";
 import type { ConversationTurn } from "./types.js";
+/**
+ * PTY 终端视图里，只有底部输入框整段提交（shortcutKey=enter_text）才总结标题。
+ * 逐键 pty_input / 方向键 / 单独回车不能触发，避免把按键当主题。
+ */
+export declare function shouldGenerateSessionTopicFromPtyInput(view?: "chat" | "terminal", shortcutKey?: string): boolean;
 export interface SessionTopic {
     title: string;
     description: string;

package/dist/session-topic.js

@@ -1,5 +1,12 @@
 import { callConfiguredAiText } from "./git-quick-commit.js";
 const MAX_PROMPT_LENGTH = 12_000;
+/**
+ * PTY 终端视图里，只有底部输入框整段提交（shortcutKey=enter_text）才总结标题。
+ * 逐键 pty_input / 方向键 / 单独回车不能触发，避免把按键当主题。
+ */
+export function shouldGenerateSessionTopicFromPtyInput(view, shortcutKey) {
+    return view !== "terminal" || shortcutKey === "enter_text";
+}
 function cleanTopicText(value, maxLength) {
     if (typeof value !== "string")
         return "";