@co0ontty/wand 1.6.1 → 1.6.2

package/dist/config.js

@@ -79,6 +79,28 @@ export async function saveConfig(configPath, config) {
     await mkdir(path.dirname(configPath), { recursive: true });
     await writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf8");
 }
+function normalizeStructuredChatPersona(input) {
+    if (!input || typeof input !== "object")
+        return undefined;
+    const normalizeRole = (roleInput) => {
+        if (!roleInput || typeof roleInput !== "object")
+            return undefined;
+        const role = roleInput;
+        const normalized = {
+            name: typeof role.name === "string" ? role.name.trim() : undefined,
+            avatar: typeof role.avatar === "string" ? role.avatar.trim() : undefined,
+        };
+        if (!normalized.name && !normalized.avatar)
+            return undefined;
+        return normalized;
+    };
+    const personaInput = input;
+    const user = normalizeRole(personaInput.user);
+    const assistant = normalizeRole(personaInput.assistant);
+    if (!user && !assistant)
+        return undefined;
+    return { user, assistant };
+}
 function mergeWithDefaults(input) {
     const defaults = defaultConfig();
     return {
@@ -108,6 +130,7 @@ function mergeWithDefaults(input) {
                 mode: isExecutionMode(preset.mode) ? preset.mode : undefined
             }))
             : defaults.commandPresets,
+        structuredChatPersona: normalizeStructuredChatPersona(input.structuredChatPersona),
         language: typeof input.language === "string" ? input.language.trim() : defaults.language,
     };
 }

package/dist/server.js

@@ -8,6 +8,19 @@ import { promisify } from "node:util";
 import path from "node:path";
 import process from "node:process";
 import { WebSocketServer } from "ws";
+import { ensureAvatarSeed, getAvatarSvg } from "./avatar.js";
+import { createSession, revokeSession, setAuthStorage, validateSession } from "./auth.js";
+import { ensureCertificates } from "./cert.js";
+import { isExecutionMode, resolveConfigDir, saveConfig } from "./config.js";
+import { ProcessManager } from "./process-manager.js";
+import { StructuredSessionManager } from "./structured-session-manager.js";
+import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
+import { getErrorMessage, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
+import { resolveDatabasePath, WandStorage } from "./storage.js";
+import { renderApp } from "./web-ui/index.js";
+import { WsBroadcastManager } from "./ws-broadcast.js";
+import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
+import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
 const execAsync = promisify(exec);
 const SERVER_MODULE_DIR = path.dirname(new URL(import.meta.url).pathname);
 const RUNTIME_ROOT_DIR = path.resolve(SERVER_MODULE_DIR, "..");
@@ -52,19 +65,83 @@ function compareSemver(a, b) {
     }
     return 0;
 }
