openclaw-teleport 0.2.0 → 0.3.0

package/README.md

@@ -10,9 +10,7 @@ Built for [OpenClaw](https://github.com/nicepkg/openclaw) agents.
 
 `openclaw-teleport` captures everything that makes an agent *that agent*:
 
-- **Identity files** — SOUL.md, IDENTITY.md, USER.md, AGENTS.md, etc.
-- **Memory** — daily notes, long-term memory, everything in `memory/`
-- **Tool data** — SQLite databases and other `.db` files
+- **Workspace** — entire workspace directory (identity files, memory, daily notes, workflows, skills, tool configs — everything except git repo subdirectories)
 - **Config** — agent configuration from `openclaw.json`
 - **Channel credentials** — Discord tokens, Feishu app secrets, all channel configs
 - **Cron jobs** — full scheduled task definitions (not just file names)
@@ -22,10 +20,10 @@ Built for [OpenClaw](https://github.com/nicepkg/openclaw) agents.
 All packed into a single `.soul` file (tar.gz). On a new machine, `unpack` does a **full one-command restoration**:
 
 1. ✅ Installs OpenClaw (if missing)
-2. ✅ Restores identity, memory, and data files
+2. ✅ Restores full workspace (files, memory, workflows, skills, databases)
 3. ✅ Writes agent config + channel credentials to `openclaw.json`
 4. ✅ Restores cron jobs
-5. ✅ Clones GitHub repos (forks go to `forks/` subdirectory)
+5. ✅ Clones GitHub repos (auto-detects forks)
 6. ✅ Guides through GitHub auth if needed
 7. ✅ Starts the OpenClaw gateway
 8. ✅ Prints a welcome summary
@@ -76,13 +74,12 @@ openclaw-teleport unpack kagura_20260320.soul --workspace /path/to/workspace
 
 What happens:
 1. **OpenClaw check** — installs via `npm install -g openclaw` if missing
-2. **Files restored** — identity, memory, tool databases
-3. **Config written** — agent config + channel credentials merged into `openclaw.json` (paths dynamically generated for the new machine)
+2. **Workspace restored** — full directory structure (identity, memory, workflows, skills, databases)
+3. **Config written** — agent config + channel credentials merged into `openclaw.json`
 4. **Cron jobs restored** — full job definitions written to `~/.openclaw/cron/jobs.json`
-5. **GitHub repos cloned** — using `gh repo clone` (forks → `workspace/forks/`, others → `workspace/`)
-6. **GitHub auth guided** — if `gh auth login` is needed, clear instructions printed
-7. **Gateway started** — `openclaw gateway start` (diagnostic info on failure)
-8. **Welcome summary** — file counts, repo status, configured services
+5. **GitHub repos cloned** — using `gh repo clone` (git repo subdirectories that were skipped during pack)
+6. **Gateway started** — `openclaw gateway start`
+7. **Welcome summary** — file counts, repo status, configured services
 
 ### Inspect a .soul file
 
@@ -99,29 +96,37 @@ Shows manifest info without unpacking: agent name, pack date, file count, repo l
 ├── openclaw.json          ← agent config + channels extracted
 ├── cron/jobs.json         ← full cron job definitions
 └── workspace/
-    ├── SOUL.md            ← identity files packed
+    ├── SOUL.md            ← identity files
     ├── IDENTITY.md
     ├── USER.md
     ├── TOOLS.md
-    ├── memory/            ← full memory directory packed
+    ├── HEARTBEAT.md
+    ├── NUDGE.md
+    ├── beliefs-candidates.md
+    ├── memory/            ← daily notes + long-term memory
     │   ├── 2026-03-15.md
     │   └── ...
-    └── *.db               ← tool databases packed
+    ├── skills/            ← custom skills
+    ├── flowforge/         ← git repo (skipped, cloned on unpack)
+    └── knowledge-base/    ← git repo (skipped, cloned on unpack)
 
          ↓ openclaw-teleport pack
 
-    kagura_20260320.soul   (tar.gz archive)
+    kagura_20260324.soul   (tar.gz archive)
     ├── manifest.json      ← metadata, repos, channels, cron jobs
-    ├── identity/          ← .md files
-    ├── memory/            ← memory directory
-    ├── data/              ← .db files
+    ├── workspace/         ← full workspace (minus git repos)
+    │   ├── SOUL.md
+    │   ├── memory/
+    │   ├── skills/
+    │   └── ...
     ├── config/            ← agent config
-    └── cron/              ← cron files
+    ├── cron/              ← cron files
+    └── credentials/       ← pairing records
 
          ↓ openclaw-teleport unpack (on new machine)
 
     1. Install OpenClaw (if needed)
-    2. Restore all files
+    2. Restore workspace files
     3. Write config + credentials to openclaw.json
     4. Restore cron jobs
     5. Clone GitHub repos (via gh)
@@ -138,7 +143,7 @@ The manifest contains metadata and embedded configurations:
   "agent_id": "kagura",
   "agent_name": "Kagura",
   "packed_at": "2026-03-20T04:25:00.000Z",
-  "files": ["identity/SOUL.md", "memory/2026-03-15.md", "..."],
+  "files": ["workspace/SOUL.md", "workspace/memory/2026-03-15.md", "..."],
   "github_repos": [
     { "name": "openclaw-teleport", "url": "https://github.com/kagura-agent/openclaw-teleport", "isFork": false }
   ],

package/dist/cli.mjs

@@ -39,58 +39,32 @@ function findAgent(config, agentId) {
   }
   return agents[0];
 }
-function collectMarkdownFiles(workspace) {
-  const files = [];
-  const entries = fs.readdirSync(workspace, { withFileTypes: true });
-  for (const entry of entries) {
-    if (entry.name === "node_modules" || entry.name === ".git") continue;
-    if (entry.isFile() && entry.name.endsWith(".md")) {
-      files.push(entry.name);
-    }
-  }
-  return files;
+var SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", ".next", "__pycache__", ".venv", "venv"]);
+function isGitRepo(dirPath) {
+  return fs.existsSync(path.join(dirPath, ".git"));
 }
-function collectMemoryDir(workspace) {
-  const memoryDir = path.join(workspace, "memory");
-  if (!fs.existsSync(memoryDir)) return [];
+function collectWorkspaceFiles(workspace) {
   const files = [];
   const walk = (dir, prefix) => {
-    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    let entries;
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
     for (const entry of entries) {
-      const rel = path.join(prefix, entry.name);
+      if (SKIP_DIRS.has(entry.name)) continue;
+      const fullPath = path.join(dir, entry.name);
+      const rel = prefix ? path.join(prefix, entry.name) : entry.name;
       if (entry.isDirectory()) {
-        walk(path.join(dir, entry.name), rel);
-      } else {
+        if (isGitRepo(fullPath)) continue;
+        walk(fullPath, rel);
+      } else if (entry.isFile()) {
         files.push(rel);
       }
     }
   };
-  walk(memoryDir, "memory");
-  return files;
-}
-function collectDbFiles(workspace) {
-  const files = [];
-  const knownPaths = [
-    "gogetajob/data/gogetajob.db",
-    "flowforge/flowforge.db",
-    "data/gogetajob.db",
-    "data/flowforge.db"
-  ];
-  for (const rel of knownPaths) {
-    const full = path.join(workspace, rel);
-    if (fs.existsSync(full)) {
-      files.push(rel);
-    }
-  }
-  try {
-    const rootEntries = fs.readdirSync(workspace, { withFileTypes: true });
-    for (const entry of rootEntries) {
-      if (entry.isFile() && entry.name.endsWith(".db")) {
-        files.push(entry.name);
-      }
-    }
-  } catch {
-  }
+  walk(workspace, "");
   return files;
 }
 function collectCronFiles(agentId) {
@@ -185,6 +159,24 @@ function commandExists(cmd) {
     return false;
   }
 }
+function installGh() {
+  try {
+    const platform2 = os.platform();
+    if (platform2 === "linux") {
+      execSync(
+        '(type -p wget >/dev/null || (sudo apt update && sudo apt-get install wget -y)) && sudo mkdir -p -m 755 /etc/apt/keyrings && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null && sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null && sudo apt update && sudo apt install gh -y',
+        { stdio: "pipe", timeout: 12e4 }
+      );
+    } else if (platform2 === "darwin") {
+      execSync("brew install gh", { stdio: "pipe", timeout: 12e4 });
+    } else {
+      return false;
+    }
+    return commandExists("gh");
+  } catch {
+    return false;
+  }
+}
 function isGhAuthenticated() {
   try {
     execSync("gh auth status", { encoding: "utf-8", stdio: "pipe" });
@@ -216,36 +208,32 @@ async function pack(agentId, outputPath) {
   }
   fs2.mkdirSync(stageDir, { recursive: true });
   const allFiles = [];
-  console.log("\u{1F4DD} Collecting identity files...");
-  const mdFiles = collectMarkdownFiles(agent.workspace);
-  for (const f of mdFiles) {
-    const src = path2.join(agent.workspace, f);
-    const dst = path2.join(stageDir, "identity", f);
-    fs2.mkdirSync(path2.dirname(dst), { recursive: true });
-    fs2.copyFileSync(src, dst);
-    allFiles.push(`identity/${f}`);
-  }
-  console.log(`   \u2705 ${mdFiles.length} markdown files`);
-  console.log("\u{1F9E0} Collecting memory...");
-  const memFiles = collectMemoryDir(agent.workspace);
-  for (const f of memFiles) {
+  console.log("\u{1F4C2} Collecting workspace files...");
+  const wsFiles = collectWorkspaceFiles(agent.workspace);
+  for (const f of wsFiles) {
     const src = path2.join(agent.workspace, f);
-    const dst = path2.join(stageDir, f);
+    const dst = path2.join(stageDir, "workspace", f);
     fs2.mkdirSync(path2.dirname(dst), { recursive: true });
     fs2.copyFileSync(src, dst);
-    allFiles.push(f);
+    allFiles.push(`workspace/${f}`);
   }
-  console.log(`   \u2705 ${memFiles.length} memory files`);
-  console.log("\u{1F5C4}\uFE0F  Collecting tool data...");
-  const dbFiles = collectDbFiles(agent.workspace);
-  for (const f of dbFiles) {
-    const src = path2.join(agent.workspace, f);
-    const dst = path2.join(stageDir, "data", f);
-    fs2.mkdirSync(path2.dirname(dst), { recursive: true });
-    fs2.copyFileSync(src, dst);
-    allFiles.push(`data/${f}`);
+  console.log(`   \u2705 ${wsFiles.length} files (skipped git repo subdirs)`);
+  try {
+    const topEntries = fs2.readdirSync(agent.workspace, { withFileTypes: true });
+    const skippedRepos = [];
+    for (const entry of topEntries) {
+      if (entry.isDirectory()) {
+        const gitDir = path2.join(agent.workspace, entry.name, ".git");
+        if (fs2.existsSync(gitDir)) {
+          skippedRepos.push(entry.name);
+        }
+      }
+    }
+    if (skippedRepos.length > 0) {
+      console.log(`   \u23ED\uFE0F  Skipped git repos (will clone on unpack): ${skippedRepos.join(", ")}`);
+    }
+  } catch {
   }
-  console.log(`   \u2705 ${dbFiles.length} database files`);
   console.log("\u2699\uFE0F  Extracting agent config...");
   const agentConfig = extractAgentConfig(config, agent.id);
   const configPath = path2.join(stageDir, "config", "agent-config.json");
@@ -263,6 +251,21 @@ async function pack(agentId, outputPath) {
     allFiles.push(`cron/${f}`);
   }
   console.log(`   \u2705 ${cronFiles.length} cron files`);
+  console.log("\u{1F510} Collecting credentials...");
+  const credDir = path2.join(OPENCLAW_DIR2, "credentials");
+  let credCount = 0;
+  if (fs2.existsSync(credDir)) {
+    const credFiles = fs2.readdirSync(credDir).filter((f) => f.endsWith(".json"));
+    for (const f of credFiles) {
+      const src = path2.join(credDir, f);
+      const dst = path2.join(stageDir, "credentials", f);
+      fs2.mkdirSync(path2.dirname(dst), { recursive: true });
+      fs2.copyFileSync(src, dst);
+      allFiles.push(`credentials/${f}`);
+      credCount++;
+    }
+  }
+  console.log(`   \u2705 ${credCount} credential files`);
   console.log("\u23F0 Extracting cron job definitions...");
   const cronJobs = loadCronJobs(agent.id);
   console.log(`   \u2705 ${cronJobs.length} cron jobs for ${agent.id}`);
@@ -278,6 +281,7 @@ async function pack(agentId, outputPath) {
   const agentDefaults = sanitizeAgentDefaults(config.agents?.defaults ?? {});
   const modelsConfig = config.models ?? {};
   const bindingsConfig = config.bindings ?? [];
+  const gatewayConfig = config.gateway ?? {};
   const manifest = {
     agent_id: agent.id,
     agent_name: agent.name,
@@ -289,7 +293,8 @@ async function pack(agentId, outputPath) {
     cron_jobs: cronJobs,
     agent_defaults: agentDefaults,
     models_config: modelsConfig,
-    bindings: bindingsConfig
+    bindings: bindingsConfig,
+    gateway: gatewayConfig
   };
   const manifestPath = path2.join(stageDir, "manifest.json");
   fs2.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
@@ -450,6 +455,10 @@ function writeAgentConfig(manifest, stageDir, targetWorkspace) {
         console.log("   \u23ED\uFE0F  Bindings already exist, skipping");
       }
     }
+    if (manifest.gateway && Object.keys(manifest.gateway).length > 0) {
+      existingConfig.gateway = { ...existingConfig.gateway ?? {}, ...manifest.gateway };
+      console.log("   \u2705 Gateway config restored");
+    }
     fs3.writeFileSync(CONFIG_PATH2, JSON.stringify(existingConfig, null, 2));
   } else {
     const newConfig = {
@@ -473,6 +482,10 @@ function writeAgentConfig(manifest, stageDir, targetWorkspace) {
       newConfig.bindings = manifest.bindings;
       console.log("   \u2705 Bindings restored");
     }
+    if (manifest.gateway && Object.keys(manifest.gateway).length > 0) {
+      newConfig.gateway = manifest.gateway;
+      console.log("   \u2705 Gateway config restored");
+    }
     fs3.writeFileSync(CONFIG_PATH2, JSON.stringify(newConfig, null, 2));
     console.log("   \u2705 New openclaw.json created");
   }
@@ -519,6 +532,22 @@ function restoreCronJobs(manifest, stageDir) {
   }
   return manifest.cron_jobs?.length ?? cronFileCount;
 }
+function restoreCredentials(stageDir) {
+  console.log("\u{1F510} Restoring credentials...");
+  const credSrc = path3.join(stageDir, "credentials");
+  if (!fs3.existsSync(credSrc)) {
+    console.log("   (none)");
+    return 0;
+  }
+  const credDst = path3.join(OPENCLAW_DIR3, "credentials");
+  fs3.mkdirSync(credDst, { recursive: true });
+  const files = fs3.readdirSync(credSrc).filter((f) => f.endsWith(".json"));
+  for (const f of files) {
+    fs3.copyFileSync(path3.join(credSrc, f), path3.join(credDst, f));
+  }
+  console.log(`   \u2705 ${files.length} credential file(s) restored`);
+  return files.length;
+}
 function cloneGitHubRepos(manifest, targetWorkspace) {
   const result = { cloned: 0, skipped: 0, failed: 0 };
   if (!manifest.github_repos || manifest.github_repos.length === 0) {
@@ -526,15 +555,19 @@ function cloneGitHubRepos(manifest, targetWorkspace) {
   }
   console.log("\n\u{1F419} Cloning GitHub repos...");
   if (!commandExists("gh")) {
-    console.log("   \u26A0\uFE0F  GitHub CLI (gh) not installed");
-    console.log("   Install it: https://cli.github.com/");
-    console.log("   Then run: gh auth login");
-    console.log(`   Repos to clone manually (${manifest.github_repos.length}):`);
-    for (const repo of manifest.github_repos) {
-      console.log(`     git clone ${repo.url}`);
+    console.log("   \u2B07\uFE0F  GitHub CLI (gh) not found, installing...");
+    const installed = installGh();
+    if (!installed) {
+      console.log("   \u26A0\uFE0F  Could not auto-install GitHub CLI");
+      console.log("   Install manually: https://cli.github.com/");
+      console.log(`   Repos to clone manually (${manifest.github_repos.length}):`);
+      for (const repo of manifest.github_repos) {
+        console.log(`     git clone ${repo.url}`);
+      }
+      result.failed = manifest.github_repos.length;
+      return result;
     }
-    result.failed = manifest.github_repos.length;
-    return result;
+    console.log("   \u2705 GitHub CLI installed");
   }
   if (!isGhAuthenticated()) {
     console.log("   \u26A0\uFE0F  GitHub CLI not authenticated");
@@ -622,23 +655,10 @@ async function unpack(soulFile, workspacePath) {
   const openclawInstalled = ensureOpenClaw();
   const targetWorkspace = workspacePath ? path3.resolve(workspacePath) : path3.join(OPENCLAW_DIR3, "workspace");
   fs3.mkdirSync(targetWorkspace, { recursive: true });
-  console.log("\n\u{1F4DD} Restoring identity files...");
-  let identityCount = 0;
-  const identityDir = path3.join(stageDir, "identity");
-  if (fs3.existsSync(identityDir)) {
-    const files = fs3.readdirSync(identityDir);
-    for (const f of files) {
-      const src = path3.join(identityDir, f);
-      const dst = path3.join(targetWorkspace, f);
-      fs3.copyFileSync(src, dst);
-      console.log(`   \u2705 ${f}`);
-      identityCount++;
-    }
-  }
-  console.log("\u{1F9E0} Restoring memory...");
-  let memoryCount = 0;
-  const memoryDir = path3.join(stageDir, "memory");
-  if (fs3.existsSync(memoryDir)) {
+  console.log("\n\u{1F4C2} Restoring workspace files...");
+  let workspaceCount = 0;
+  const workspaceDir = path3.join(stageDir, "workspace");
+  if (fs3.existsSync(workspaceDir)) {
     const copyRecursive = (src, dst) => {
       fs3.mkdirSync(dst, { recursive: true });
       const entries = fs3.readdirSync(src, { withFileTypes: true });
@@ -649,36 +669,18 @@ async function unpack(soulFile, workspacePath) {
           copyRecursive(srcPath, dstPath);
         } else {
           fs3.copyFileSync(srcPath, dstPath);
-          memoryCount++;
+          workspaceCount++;
         }
       }
     };
-    copyRecursive(memoryDir, path3.join(targetWorkspace, "memory"));
-    console.log(`   \u2705 ${memoryCount} memory files restored`);
-  }
-  console.log("\u{1F5C4}\uFE0F  Restoring tool data...");
-  let dataCount = 0;
-  const dataDir = path3.join(stageDir, "data");
-  if (fs3.existsSync(dataDir)) {
-    const copyRecursive = (src, dst) => {
-      fs3.mkdirSync(dst, { recursive: true });
-      const entries = fs3.readdirSync(src, { withFileTypes: true });
-      for (const entry of entries) {
-        const srcPath = path3.join(src, entry.name);
-        const dstPath = path3.join(dst, entry.name);
-        if (entry.isDirectory()) {
-          copyRecursive(srcPath, dstPath);
-        } else {
-          fs3.copyFileSync(srcPath, dstPath);
-          console.log(`   \u2705 ${entry.name}`);
-          dataCount++;
-        }
-      }
-    };
-    copyRecursive(dataDir, targetWorkspace);
+    copyRecursive(workspaceDir, targetWorkspace);
+    console.log(`   \u2705 ${workspaceCount} files restored`);
+  } else {
+    console.log("   \u26A0\uFE0F  No workspace/ directory in archive");
   }
   writeAgentConfig(manifest, stageDir, targetWorkspace);
   const cronCount = restoreCronJobs(manifest, stageDir);
+  const credCount = restoreCredentials(stageDir);
   const repoResult = cloneGitHubRepos(manifest, targetWorkspace);
   fs3.rmSync(tmpDir, { recursive: true });
   let gatewayStarted = false;
@@ -698,7 +700,7 @@ async function unpack(soulFile, workspacePath) {
   console.log("\u2550".repeat(50));
   console.log(`\u{1F194} Agent:      ${manifest.agent_name} (${manifest.agent_id})`);
   console.log(`\u{1F4C2} Workspace:  ${targetWorkspace}`);
-  console.log(`\u{1F4DD} Files:      ${identityCount} identity + ${memoryCount} memory + ${dataCount} data`);
+  console.log(`\u{1F4DD} Files:      ${workspaceCount} workspace files`);
   console.log(`\u23F0 Cron:       ${cronCount} job(s)`);
   if (manifest.github_repos && manifest.github_repos.length > 0) {
     console.log(`\u{1F419} Repos:      ${repoResult.cloned} cloned, ${repoResult.skipped} skipped, ${repoResult.failed} failed`);
@@ -778,17 +780,15 @@ async function inspect(soulFile) {
         console.log(`   \u2022 ${svc}`);
       }
     }
-    const identityFiles = manifest.files.filter((f) => f.startsWith("identity/"));
-    const memoryFiles = manifest.files.filter((f) => f.startsWith("memory/"));
-    const dataFiles = manifest.files.filter((f) => f.startsWith("data/"));
+    const workspaceFiles = manifest.files.filter((f) => f.startsWith("workspace/"));
     const cronFiles = manifest.files.filter((f) => f.startsWith("cron/"));
     const configFiles = manifest.files.filter((f) => f.startsWith("config/"));
+    const credFiles = manifest.files.filter((f) => f.startsWith("credentials/"));
     console.log("\n\u{1F4CA} Contents breakdown:");
-    if (identityFiles.length > 0) console.log(`   \u{1F4DD} Identity: ${identityFiles.length} files`);
-    if (memoryFiles.length > 0) console.log(`   \u{1F9E0} Memory:   ${memoryFiles.length} files`);
-    if (dataFiles.length > 0) console.log(`   \u{1F5C4}\uFE0F  Data:     ${dataFiles.length} files`);
+    if (workspaceFiles.length > 0) console.log(`   \u{1F4C2} Workspace: ${workspaceFiles.length} files`);
     if (cronFiles.length > 0) console.log(`   \u23F0 Cron:     ${cronFiles.length} files`);
     if (configFiles.length > 0) console.log(`   \u2699\uFE0F  Config:   ${configFiles.length} files`);
+    if (credFiles.length > 0) console.log(`   \u{1F510} Creds:    ${credFiles.length} files`);
     console.log("\u2550".repeat(50) + "\n");
   } finally {
     fs3.rmSync(tmpDir, { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-teleport",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Agent soul migration — pack your identity, memory, and tools into one file, unpack on a new machine",
   "type": "module",
   "bin": {

package/src/commands.ts

@@ -2,7 +2,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
 import { execSync } from 'node:child_process';
-import { loadConfig, commandExists, isGhAuthenticated, type Manifest, type OpenClawConfig, type CronJob } from './utils.js';
+import { loadConfig, commandExists, installGh, isGhAuthenticated, type Manifest, type OpenClawConfig, type CronJob } from './utils.js';
 
 const OPENCLAW_DIR = path.join(os.homedir(), '.openclaw');
 const CONFIG_PATH = path.join(OPENCLAW_DIR, 'openclaw.json');
@@ -169,6 +169,12 @@ function writeAgentConfig(
       }
     }
 
+    // Merge gateway config
+    if (manifest.gateway && Object.keys(manifest.gateway).length > 0) {
+      existingConfig.gateway = { ...(existingConfig.gateway ?? {}), ...manifest.gateway };
+      console.log('   ✅ Gateway config restored');
+    }
+
     fs.writeFileSync(CONFIG_PATH, JSON.stringify(existingConfig, null, 2));
   } else {
     // Create new config from scratch
@@ -200,6 +206,12 @@ function writeAgentConfig(
       console.log('   ✅ Bindings restored');
     }
 
+    // Add gateway config
+    if (manifest.gateway && Object.keys(manifest.gateway).length > 0) {
+      newConfig.gateway = manifest.gateway;
+      console.log('   ✅ Gateway config restored');
+    }
+
     fs.writeFileSync(CONFIG_PATH, JSON.stringify(newConfig, null, 2));
     console.log('   ✅ New openclaw.json created');
   }
@@ -261,6 +273,27 @@ function restoreCronJobs(manifest: Manifest, stageDir: string): number {
   return manifest.cron_jobs?.length ?? cronFileCount;
 }
 
+// ── Step 3.5: Restore credentials (pairing, allowFrom) ────────────
+
+function restoreCredentials(stageDir: string): number {
+  console.log('🔐 Restoring credentials...');
+  const credSrc = path.join(stageDir, 'credentials');
+  if (!fs.existsSync(credSrc)) {
+    console.log('   (none)');
+    return 0;
+  }
+
+  const credDst = path.join(OPENCLAW_DIR, 'credentials');
+  fs.mkdirSync(credDst, { recursive: true });
+
+  const files = fs.readdirSync(credSrc).filter(f => f.endsWith('.json'));
+  for (const f of files) {
+    fs.copyFileSync(path.join(credSrc, f), path.join(credDst, f));
+  }
+  console.log(`   ✅ ${files.length} credential file(s) restored`);
+  return files.length;
+}
+
 // ── Step 4 & 5: GitHub auth + clone repos ──────────────────────────
 
 function cloneGitHubRepos(manifest: Manifest, targetWorkspace: string): { cloned: number; skipped: number; failed: number } {
@@ -272,17 +305,21 @@ function cloneGitHubRepos(manifest: Manifest, targetWorkspace: string): { cloned
 
   console.log('\n🐙 Cloning GitHub repos...');
 
-  // Check if gh CLI is available
+  // Check if gh CLI is available, install if not
   if (!commandExists('gh')) {
-    console.log('   ⚠️  GitHub CLI (gh) not installed');
-    console.log('   Install it: https://cli.github.com/');
-    console.log('   Then run: gh auth login');
-    console.log(`   Repos to clone manually (${manifest.github_repos.length}):`);
-    for (const repo of manifest.github_repos) {
-      console.log(`     git clone ${repo.url}`);
+    console.log('   ⬇️  GitHub CLI (gh) not found, installing...');
+    const installed = installGh();
+    if (!installed) {
+      console.log('   ⚠️  Could not auto-install GitHub CLI');
+      console.log('   Install manually: https://cli.github.com/');
+      console.log(`   Repos to clone manually (${manifest.github_repos.length}):`);
+      for (const repo of manifest.github_repos) {
+        console.log(`     git clone ${repo.url}`);
+      }
+      result.failed = manifest.github_repos.length;
+      return result;
     }
-    result.failed = manifest.github_repos.length;
-    return result;
+    console.log('   ✅ GitHub CLI installed');
   }
 
   // Check GitHub auth
@@ -400,49 +437,12 @@ export async function unpack(soulFile: string, workspacePath?: string): Promise<
 
   fs.mkdirSync(targetWorkspace, { recursive: true });
 
-  // ── Step 2: Restore identity files ───────────────────────────────
-  console.log('\n📝 Restoring identity files...');
-  let identityCount = 0;
-  const identityDir = path.join(stageDir, 'identity');
-  if (fs.existsSync(identityDir)) {
-    const files = fs.readdirSync(identityDir);
-    for (const f of files) {
-      const src = path.join(identityDir, f);
-      const dst = path.join(targetWorkspace, f);
-      fs.copyFileSync(src, dst);
-      console.log(`   ✅ ${f}`);
-      identityCount++;
-    }
-  }
-
-  // ── Step 3: Restore memory ──────────────────────────────────────
-  console.log('🧠 Restoring memory...');
-  let memoryCount = 0;
-  const memoryDir = path.join(stageDir, 'memory');
-  if (fs.existsSync(memoryDir)) {
-    const copyRecursive = (src: string, dst: string) => {
-      fs.mkdirSync(dst, { recursive: true });
-      const entries = fs.readdirSync(src, { withFileTypes: true });
-      for (const entry of entries) {
-        const srcPath = path.join(src, entry.name);
-        const dstPath = path.join(dst, entry.name);
-        if (entry.isDirectory()) {
-          copyRecursive(srcPath, dstPath);
-        } else {
-          fs.copyFileSync(srcPath, dstPath);
-          memoryCount++;
-        }
-      }
-    };
-    copyRecursive(memoryDir, path.join(targetWorkspace, 'memory'));
-    console.log(`   ✅ ${memoryCount} memory files restored`);
-  }
+  // ── Step 2: Restore workspace files ──────────────────────────────
+  console.log('\n📂 Restoring workspace files...');
+  let workspaceCount = 0;
 
-  // ── Step 4: Restore tool data ───────────────────────────────────
-  console.log('🗄️  Restoring tool data...');
-  let dataCount = 0;
-  const dataDir = path.join(stageDir, 'data');
-  if (fs.existsSync(dataDir)) {
+  const workspaceDir = path.join(stageDir, 'workspace');
+  if (fs.existsSync(workspaceDir)) {
     const copyRecursive = (src: string, dst: string) => {
       fs.mkdirSync(dst, { recursive: true });
       const entries = fs.readdirSync(src, { withFileTypes: true });
@@ -453,12 +453,14 @@ export async function unpack(soulFile: string, workspacePath?: string): Promise<
           copyRecursive(srcPath, dstPath);
         } else {
           fs.copyFileSync(srcPath, dstPath);
-          console.log(`   ✅ ${entry.name}`);
-          dataCount++;
+          workspaceCount++;
         }
       }
     };
-    copyRecursive(dataDir, targetWorkspace);
+    copyRecursive(workspaceDir, targetWorkspace);
+    console.log(`   ✅ ${workspaceCount} files restored`);
+  } else {
+    console.log('   ⚠️  No workspace/ directory in archive');
   }
 
   // ── Step 5: Write full agent config (with channels, credentials) ─
@@ -467,6 +469,9 @@ export async function unpack(soulFile: string, workspacePath?: string): Promise<
   // ── Step 6: Restore cron jobs ───────────────────────────────────
   const cronCount = restoreCronJobs(manifest, stageDir);
 
+  // ── Step 6.5: Restore credentials ─────────────────────────────
+  const credCount = restoreCredentials(stageDir);
+
   // ── Step 7: Clone GitHub repos ──────────────────────────────────
   const repoResult = cloneGitHubRepos(manifest, targetWorkspace);
 
@@ -494,7 +499,7 @@ export async function unpack(soulFile: string, workspacePath?: string): Promise<
   console.log('═'.repeat(50));
   console.log(`🆔 Agent:      ${manifest.agent_name} (${manifest.agent_id})`);
   console.log(`📂 Workspace:  ${targetWorkspace}`);
-  console.log(`📝 Files:      ${identityCount} identity + ${memoryCount} memory + ${dataCount} data`);
+  console.log(`📝 Files:      ${workspaceCount} workspace files`);
   console.log(`⏰ Cron:       ${cronCount} job(s)`);
 
   if (manifest.github_repos && manifest.github_repos.length > 0) {
@@ -593,18 +598,16 @@ export async function inspect(soulFile: string): Promise<void> {
     }
 
     // Show file breakdown
-    const identityFiles = manifest.files.filter((f) => f.startsWith('identity/'));
-    const memoryFiles = manifest.files.filter((f) => f.startsWith('memory/'));
-    const dataFiles = manifest.files.filter((f) => f.startsWith('data/'));
+    const workspaceFiles = manifest.files.filter((f) => f.startsWith('workspace/'));
     const cronFiles = manifest.files.filter((f) => f.startsWith('cron/'));
     const configFiles = manifest.files.filter((f) => f.startsWith('config/'));
+    const credFiles = manifest.files.filter((f) => f.startsWith('credentials/'));
 
     console.log('\n📊 Contents breakdown:');
-    if (identityFiles.length > 0) console.log(`   📝 Identity: ${identityFiles.length} files`);
-    if (memoryFiles.length > 0) console.log(`   🧠 Memory:   ${memoryFiles.length} files`);
-    if (dataFiles.length > 0) console.log(`   🗄️  Data:     ${dataFiles.length} files`);
+    if (workspaceFiles.length > 0) console.log(`   📂 Workspace: ${workspaceFiles.length} files`);
     if (cronFiles.length > 0) console.log(`   ⏰ Cron:     ${cronFiles.length} files`);
     if (configFiles.length > 0) console.log(`   ⚙️  Config:   ${configFiles.length} files`);
+    if (credFiles.length > 0) console.log(`   🔐 Creds:    ${credFiles.length} files`);
 
     console.log('═'.repeat(50) + '\n');
   } finally {

package/src/pack.ts

@@ -5,9 +5,7 @@ import { execSync } from 'node:child_process';
 import {
   loadConfig,
   findAgent,
-  collectMarkdownFiles,
-  collectMemoryDir,
-  collectDbFiles,
+  collectWorkspaceFiles,
   collectCronFiles,
   getGitHubRepos,
   detectServices,
@@ -49,41 +47,34 @@ export async function pack(agentId?: string, outputPath?: string): Promise<void>
 
   const allFiles: string[] = [];
 
-  // 1. Collect identity files (.md in workspace root)
-  console.log('📝 Collecting identity files...');
-  const mdFiles = collectMarkdownFiles(agent.workspace);
-  for (const f of mdFiles) {
+  // 1. Collect entire workspace recursively (skips git repos, node_modules, etc.)
+  console.log('📂 Collecting workspace files...');
+  const wsFiles = collectWorkspaceFiles(agent.workspace);
+  for (const f of wsFiles) {
     const src = path.join(agent.workspace, f);
-    const dst = path.join(stageDir, 'identity', f);
+    const dst = path.join(stageDir, 'workspace', f);
     fs.mkdirSync(path.dirname(dst), { recursive: true });
     fs.copyFileSync(src, dst);
-    allFiles.push(`identity/${f}`);
+    allFiles.push(`workspace/${f}`);
   }
-  console.log(`   ✅ ${mdFiles.length} markdown files`);
-
-  // 2. Collect memory directory
-  console.log('🧠 Collecting memory...');
-  const memFiles = collectMemoryDir(agent.workspace);
-  for (const f of memFiles) {
-    const src = path.join(agent.workspace, f);
-    const dst = path.join(stageDir, f);
-    fs.mkdirSync(path.dirname(dst), { recursive: true });
-    fs.copyFileSync(src, dst);
-    allFiles.push(f);
-  }
-  console.log(`   ✅ ${memFiles.length} memory files`);
-
-  // 3. Collect .db files
-  console.log('🗄️  Collecting tool data...');
-  const dbFiles = collectDbFiles(agent.workspace);
-  for (const f of dbFiles) {
-    const src = path.join(agent.workspace, f);
-    const dst = path.join(stageDir, 'data', f);
-    fs.mkdirSync(path.dirname(dst), { recursive: true });
-    fs.copyFileSync(src, dst);
-    allFiles.push(`data/${f}`);
-  }
-  console.log(`   ✅ ${dbFiles.length} database files`);
+  console.log(`   ✅ ${wsFiles.length} files (skipped git repo subdirs)`);
+
+  // List skipped git repos for transparency
+  try {
+    const topEntries = fs.readdirSync(agent.workspace, { withFileTypes: true });
+    const skippedRepos: string[] = [];
+    for (const entry of topEntries) {
+      if (entry.isDirectory()) {
+        const gitDir = path.join(agent.workspace, entry.name, '.git');
+        if (fs.existsSync(gitDir)) {
+          skippedRepos.push(entry.name);
+        }
+      }
+    }
+    if (skippedRepos.length > 0) {
+      console.log(`   ⏭️  Skipped git repos (will clone on unpack): ${skippedRepos.join(', ')}`);
+    }
+  } catch {}
 
   // 4. Extract agent config
   console.log('⚙️  Extracting agent config...');
@@ -106,6 +97,23 @@ export async function pack(agentId?: string, outputPath?: string): Promise<void>
   }
   console.log(`   ✅ ${cronFiles.length} cron files`);
 
+  // 5.5. Collect credentials (pairing records, allowFrom lists)
+  console.log('🔐 Collecting credentials...');
+  const credDir = path.join(OPENCLAW_DIR, 'credentials');
+  let credCount = 0;
+  if (fs.existsSync(credDir)) {
+    const credFiles = fs.readdirSync(credDir).filter(f => f.endsWith('.json'));
+    for (const f of credFiles) {
+      const src = path.join(credDir, f);
+      const dst = path.join(stageDir, 'credentials', f);
+      fs.mkdirSync(path.dirname(dst), { recursive: true });
+      fs.copyFileSync(src, dst);
+      allFiles.push(`credentials/${f}`);
+      credCount++;
+    }
+  }
+  console.log(`   ✅ ${credCount} credential files`);
+
   // 6. Load full cron job content for this agent
   console.log('⏰ Extracting cron job definitions...');
   const cronJobs = loadCronJobs(agent.id);
@@ -126,10 +134,11 @@ export async function pack(agentId?: string, outputPath?: string): Promise<void>
   const channelCount = Object.keys(channelsConfig).length;
   console.log(`   ✅ ${channelCount} channel(s) saved`);
 
-  // 10. Extract agent defaults and models config
+  // 10. Extract agent defaults, models config, and gateway config
   const agentDefaults = sanitizeAgentDefaults(config.agents?.defaults ?? {});
   const modelsConfig = config.models ?? {};
   const bindingsConfig = config.bindings ?? [];
+  const gatewayConfig = config.gateway ?? {};
 
   // 11. Generate manifest
   const manifest: Manifest = {
@@ -144,6 +153,7 @@ export async function pack(agentId?: string, outputPath?: string): Promise<void>
     agent_defaults: agentDefaults,
     models_config: modelsConfig,
     bindings: bindingsConfig as Array<Record<string, unknown>>,
+    gateway: gatewayConfig as Record<string, unknown>,
   };
 
   const manifestPath = path.join(stageDir, 'manifest.json');

package/src/utils.ts

@@ -35,6 +35,8 @@ export interface Manifest {
   models_config?: Record<string, unknown>;
   /** Bindings configuration (added in v0.2) */
   bindings?: Array<Record<string, unknown>>;
+  /** Gateway configuration (added in v0.2.1) */
+  gateway?: Record<string, unknown>;
 }
 
 export interface CronJob {
@@ -91,62 +93,51 @@ export function findAgent(config: OpenClawConfig, agentId?: string): AgentConfig
 
 // ── File collection ────────────────────────────────────────────────
 
-export function collectMarkdownFiles(workspace: string): string[] {
-  const files: string[] = [];
-  const entries = fs.readdirSync(workspace, { withFileTypes: true });
-  for (const entry of entries) {
-    if (entry.name === 'node_modules' || entry.name === '.git') continue;
-    if (entry.isFile() && entry.name.endsWith('.md')) {
-      files.push(entry.name);
-    }
-  }
-  return files;
+/** Directories to always skip when recursively walking the workspace. */
+const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', '.next', '__pycache__', '.venv', 'venv']);
+
+/**
+ * Check whether a directory is the root of its own git repository.
+ * Used to skip cloneable sub-repos (knowledge-base, gogetajob, etc.)
+ * so they are restored via `gh repo clone` instead of being packed.
+ */
+function isGitRepo(dirPath: string): boolean {
+  return fs.existsSync(path.join(dirPath, '.git'));
 }
 
-export function collectMemoryDir(workspace: string): string[] {
-  const memoryDir = path.join(workspace, 'memory');
-  if (!fs.existsSync(memoryDir)) return [];
+/**
+ * Recursively collect all files in the workspace, preserving the
+ * directory structure.  Skips:
+ *  - `node_modules`, `.git`, `dist`, build/cache dirs
+ *  - Sub-directories that are their own git repos (restored via clone)
+ *
+ * Returns paths relative to `workspace`.
+ */
+export function collectWorkspaceFiles(workspace: string): string[] {
   const files: string[] = [];
   const walk = (dir: string, prefix: string) => {
-    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    let entries: fs.Dirent[];
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return; // permission errors, broken symlinks, etc.
+    }
     for (const entry of entries) {
-      const rel = path.join(prefix, entry.name);
+      if (SKIP_DIRS.has(entry.name)) continue;
+
+      const fullPath = path.join(dir, entry.name);
+      const rel = prefix ? path.join(prefix, entry.name) : entry.name;
+
       if (entry.isDirectory()) {
-        walk(path.join(dir, entry.name), rel);
-      } else {
+        // Skip sub-directories that are standalone git repos
+        if (isGitRepo(fullPath)) continue;
+        walk(fullPath, rel);
+      } else if (entry.isFile()) {
         files.push(rel);
       }
     }
   };
-  walk(memoryDir, 'memory');
-  return files;
-}
-
-export function collectDbFiles(workspace: string): string[] {
-  const files: string[] = [];
-  // Only collect .db files from known tool data directories, not recursively
-  // This prevents grabbing test DBs or unrelated data from project subdirs
-  const knownPaths = [
-    'gogetajob/data/gogetajob.db',
-    'flowforge/flowforge.db',
-    'data/gogetajob.db',
-    'data/flowforge.db',
-  ];
-  for (const rel of knownPaths) {
-    const full = path.join(workspace, rel);
-    if (fs.existsSync(full)) {
-      files.push(rel);
-    }
-  }
-  // Also check workspace root for any .db files
-  try {
-    const rootEntries = fs.readdirSync(workspace, { withFileTypes: true });
-    for (const entry of rootEntries) {
-      if (entry.isFile() && entry.name.endsWith('.db')) {
-        files.push(entry.name);
-      }
-    }
-  } catch {}
+  walk(workspace, '');
   return files;
 }
 
@@ -297,6 +288,35 @@ export function commandExists(cmd: string): boolean {
   }
 }
 
+/**
+ * Install GitHub CLI (gh) automatically.
+ * Supports apt (Debian/Ubuntu) and brew (macOS).
+ */
+export function installGh(): boolean {
+  try {
+    const platform = os.platform();
+    if (platform === 'linux') {
+      // Try apt-based install (Debian/Ubuntu)
+      execSync(
+        '(type -p wget >/dev/null || (sudo apt update && sudo apt-get install wget -y)) && ' +
+        'sudo mkdir -p -m 755 /etc/apt/keyrings && ' +
+        'wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null && ' +
+        'sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && ' +
+        'echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null && ' +
+        'sudo apt update && sudo apt install gh -y',
+        { stdio: 'pipe', timeout: 120000 }
+      );
+    } else if (platform === 'darwin') {
+      execSync('brew install gh', { stdio: 'pipe', timeout: 120000 });
+    } else {
+      return false;
+    }
+    return commandExists('gh');
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Check GitHub CLI auth status.
  * Returns true if authenticated.