botrun-msync 0.2.1 → 0.3.0

package/README.md

@@ -79,36 +79,38 @@ This way, even if a user modifies the config, they can't write to repos their to
 
 ## Config
 
-### Base Path
+### Config 與 Data 分離
 
-All `bms` data lives under a single base directory:
+config.json（scope 定義）和 data（clone 下來的 repo）可以放在不同位置：
 
-```
-~/.botrun/bms/             ← default base path
-├── config.json            ← scope definitions
-└── data/
-    ├── my-notes/          ← git clone of my-notes scope
-    ├── team1/             ← git clone of team1 scope
-    └── team2/             ← git clone of team2 scope
-```
+- **config.json** — 集中管理，預設 `~/.botrun/bms/config.json`
+- **data** — 跟著使用場景走，由 `memory init` 決定位置，預設 `$PWD/data/`
 
-Override with CLI option or environment variable:
-
-```bash
-npx botrun-msync --bms-path /tmp/test-bms memory init    # CLI option (highest priority)
-BMS_PATH=/custom/path npx botrun-msync memory init        # environment variable
 ```
+~/.botrun/bms/config.json     ← scope 定義 + data_path 指向
 
-Priority: `--bms-path` > `BMS_PATH` > `~/.botrun/bms/`
+/your/project/data/            ← data 跟著專案走
+├── my-notes/                  ← git clone of my-notes scope
+├── team1/                     ← git clone of team1 scope
+└── team2/                     ← git clone of team2 scope
+```
 
 ### Config File
 
-Located at `<BMS_PATH>/config.json` (default: `~/.botrun/bms/config.json`).
+預設路徑：`~/.botrun/bms/config.json`
+
+覆蓋方式：
+
+```bash
+npx botrun-msync --config-path /path/to/config.json memory init    # CLI option
+BMS_CONFIG=/path/to/config.json npx botrun-msync memory init        # env var
+```
 
-Override config path independently with: `BMS_CONFIG=/path/to/config.json`
+Priority: `--config-path` > `BMS_CONFIG` > `~/.botrun/bms/config.json`
 
 ```json
 {
+  "data_path": "/your/project/data",
   "scopes": {
     "my-notes": {
       "repo": "github.com/org/member1-memory",
@@ -127,6 +129,13 @@ Override config path independently with: `BMS_CONFIG=/path/to/config.json`
 }
 ```
 
+| Field | Required | Description |
+|-------|----------|-------------|
+| `data_path` | no | Absolute path to data directory. Written by `memory init` |
+| `scopes` | yes | Scope definitions (see below) |
+
+Scope fields:
+
 | Field | Required | Description |
 |-------|----------|-------------|
 | `repo` | yes | Git repo URL (without `https://`) |
@@ -141,6 +150,7 @@ Override config path independently with: `BMS_CONFIG=/path/to/config.json`
 ```bash
 npx botrun-msync config add-scope <name> --repo <url> [--branch <branch>] [--token-env <envVar>] [--description <text>] [--access <mode>]
 npx botrun-msync config remove-scope <name>
+npx botrun-msync config set-data-path <path>
 npx botrun-msync config show
 ```
 
@@ -148,22 +158,23 @@ npx botrun-msync config show
 
 | Variable | Purpose |
 |----------|---------|
-| `BMS_PATH` | Base directory for all bms data (default: `~/.botrun/bms`) |
-| `BMS_CONFIG` | Config file path (overrides `<BMS_PATH>/config.json`) |
+| `BMS_CONFIG` | Config file path (default: `~/.botrun/bms/config.json`) |
 
 Each scope's token is configured via `--token-env`, which points to an environment variable name. There are no global token variables — every scope must declare its own.
 
 ## Memory Commands
 
-### `npx botrun-msync memory init`
+### `npx botrun-msync memory init [--data-path <path>]`
+
+Clones all configured scope repos. Writes `data_path` to config.json.
 
-Clones all configured scope repos to `<BMS_PATH>/data/<scope-name>/`. If already cloned, pulls latest.
+Data path priority: `--data-path` > config `data_path` > `$PWD/data/`
 
 ```json
 {
   "scopes": {
-    "my-notes": { "local": "/root/.botrun/bms/data/my-notes" },
-    "team1": { "local": "/root/.botrun/bms/data/team1" }
+    "my-notes": { "local": "/your/project/data/my-notes" },
+    "team1": { "local": "/your/project/data/team1" }
   }
 }
 ```
@@ -179,13 +190,13 @@ Lists all scopes with their repo, description, access, and local filesystem path
       "repo": "github.com/org/member1-memory",
       "description": "Personal research notes",
       "access": "readwrite",
-      "local": "/root/.botrun/bms/data/my-notes"
+      "local": "/your/project/data/my-notes"
     },
     "team1": {
       "repo": "github.com/org/team1-memory",
       "description": "Team 1 memory",
       "access": "readonly",
-      "local": "/root/.botrun/bms/data/team1"
+      "local": "/your/project/data/team1"
     }
   }
 }