-import { ensureAvatarSeed, getAvatarSvg } from "./avatar.js";
-import { createSession, revokeSession, setAuthStorage, validateSession } from "./auth.js";
-import { ensureCertificates } from "./cert.js";
-import { isExecutionMode, resolveConfigDir, saveConfig } from "./config.js";
-import { ProcessManager } from "./process-manager.js";
-import { StructuredSessionManager } from "./structured-session-manager.js";
-import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
-import { getErrorMessage, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
-import { resolveDatabasePath, WandStorage } from "./storage.js";
-import { renderApp } from "./web-ui/index.js";
-import { WsBroadcastManager } from "./ws-broadcast.js";
-import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
-import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
+function isExternalAvatarSource(value) {
+    return /^(https?:|data:)/i.test(value);
+}
+function normalizePersonaName(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed || undefined;
+}
+function normalizePersonaAvatar(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed || undefined;
+}
+function resolveStructuredChatPersona(config) {
+    const persona = config.structuredChatPersona;
+    if (!persona)
+        return undefined;
+    const userName = normalizePersonaName(persona.user?.name);
+    const userAvatar = normalizePersonaAvatar(persona.user?.avatar);
+    const assistantName = normalizePersonaName(persona.assistant?.name);
+    const assistantAvatar = normalizePersonaAvatar(persona.assistant?.avatar);
+    if (!userName && !userAvatar && !assistantName && !assistantAvatar) {
+        return undefined;
+    }
+    return {
+        user: userName || userAvatar ? { name: userName, avatar: userAvatar } : undefined,
+        assistant: assistantName || assistantAvatar ? { name: assistantName, avatar: assistantAvatar } : undefined,
+    };
+}
+function resolveStructuredChatAvatarPath(configPath, config, role) {
+    const avatar = role === "user"
+        ? config.structuredChatPersona?.user?.avatar
+        : config.structuredChatPersona?.assistant?.avatar;
+    if (!avatar || isExternalAvatarSource(avatar)) {
+        return null;
+    }
+    const configDir = resolveConfigDir(configPath);
+    return path.isAbsolute(avatar) ? avatar : path.resolve(configDir, avatar);
+}
+async function buildStructuredChatPersonaPayload(configPath, config) {
+    const persona = resolveStructuredChatPersona(config);
+    if (!persona)
+        return undefined;
+    const buildRole = async (role) => {
+        const roleConfig = role === "user" ? persona.user : persona.assistant;
+        if (!roleConfig)
+            return undefined;
+        let avatar = roleConfig.avatar;
+        if (avatar && !isExternalAvatarSource(avatar)) {
+            const resolvedPath = resolveStructuredChatAvatarPath(configPath, config, role);
+            if (!resolvedPath) {
+                avatar = undefined;
+            }
+            else {
+                try {
+                    const fileStat = await stat(resolvedPath);
+                    avatar = fileStat.isFile() ? `/api/structured-chat-avatar/${role}` : undefined;
+                }
+                catch {
+                    avatar = undefined;
+                }
+            }
+        }
+        if (!roleConfig.name && !avatar)
+            return undefined;
+        return {
+            name: roleConfig.name,
+            avatar,
+        };
+    };
+    const [user, assistant] = await Promise.all([buildRole("user"), buildRole("assistant")]);
+    if (!user && !assistant)
+        return undefined;
+    return { user, assistant };
+}
 // ── Git helpers ──
 async function isGitRepo(dirPath) {
     try {
@@ -266,6 +343,50 @@ export async function startServer(config, configPath) {
         res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
         res.type("html").send(renderApp(configPath));
     });
+    app.get("/api/structured-chat-avatar/:role", async (req, res) => {
+        const role = req.params.role === "user" || req.params.role === "assistant"
+            ? req.params.role
+            : null;
+        if (!role) {
+            res.status(404).end();
+            return;
+        }
+        const resolvedPath = resolveStructuredChatAvatarPath(configPath, config, role);
+        if (!resolvedPath) {
+            res.status(404).end();
+            return;
+        }
+        try {
+            const fileStat = await stat(resolvedPath);
+            if (!fileStat.isFile()) {
+                res.status(404).end();
+                return;
+            }
+            const ext = path.extname(resolvedPath).toLowerCase();
+            const contentType = ext === ".svg"
+                ? "image/svg+xml"
+                : ext === ".png"
+                    ? "image/png"
+                    : ext === ".jpg" || ext === ".jpeg"
+                        ? "image/jpeg"
+                        : ext === ".webp"
+                            ? "image/webp"
+                            : ext === ".gif"
+                                ? "image/gif"
+                                : ext === ".avif"
+                                    ? "image/avif"
+                                    : null;
+            if (!contentType) {
+                res.status(415).json({ error: "不支持的头像格式。" });
+                return;
+            }
+            res.setHeader("X-Content-Type-Options", "nosniff");
+            res.type(contentType).sendFile(resolvedPath);
+        }
+        catch {
+            res.status(404).end();
+        }
+    });
     app.get("/manifest.json", (_req, res) => {
         res.setHeader("Content-Type", "application/manifest+json");
         res.send(generatePwaManifest());
@@ -328,7 +449,8 @@ export async function startServer(config, configPath) {
     });
     app.use("/api", requireAuth);
     // ── Config & Session info ──
-    app.get("/api/config", (_req, res) => {
+    app.get("/api/config", async (_req, res) => {
+        const structuredChatPersona = await buildStructuredChatPersonaPayload(configPath, config);
         res.json({
             host: config.host,
             port: config.port,
@@ -336,6 +458,7 @@ export async function startServer(config, configPath) {
             defaultCwd: config.defaultCwd,
             commandPresets: config.commandPresets,
             structuredRunners: [{ label: "Claude Structured", runner: "claude-cli-print" }],
+            structuredChatPersona,
             updateAvailable: cachedUpdateInfo?.updateAvailable ?? false,
             latestVersion: cachedUpdateInfo?.latest ?? null,
             currentVersion: PKG_VERSION,

package/dist/structured-session-manager.js

@@ -345,19 +345,21 @@ export class StructuredSessionManager {
     // ---------------------------------------------------------------------------
     // CLI argument construction
     // ---------------------------------------------------------------------------
-    buildPermissionArgs(mode) {
+    buildPermissionArgs(mode, autoApprove) {
+        const shouldBypass = autoApprove || mode === "full-access" || mode === "managed";
+        const shouldAcceptEdits = mode === "auto-edit";
         if (!isRunningAsRoot()) {
-            if (mode === "full-access" || mode === "managed") {
+            if (shouldBypass) {
                 return ["--permission-mode", "bypassPermissions"];
             }
-            if (mode === "auto-edit") {
+            if (shouldAcceptEdits) {
                 return ["--permission-mode", "acceptEdits"];
             }
             return [];
         }
         // Root: Claude CLI refuses bypassPermissions.
         // acceptEdits auto-approves within CWD; --allowedTools extends to all paths.
-        if (shouldAutoApproveForMode(mode)) {
+        if (shouldBypass || shouldAcceptEdits) {
             return [
                 "--permission-mode", "acceptEdits",
                 "--allowedTools", "Bash", "Edit", "Write", "Read", "Glob", "Grep",
@@ -384,8 +386,8 @@ export class StructuredSessionManager {
         return new Promise((resolve, reject) => {
             const args = ["-p", "--verbose", "--output-format", "stream-json"];
             console.log("[WAND] runClaudeStreaming sessionId:", sessionId, "mode:", session.mode, "claudeSessionId:", session.claudeSessionId);
-            // Add permission args based on mode
-            const permArgs = this.buildPermissionArgs(session.mode);
+            // Add permission args based on mode + autoApprovePermissions toggle
+            const permArgs = this.buildPermissionArgs(session.mode, session.autoApprovePermissions ?? false);
             args.push(...permArgs);
             // In managed mode, append autonomous system prompt
             if (session.mode === "managed") {

package/dist/types.d.ts

@@ -38,6 +38,14 @@ export interface CommandPreset {
     command: string;
     mode?: ExecutionMode;
 }
+export interface StructuredChatPersonaRoleConfig {
+    name?: string;
+    avatar?: string;
+}
+export interface StructuredChatPersonaConfig {
+    user?: StructuredChatPersonaRoleConfig;
+    assistant?: StructuredChatPersonaRoleConfig;
+}
 export interface WandConfig {
     host: string;
     port: number;
@@ -50,6 +58,7 @@ export interface WandConfig {
     startupCommands: string[];
     allowedCommandPrefixes: string[];
     commandPresets: CommandPreset[];
+    structuredChatPersona?: StructuredChatPersonaConfig;
     /** Max total size (bytes) for shortcut interaction logs per session (default: 10 MB). Set 0 to disable logging. */
     shortcutLogMaxBytes?: number;
     /** Preferred response language for Claude (e.g. "中文", "English"). Empty string means no override. */

package/dist/web-ui/content/scripts.js

@@ -9318,13 +9318,51 @@
         };
       })();
 
+      var DEFAULT_CHAT_PERSONA = {
+        user: {
+          name: "赛博虎妞",
+          avatarSvg: PIXEL_AVATAR.user
+        },
+        assistant: {
+          name: "勤劳初二",
+          avatarSvg: PIXEL_AVATAR.assistant
+        }
+      };
+
+      function getStructuredChatPersona(role) {
+        var configPersona = state.config && state.config.structuredChatPersona;
+        var roleConfig = configPersona && configPersona[role] ? configPersona[role] : null;
+        var defaults = DEFAULT_CHAT_PERSONA[role] || DEFAULT_CHAT_PERSONA.assistant;
+        return {
+          name: roleConfig && typeof roleConfig.name === "string" && roleConfig.name.trim()
+            ? roleConfig.name.trim()
+            : defaults.name,
+          avatar: roleConfig && typeof roleConfig.avatar === "string" && roleConfig.avatar.trim()
+            ? roleConfig.avatar.trim()
+            : null,
+          avatarSvg: defaults.avatarSvg
+        };
+      }
+
+      function renderAvatarFallback(svg) {
+        return '<div class="pixel-avatar">' + svg + '</div>';
+      }
+
+      function handleChatAvatarImageError(img, role) {
+        if (!img || !img.parentNode) return;
+        var persona = getStructuredChatPersona(role === "user" ? "user" : "assistant");
+        img.outerHTML = renderAvatarFallback(persona.avatarSvg);
+      }
+
       function chatAvatar(role) {
-        var isUser = role === "user";
-        var svg = isUser ? PIXEL_AVATAR.user : PIXEL_AVATAR.assistant;
-        var name = isUser ? "赛博虎妞" : "勤劳初二";
+        var personaRole = role === "user" ? "user" : "assistant";
+        var persona = getStructuredChatPersona(personaRole);
+        var avatarInner = persona.avatar
+          ? '<img class="pixel-avatar-image" src="' + escapeHtml(persona.avatar) + '" alt="' + escapeHtml(persona.name) + '" onerror="handleChatAvatarImageError(this, ' + JSON.stringify(personaRole) + ')" />'
+          : renderAvatarFallback(persona.avatarSvg);
         return '<div class="chat-message-avatar ' + role + '">' +
-          '<div class="pixel-avatar">' + svg + '</div>' +
-          '<span class="avatar-name">' + name + '</span>' +
+          avatarInner +
+          '<span class="avatar-name">' + escapeHtml(persona.name) + '</span>' +
         '</div>';
       }
 

package/dist/web-ui/content/styles.css

@@ -2328,6 +2328,13 @@
       box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
     }
 
+    .pixel-avatar-image {
+      display: block;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
     .pixel-avatar-svg {
       display: block;
       width: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {