mixdog 0.9.44 → 0.9.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.9.44",
+  "version": "0.9.45",
   "private": false,
   "type": "module",
   "description": "Standalone mixdog coding-agent CLI/TUI workspace.",

package/src/runtime/shared/update-checker.mjs

@@ -13,8 +13,8 @@
  * the child exits, reporting the resolved version on success.
  */
 
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
+import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
+import { basename, delimiter, dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
 import { resolvePluginData } from './plugin-paths.mjs';
@@ -199,19 +199,49 @@ export async function checkLatestVersion({ force = false, dataDir } = {}) {
  * `-WindowStyle Hidden` style flags that antivirus heuristics flag).
  */
 export function npmCliJsPath() {
-  const execDir = dirname(process.execPath);
-  const candidates = [
-    // Windows: npm ships beside node.exe.
-    join(execDir, 'node_modules', 'npm', 'bin', 'npm-cli.js'),
-    // Unix layout: <prefix>/bin/node → <prefix>/lib/node_modules/npm.
-    join(execDir, '..', 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js'),
-  ];
   // When launched via npm itself, npm_execpath is authoritative.
   const envPath = process.env.npm_execpath;
-  if (envPath && /npm-cli\.js$/i.test(envPath)) candidates.unshift(envPath);
+  const candidates = envPath && /npm-cli\.js$/i.test(envPath) ? [envPath] : [];
+  const execDirs = [dirname(process.execPath)];
+  try {
+    const realExecDir = dirname(realpathSync(process.execPath));
+    if (!execDirs.includes(realExecDir)) execDirs.push(realExecDir);
+  } catch { /* retain the raw executable path */ }
+
+  for (const execDir of execDirs) {
+    // Windows: npm ships beside node.exe.
+    candidates.push(join(execDir, 'node_modules', 'npm', 'bin', 'npm-cli.js'));
+    // Unix layout: <prefix>/bin/node → <prefix>/lib/node_modules/npm.
+    candidates.push(join(execDir, '..', 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js'));
+    // Homebrew: <prefix>/bin/node → <prefix>/libexec/lib/node_modules/npm.
+    candidates.push(join(execDir, '..', 'libexec', 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js'));
+  }
   for (const candidate of candidates) {
     try { if (existsSync(candidate)) return candidate; } catch { /* keep looking */ }
   }
+
+  // Last resort: npm shims on PATH commonly resolve into npm's package bin dir.
+  const pathDirs = (process.env.PATH || process.env.Path || '').split(delimiter);
+  for (const pathDir of pathDirs) {
+    if (!pathDir) continue;
+    const npmPaths = process.platform === 'win32'
+      ? [join(pathDir, 'npm'), join(pathDir, 'npm.cmd')]
+      : [join(pathDir, 'npm')];
+    for (const npmPath of npmPaths) {
+      try {
+        if (!existsSync(npmPath)) continue;
+        const resolvedNpm = realpathSync(npmPath);
+        const npmBinDir = dirname(resolvedNpm);
+        if (
+          basename(npmBinDir) !== 'bin'
+          || basename(dirname(npmBinDir)) !== 'npm'
+          || basename(dirname(dirname(npmBinDir))) !== 'node_modules'
+        ) continue;
+        const cliJs = join(npmBinDir, 'npm-cli.js');
+        if (existsSync(cliJs)) return cliJs;
+      } catch { /* keep looking */ }
+    }
+  }
   return null;
 }
 

package/src/tui/App.jsx

@@ -263,12 +263,9 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false })
   const [resizeState, setResizeState] = useState(() => ({ ...terminalSize(stdout), epoch: 0 }));
   const [panelTransitionEpoch, setPanelTransitionEpoch] = useState(0);
   const [panelInkMaskEpoch, setPanelInkMaskEpoch] = useState(0);
-  // Windows Terminal/conhost scrolls the alt-screen (auto-wrap/DECAWM) when the
-  // bottom-right cell is written. WT_SESSION is also set when the UI runs under
-  // a Unix-ish shell hosted by Windows Terminal, where process.platform is not
-  // necessarily win32 but the terminal behavior is still Windows-like.
-  const windowsLikeTerminal = process.platform === 'win32' || Boolean(process.env.WT_SESSION);
-  const rightSafetyColumns = windowsLikeTerminal ? 1 : 0;
+  // Keep a universal one-cell margin at the right edge: terminals may clip or
+  // wrap their final cell, including macOS terminals rendering rounded borders.
+  const rightSafetyColumns = 1;
   const frameColumns = Math.max(1, resizeState.columns - rightSafetyColumns);
   // scrollOffset = how many transcript ROWS we've scrolled UP from the bottom
   // (0 = pinned to the latest, showing the newest content). Mouse wheel adjusts

package/src/tui/dist/index.mjs

@@ -3140,8 +3140,8 @@ function formatAggregateDetail(summaries) {
 }
 
 // src/runtime/shared/update-checker.mjs
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname as dirname2, join as join2 } from "node:path";
+import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
+import { basename, delimiter, dirname as dirname2, join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/runtime/shared/plugin-paths.mjs
@@ -7128,7 +7128,7 @@ import { randomBytes } from "node:crypto";
 import { existsSync as existsSync2, unlinkSync } from "node:fs";
 import { readFile as readFileAsync, stat as statAsync } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { basename, extname, isAbsolute, resolve } from "node:path";
+import { basename as basename2, extname, isAbsolute, resolve } from "node:path";
 
 // src/runtime/agent/orchestrator/tools/builtin/read-image-resize.mjs
 var API_IMAGE_MAX_BASE64_SIZE = 5 * 1024 * 1024;
@@ -7396,7 +7396,7 @@ async function readImageAttachmentFromPath(rawPath, cwd = process.cwd()) {
   if (!st.isFile()) return null;
   const buffer = await readFileAsync(fullPath);
   return imageAttachmentFromBuffer(buffer, mimeType, {
-    filename: basename(fullPath),
+    filename: basename2(fullPath),
     sourcePath: fullPath
   });
 }
@@ -7467,7 +7467,7 @@ async function readClipboardText() {
 // src/standalone/projects.mjs
 import { homedir as homedir2 } from "node:os";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, renameSync, statSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { basename as basename2, dirname as dirname3, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "node:path";
+import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "node:path";
 var MIXDOG_HOME = process.env.MIXDOG_HOME || join3(homedir2(), ".mixdog");
 var PROJECTS_FILE = join3(MIXDOG_HOME, "projects.json");
 function toAbsolute(rawPath) {
@@ -7487,7 +7487,7 @@ function readStore() {
     const projects = Array.isArray(parsed?.projects) ? parsed.projects : [];
     return {
       projects: projects.filter((entry) => entry && typeof entry.path === "string" && entry.path.trim()).map((entry) => ({
-        name: String(entry.name || basename2(entry.path) || entry.path),
+        name: String(entry.name || basename3(entry.path) || entry.path),
         path: String(entry.path),
         addedAt: Number(entry.addedAt) || 0,
         ...Number(entry.lastSelectedAt) > 0 ? { lastSelectedAt: Number(entry.lastSelectedAt) } : {}
@@ -7517,7 +7517,7 @@ function ensureProjectIdMarker(absPath, name) {
     }
     const markerPath = join3(absPath, ".mixdog", "project.id");
     if (existsSync3(markerPath)) return;
-    const value = String(name || basename2(absPath) || "").trim();
+    const value = String(name || basename3(absPath) || "").trim();
     if (!value || value.toLowerCase() === "common") return;
     const markerDir = join3(absPath, ".mixdog");
     mkdirSync2(markerDir, { recursive: true });
@@ -7555,7 +7555,7 @@ function addProject(rawPath) {
     return existing;
   }
   const entry = {
-    name: basename2(absPath) || absPath,
+    name: basename3(absPath) || absPath,
     path: absPath,
     addedAt: Date.now()
   };
@@ -7584,7 +7584,7 @@ function renameProject(rawPath, nextName) {
   const entry = store.projects.find((item) => normalizeKey(item.path) === key);
   if (!entry) return null;
   const trimmed = String(nextName || "").trim();
-  entry.name = trimmed || basename2(absPath) || absPath;
+  entry.name = trimmed || basename3(absPath) || absPath;
   writeStore(store);
   return entry;
 }
@@ -14387,7 +14387,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync3
 } from "fs";
-import { dirname as dirname4, basename as basename3, join as join4 } from "path";
+import { dirname as dirname4, basename as basename4, join as join4 } from "path";
 import { randomBytes as randomBytes2 } from "crypto";
 import { execFile as execFile2, execFileSync } from "child_process";
 import { promisify } from "util";
@@ -14843,7 +14843,7 @@ function writeFileAtomicSync(filePath, data, opts = {}) {
   const run = () => {
     const dir = dirname4(filePath);
     mkdirSync3(dir, { recursive: true });
-    const tmp = join4(dir, `.${basename3(filePath)}.${randomBytes2(12).toString("hex")}.tmp`);
+    const tmp = join4(dir, `.${basename4(filePath)}.${randomBytes2(12).toString("hex")}.tmp`);
     try {
       const writeOpts = { encoding: opts.encoding || "utf8", flag: "wx", mode: opts.mode !== void 0 ? opts.mode : 384 };
       writeFileSync3(tmp, data, writeOpts);
@@ -19528,8 +19528,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
   const [resizeState, setResizeState] = useState8(() => ({ ...terminalSize(stdout2), epoch: 0 }));
   const [panelTransitionEpoch, setPanelTransitionEpoch] = useState8(0);
   const [panelInkMaskEpoch, setPanelInkMaskEpoch] = useState8(0);
-  const windowsLikeTerminal = process.platform === "win32" || Boolean(process.env.WT_SESSION);
-  const rightSafetyColumns = windowsLikeTerminal ? 1 : 0;
+  const rightSafetyColumns = 1;
   const frameColumns = Math.max(1, resizeState.columns - rightSafetyColumns);
   const [scrollOffset, setScrollOffset] = useState8(0);
   const scrollPositionRef = useRef10(0);