@geminilight/mindos 0.5.10 → 0.5.12

package/bin/lib/stop.js

@@ -75,7 +75,7 @@ function killTree(pid) {
  */
 export function stopMindos(opts = {}) {
   // Read ports from config for port-based cleanup
-  let webPort = '3000', mcpPort = '8787';
+  let webPort = '3456', mcpPort = '8781';
   try {
     const config = JSON.parse(readFileSync(CONFIG_PATH, 'utf-8'));
     if (config.port) webPort = String(config.port);

package/bin/lib/sync.js

@@ -1,6 +1,7 @@
 import { execSync } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { resolve } from 'node:path';
+import { homedir } from 'node:os';
 import { CONFIG_PATH, MINDOS_DIR } from './constants.js';
 import { bold, dim, cyan, green, red, yellow } from './colors.js';
 
@@ -129,12 +130,24 @@ function autoPull(mindRoot) {
       }
     }
   }
+
+  // Retry any pending pushes (handles previous push failures)
+  try {
+    const unpushed = gitExec('git rev-list --count @{u}..HEAD', mindRoot);
+    if (parseInt(unpushed) > 0) {
+      execSync('git push', { cwd: mindRoot, stdio: 'pipe' });
+      saveSyncState({ ...loadSyncState(), lastSync: new Date().toISOString(), lastError: null });
+    }
+  } catch {
+    // No upstream tracking or push failed — ignore silently, autoCommitAndPush handles primary pushes
+  }
 }
 
 // ── Exported API ────────────────────────────────────────────────────────────
 
 let activeWatcher = null;
 let activePullInterval = null;
+let activeShutdownHandler = null;
 
 /**
  * Interactive sync init — configure remote git repo
@@ -187,18 +200,43 @@ export async function initSync(mindRoot, opts = {}) {
     try { execSync('git checkout -b main', { cwd: mindRoot, stdio: 'pipe' }); } catch {}
   }
 
+  // 1b. Ensure .gitignore exists
+  const gitignorePath = resolve(mindRoot, '.gitignore');
+  if (!existsSync(gitignorePath)) {
+    writeFileSync(gitignorePath, [
+      '# MindOS auto-generated',
+      '.DS_Store',
+      'Thumbs.db',
+      '*.tmp',
+      '*.bak',
+      '*.swp',
+      '*.sync-conflict',
+      'node_modules/',
+      '.obsidian/',
+      '',
+    ].join('\n'), 'utf-8');
+  }
+
   // Handle token for HTTPS
   if (token && remoteUrl.startsWith('https://')) {
     const urlObj = new URL(remoteUrl);
-    urlObj.username = 'oauth2';
-    urlObj.password = token;
-    // Configure credential helper
-    try { execSync(`git config credential.helper store`, { cwd: mindRoot, stdio: 'pipe' }); } catch {}
-    // Store the credential
+    // Choose credential helper by platform
+    const platform = process.platform;
+    let helper;
+    if (platform === 'darwin') helper = 'osxkeychain';
+    else if (platform === 'win32') helper = 'manager';
+    else helper = 'store';
+    try { execSync(`git config credential.helper '${helper}'`, { cwd: mindRoot, stdio: 'pipe' }); } catch {}
+    // Store the credential via git credential approve
     try {
       const credInput = `protocol=${urlObj.protocol.replace(':', '')}\nhost=${urlObj.host}\nusername=oauth2\npassword=${token}\n\n`;
       execSync('git credential approve', { cwd: mindRoot, input: credInput, stdio: 'pipe' });
     } catch {}
+    // For 'store' helper, restrict file permissions AFTER credential file is created
+    if (helper === 'store') {
+      const credFile = resolve(process.env.HOME || homedir(), '.git-credentials');
+      try { execSync(`chmod 600 "${credFile}"`, { stdio: 'pipe' }); } catch {}
+    }
   }
 
   // 4. Set remote
@@ -257,6 +295,7 @@ export async function initSync(mindRoot, opts = {}) {
  * Start file watcher + periodic pull
  */
 export async function startSyncDaemon(mindRoot) {
+  if (activeWatcher) return null; // already running — idempotent guard
   const config = loadSyncConfig();
   if (!config.enabled) return null;
   if (!mindRoot || !isGitRepo(mindRoot)) return null;
@@ -281,10 +320,20 @@ export async function startSyncDaemon(mindRoot) {
   // Pull on startup
   autoPull(mindRoot);
 
+  // Graceful shutdown: flush pending changes before exit
+  const gracefulShutdown = () => {
+    if (commitTimer) { clearTimeout(commitTimer); commitTimer = null; }
+    try { autoCommitAndPush(mindRoot); } catch {}
+    stopSyncDaemon();
+  };
+  process.on('SIGTERM', gracefulShutdown);
+  process.on('SIGINT', gracefulShutdown);
+
   activeWatcher = watcher;
   activePullInterval = pullInterval;
+  activeShutdownHandler = gracefulShutdown;
 
-  return { watcher, pullInterval };
+  return { watcher, pullInterval, gracefulShutdown };
 }
 
 /**
@@ -299,6 +348,11 @@ export function stopSyncDaemon() {
     clearInterval(activePullInterval);
     activePullInterval = null;
   }
+  if (activeShutdownHandler) {
+    process.removeListener('SIGTERM', activeShutdownHandler);
+    process.removeListener('SIGINT', activeShutdownHandler);
+    activeShutdownHandler = null;
+  }
 }
 
 /**
@@ -336,14 +390,10 @@ export function getSyncStatus(mindRoot) {
  */
 export function manualSync(mindRoot) {
   if (!mindRoot || !isGitRepo(mindRoot)) {
-    console.error(red('Not a git repository. Run `mindos sync init` first.'));
-    process.exit(1);
+    throw new Error('Not a git repository. Run `mindos sync init` first.');
   }
-  console.log(dim('Pulling...'));
   autoPull(mindRoot);
-  console.log(dim('Committing & pushing...'));
   autoCommitAndPush(mindRoot);
-  console.log(green('✔ Sync complete'));
 }
 
 /**

package/mcp/README.md

@@ -26,7 +26,7 @@ mindos start   # starts app + MCP server together
 Or run MCP server only:
 
 ```bash
-mindos mcp     # HTTP mode (default, port 8787)
+mindos mcp     # HTTP mode (default, port 8781)
 MCP_TRANSPORT=stdio mindos mcp   # stdio mode
 ```
 
@@ -34,11 +34,11 @@ MCP_TRANSPORT=stdio mindos mcp   # stdio mode
 
 | Variable | Default | Description |
 |----------|---------|-------------|
-| `MINDOS_URL` | `http://localhost:3000` | App server base URL |
+| `MINDOS_URL` | `http://localhost:3456` | App server base URL |
 | `AUTH_TOKEN` | — | Optional: bearer token (must match App's `AUTH_TOKEN`) |
 | `MCP_TRANSPORT` | `http` | Transport mode: `http` or `stdio` |
 | `MCP_HOST` | `127.0.0.1` | HTTP bind address (`0.0.0.0` for remote access) |
-| `MCP_PORT` | `8787` | HTTP listen port (configurable via `mindos onboard`) |
+| `MCP_PORT` | `8781` | HTTP listen port (configurable via `mindos onboard`) |
 | `MCP_ENDPOINT` | `/mcp` | HTTP endpoint path |
 
 ## MCP Tools (20)
@@ -75,7 +75,7 @@ Add to your Agent's MCP config (field names vary by client):
 {
   "mcpServers": {
     "mindos": {
-      "url": "http://localhost:8787/mcp",
+      "url": "http://localhost:8781/mcp",
       "headers": { "Authorization": "Bearer your-token" }
     }
   }
@@ -101,7 +101,7 @@ Add to your Agent's MCP config (field names vary by client):
 {
   "mcpServers": {
     "mindos": {
-      "url": "http://<server-ip>:8787/mcp",
+      "url": "http://<server-ip>:8781/mcp",
       "headers": { "Authorization": "Bearer your-token" }
     }
   }

package/mcp/src/index.ts

@@ -22,11 +22,11 @@ import { z } from "zod";
 
 // ─── Config ──────────────────────────────────────────────────────────────────
 
-const BASE_URL       = process.env.MINDOS_URL      ?? "http://localhost:3000";
+const BASE_URL       = process.env.MINDOS_URL      ?? "http://localhost:3456";
 const AUTH_TOKEN     = process.env.AUTH_TOKEN;
 const MCP_TRANSPORT  = process.env.MCP_TRANSPORT   ?? "http";    // "http" | "stdio"
 const MCP_HOST       = process.env.MCP_HOST        ?? "127.0.0.1";
-const MCP_PORT       = parseInt(process.env.MCP_PORT ?? "8787", 10);
+const MCP_PORT       = parseInt(process.env.MCP_PORT ?? "8781", 10);
 const MCP_ENDPOINT   = process.env.MCP_ENDPOINT    ?? "/mcp";
 const CHARACTER_LIMIT = 25_000;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geminilight/mindos",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "description": "MindOS — Human-Agent Collaborative Mind System. Local-first knowledge base that syncs your mind to all AI Agents via MCP.",
   "keywords": [
     "mindos",
@@ -54,8 +54,10 @@
     "!assets/capture-demo.mjs",
     "!assets/demo-flow.html",
     "!assets/demo-flow-zh.html",
+    "!assets/images",
     "!mcp/node_modules",
-    "!mcp/dist"
+    "!mcp/dist",
+    "!mcp/package-lock.json"
   ],
   "scripts": {
     "setup": "node scripts/setup.js",

package/scripts/setup.js

@@ -844,11 +844,11 @@ async function startGuiSetup() {
   if (isFirstTime) {
     // First-time onboard: use a temporary port (scan from 9100) so the user's
     // chosen port in Step 3 can differ without a mid-setup restart.
-    // 9100 is chosen to avoid conflicts with common services (5000=AirPlay, 3000/8080=dev).
+    // 9100 is chosen to avoid conflicts with common services (5000=AirPlay, 3456/8080=dev).
     usePort = await findFreePort(9100);
   } else {
     // Re-onboard: service is already running on config.port — reuse it.
-    const existingPort = config.port || 3000;
+    const existingPort = config.port || 3456;
     if (await isSelfPort(existingPort)) {
       // Service already running — just open the setup page, no need to spawn.
       const url = `http://localhost:${existingPort}/setup`;
@@ -866,7 +866,7 @@ async function startGuiSetup() {
         // stopMindos() sends SIGTERM synchronously — wait for both web and mcp
         // ports to free, since `start` will assertPortFree on both.
         const { waitForPortFree } = await import('../bin/lib/gateway.js');
-        const mcpPort = config.mcpPort || 8787;
+        const mcpPort = config.mcpPort || 8781;
         const [webFreed, mcpFreed] = await Promise.all([
           waitForPortFree(existingPort),
           waitForPortFree(mcpPort),
@@ -941,8 +941,8 @@ async function main() {
 
     console.log(c.bold('\nExisting config:'));
     console.log(row('Knowledge base:', c.cyan(existing.mindRoot || '(not set)')));
-    console.log(row('Web port:',       c.cyan(String(existing.port || '3000'))));
-    console.log(row('MCP port:',       c.cyan(String(existing.mcpPort || '8787'))));
+    console.log(row('Web port:',       c.cyan(String(existing.port || '3456'))));
+    console.log(row('MCP port:',       c.cyan(String(existing.mcpPort || '8781'))));
     console.log(row('Auth token:',     existing.authToken ? mask(existing.authToken) : c.dim('(not set)')));
     console.log(row('Web password:',   existing.webPassword ? '••••••••' : c.dim('(none)')));
     console.log(row('AI provider:',    c.cyan(existing.ai?.provider || '(not set)')));
@@ -953,7 +953,7 @@ async function main() {
     const overwrite = await askYesNo('cfgExists', CONFIG_PATH);
     if (!overwrite) {
       const existingMode     = existing.startMode || 'start';
-      const existingMcpPort  = existing.mcpPort   || 8787;
+      const existingMcpPort  = existing.mcpPort   || 8781;
       const existingAuth     = existing.authToken || '';
       const existingMindRoot = existing.mindRoot  || resolve(homedir(), 'MindOS', 'mind');
       console.log(`\n${c.green(t('cfgKept'))}  ${c.dim(CONFIG_PATH)}`);
@@ -1072,8 +1072,8 @@ async function main() {
   write('\n');
   stepHeader(3);
   const existingCfg = resumeCfg;
-  const defaultWebPort = typeof existingCfg.port === 'number' ? existingCfg.port : 3000;
-  const defaultMcpPort = typeof existingCfg.mcpPort === 'number' ? existingCfg.mcpPort : (defaultWebPort === 8787 ? 8788 : 8787);
+  const defaultWebPort = typeof existingCfg.port === 'number' ? existingCfg.port : 3456;
+  const defaultMcpPort = typeof existingCfg.mcpPort === 'number' ? existingCfg.mcpPort : (defaultWebPort === 8781 ? 8782 : 8781);
   let webPort, mcpPort;
   while (true) {
     webPort = await askPort('webPortPrompt', defaultWebPort);
@@ -1178,8 +1178,8 @@ async function main() {
 
   const isResuming = Object.keys(resumeCfg).length > 0;
   const needsRestart = isResuming && (
-    config.port        !== (resumeCfg.port        ?? 3000) ||
-    config.mcpPort     !== (resumeCfg.mcpPort     ?? 8787) ||
+    config.port        !== (resumeCfg.port        ?? 3456) ||
+    config.mcpPort     !== (resumeCfg.mcpPort     ?? 8781) ||
     config.mindRoot    !== (resumeCfg.mindRoot     ?? '')   ||
     config.authToken   !== (resumeCfg.authToken   ?? '')   ||
     config.webPassword !== (resumeCfg.webPassword ?? '')
@@ -1212,7 +1212,7 @@ async function main() {
   }
 
   const installDaemon = startMode === 'daemon' || process.argv.includes('--install-daemon');
-  finish(mindDir, config.startMode, config.mcpPort, config.authToken, installDaemon, needsRestart, resumeCfg.port ?? 3000);
+  finish(mindDir, config.startMode, config.mcpPort, config.authToken, installDaemon, needsRestart, resumeCfg.port ?? 3456);
 }
 
 function getLocalIP() {
@@ -1224,7 +1224,7 @@ function getLocalIP() {
   return null;
 }
 
-async function finish(mindDir, startMode = 'start', mcpPort = 8787, authToken = '', installDaemon = false, needsRestart = false, oldPort = 3000) {
+async function finish(mindDir, startMode = 'start', mcpPort = 8781, authToken = '', installDaemon = false, needsRestart = false, oldPort = 3456) {
   if (needsRestart) {
     const isRunning = await isSelfPort(oldPort);
     if (isRunning) {

package/scripts/upgrade-prompt.md

@@ -37,8 +37,8 @@ Help me upgrade my MindOS installation from the old source-based setup to the ne
    ```json
    {
      "mindRoot": "<value of MIND_ROOT>",
-     "port": 3000,
-     "mcpPort": 8787,
+     "port": 3456,
+     "mcpPort": 8781,
      "authToken": "<value of AUTH_TOKEN or empty string>",
      "webPassword": "",
      "ai": {
@@ -69,7 +69,7 @@ Help me upgrade my MindOS installation from the old source-based setup to the ne
    ```
    (First run will build automatically — this may take a minute.)
 
-7. **Confirm** the app is accessible at http://localhost:3000 and MCP is running at http://localhost:8787/mcp.
+7. **Confirm** the app is accessible at http://localhost:3456 and MCP is running at http://localhost:8781/mcp.
 
 Do not delete the old cloned repository — keep it as a backup. The `app/.env.local` file can also be kept as reference.
 ```
@@ -109,8 +109,8 @@ Do not delete the old cloned repository — keep it as a backup. The `app/.env.l
    ```json
    {
      "mindRoot": "<MIND_ROOT 的值>",
-     "port": 3000,
-     "mcpPort": 8787,
+     "port": 3456,
+     "mcpPort": 8781,
      "authToken": "<AUTH_TOKEN 的值，没有则留空字符串>",
      "webPassword": "",
      "ai": {
@@ -141,7 +141,7 @@ Do not delete the old cloned repository — keep it as a backup. The `app/.env.l
    ```
    （首次运行会自动构建，可能需要一两分钟。）
 
-7. **确认** http://localhost:3000 可以访问，http://localhost:8787/mcp 的 MCP 服务也在运行。
+7. **确认** http://localhost:3456 可以访问，http://localhost:8781/mcp 的 MCP 服务也在运行。
 
 不要删除旧的克隆仓库，保留作为备份。`app/.env.local` 也可以保留作参考。
 ```