@@ -216,7 +227,7 @@ npx botrun-msync memory --help
 
 ```
 VM starts
-  → npx botrun-msync memory init          # clone repos to <BMS_PATH>/data/
+  → npx botrun-msync memory init          # clone repos to data/
   → agent reads/writes files     # using native tools (Read, Write, grep)
   → npx botrun-msync memory sync          # push changes
 VM destroyed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botrun-msync",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Git-backed memory sync CLI for AI agents (forked from botrun-mcli@0.2.2)",
   "type": "module",
   "bin": {

package/src/bin.mjs

@@ -5,6 +5,7 @@ import { getConfigPath } from './config.mjs';
 import { addScope } from './commands/config/add-scope.mjs';
 import { removeScope } from './commands/config/remove-scope.mjs';
 import { showConfig } from './commands/config/show.mjs';
+import { setDataPath } from './commands/config/set-data-path.mjs';
 import { initMemory } from './commands/memory/init.mjs';
 import { syncMemory } from './commands/memory/sync.mjs';
 import { listScopes } from './commands/memory/scopes.mjs';
@@ -27,13 +28,13 @@ const program = new Command();
 program
   .name('bms')
   .description('Git-backed memory sync for agents')
-  .version('0.2.0')
+  .version('0.3.0')
   .helpCommand(false)
-  .option('--bms-path <path>', 'Base directory for all bms data')
+  .option('--config-path <path>', 'Path to config.json')
   .configureHelp({ formatHelp: (cmd) => JSON.stringify(jsonHelp(cmd), null, 2) })
   .hook('preAction', (thisCommand) => {
-    const bmsPath = thisCommand.opts().bmsPath;
-    if (bmsPath) process.env.BMS_PATH = bmsPath;
+    const configPath = thisCommand.opts().configPath;
+    if (configPath) process.env.BMS_CONFIG = configPath;
   });
 
 // --- config ---
@@ -69,6 +70,14 @@ configCmd
     console.log(JSON.stringify(result, null, 2));
   });
 
+configCmd
+  .command('set-data-path <path>')
+  .description('Update the data directory path in config')
+  .action(async (path) => {
+    const result = await setDataPath(path, getConfigPath());
+    console.log(JSON.stringify(result, null, 2));
+  });
+
 // --- memory ---
 const memoryCmd = program.command('memory').description('Manage memory repos');
 memoryCmd.configureHelp({ formatHelp: (cmd) => JSON.stringify(jsonHelp(cmd), null, 2) });
@@ -76,8 +85,12 @@ memoryCmd.configureHelp({ formatHelp: (cmd) => JSON.stringify(jsonHelp(cmd), nul
 memoryCmd
   .command('init')
   .description('Clone all scope repos')
-  .action(async () => {
-    const result = await initMemory({ configPath: getConfigPath() });
+  .option('--data-path <path>', 'Directory to clone repos into (default: $PWD/data/)')
+  .action(async (opts) => {
+    const result = await initMemory({
+      configPath: getConfigPath(),
+      dataDir: opts.dataPath,
+    });
     console.log(JSON.stringify(result, null, 2));
   });
 

package/src/commands/config/set-data-path.mjs

@@ -0,0 +1,8 @@
+import { loadConfig, saveConfig } from '../../config.mjs';
+
+export async function setDataPath(dataPath, configPath) {
+  const config = await loadConfig(configPath);
+  config.data_path = dataPath;
+  await saveConfig(configPath, config);
+  return { data_path: dataPath };
+}

package/src/commands/memory/init.mjs

@@ -1,6 +1,6 @@
 import { mkdir, lstat } from 'node:fs/promises';
-import { join } from 'node:path';
-import { loadConfig, getBasePath } from '../../config.mjs';
+import { join, resolve } from 'node:path';
+import { loadConfig, saveConfig, getDataPath } from '../../config.mjs';
 import { gitExec } from '../../git-cmd.mjs';
 import { detectProvider, getProvider, resolveToken } from '../../git/provider.mjs';
 
@@ -51,10 +51,16 @@ async function cloneOrPull(repo, cloneDir, token, localMode, branch) {
 
 export async function initMemory(options = {}) {
   const configPath = options.configPath;
-  const dataDir = options.dataDir || join(getBasePath(), 'data');
+  const config = await loadConfig(configPath);
   const localMode = options.localMode || false;
 
-  const config = await loadConfig(configPath);
+  // data path priority: options.dataDir > config.data_path > $PWD/data/
+  const dataDir = options.dataDir || getDataPath(config) || resolve('data');
+
+  // Write data_path back to config
+  config.data_path = dataDir;
+  await saveConfig(configPath, config);
+
   const result = { scopes: {} };
 
   await mkdir(dataDir, { recursive: true });

package/src/commands/memory/scopes.mjs

@@ -1,10 +1,10 @@
 import { join } from 'node:path';
 import { lstat } from 'node:fs/promises';
-import { loadConfig, getBasePath } from '../../config.mjs';
+import { loadConfig, getDataPath } from '../../config.mjs';
 
 export async function listScopes(options = {}) {
   const config = await loadConfig(options.configPath);
-  const dataDir = options.dataDir || join(getBasePath(), 'data');
+  const dataDir = options.dataDir || getDataPath(config);
   const result = { scopes: {} };
 
   for (const [name, scope] of Object.entries(config.scopes)) {
@@ -12,11 +12,15 @@ export async function listScopes(options = {}) {
     if (scope.description) entry.description = scope.description;
     if (scope.access) entry.access = scope.access;
 
-    const scopeDir = join(dataDir, name);
-    try {
-      await lstat(scopeDir);
-      entry.local = scopeDir;
-    } catch {
+    if (dataDir) {
+      const scopeDir = join(dataDir, name);
+      try {
+        await lstat(scopeDir);
+        entry.local = scopeDir;
+      } catch {
+        entry.local = null;
+      }
+    } else {
       entry.local = null;
     }
 

package/src/commands/memory/sync.mjs

@@ -1,10 +1,14 @@
 import { join } from 'node:path';
-import { loadConfig, getBasePath } from '../../config.mjs';
+import { loadConfig, getDataPath } from '../../config.mjs';
 import { gitExec } from '../../git-cmd.mjs';
 
 export async function syncMemory(options = {}) {
   const config = await loadConfig(options.configPath);
-  const dataDir = options.dataDir || join(getBasePath(), 'data');
+  const dataDir = options.dataDir || getDataPath(config);
+
+  if (!dataDir) {
+    throw new Error('No data_path in config. Run "bms memory init" first.');
+  }
 
   const result = { synced: [], pulled: [], skipped: [] };
 
@@ -13,14 +17,12 @@ export async function syncMemory(options = {}) {
     let didPull = false;
     let didPush = false;
 
-    // 1. Always pull remote changes first
     try {
       const before = await gitExec(['-C', cloneDir, 'rev-parse', 'HEAD']);
       await gitExec(['-C', cloneDir, 'pull', '--rebase']);
       const after = await gitExec(['-C', cloneDir, 'rev-parse', 'HEAD']);
       if (before !== after) didPull = true;
     } catch {
-      // pull may fail if no upstream set; try setting it
       try {
         const branch = await gitExec(['-C', cloneDir, 'rev-parse', '--abbrev-ref', 'HEAD']);
         await gitExec(['-C', cloneDir, 'branch', '--set-upstream-to', `origin/${branch}`, branch]);
@@ -33,7 +35,6 @@ export async function syncMemory(options = {}) {
       }
     }
 
-    // 2. Check for local uncommitted changes and push
     const status = await gitExec(['-C', cloneDir, 'status', '--porcelain']);
     if (status) {
       await gitExec(['-C', cloneDir, 'add', '-A']);

package/src/config.mjs

@@ -2,14 +2,14 @@ import { readFile, writeFile, mkdir } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
 
-const DEFAULT_BASE_PATH = join(homedir(), '.botrun', 'bms');
+const DEFAULT_CONFIG_PATH = join(homedir(), '.botrun', 'bms', 'config.json');
 
-export function getBasePath() {
-  return process.env.BMS_PATH || DEFAULT_BASE_PATH;
+export function getConfigPath() {
+  return process.env.BMS_CONFIG || DEFAULT_CONFIG_PATH;
 }
 
-export function getConfigPath() {
-  return process.env.BMS_CONFIG || join(getBasePath(), 'config.json');
+export function getDataPath(config) {
+  return config.data_path || null;
 }
 
 export async function loadConfig(configPath = getConfigPath()) {