fix: restore backup.ts and tps.ts to origin/main (conflict marker cleanup)

Author: tps-anvil

packages/cli/bin/tps.ts

@@ -583,7 +583,7 @@ async function main() {
       const validMailActions = ["send", "check", "list", "stats", "log", "read", "watch", "search", "relay", "topic", "subscribe", "unsubscribe", "publish"];
       if (cli.flags.help || !action || !validMailActions.includes(action)) {
         console.log(
-          "Usage:\n  tps mail send <agent> <message>   Send mail to a local or remote agent\n  tps mail check [agent]             Read new messages (marks as read)\n  tps mail watch [agent]             Watch inbox for new messages\n  tps mail list [agent]              List all messages (read + unread) [--lines N]\n  tps mail read <agent> <id>         Show a specific message by ID (prefix ok)\n  tps mail search <query>            Search mail history using full-text search\n  tps mail log [agent]               Show audit log [--since YYYY-MM-DD] [--limit N]\n  tps mail relay [start|stop|status] Mail relay daemon\n  tps mail topic create <name>       Create a topic [--desc \"...\"]\n  tps mail topic list                List all topics\n  tps mail subscribe <topic>         Subscribe to a topic [--id <agentId>] [--from-beginning]\n  tps mail unsubscribe <topic>       Unsubscribe from a topic [--id <agentId>]\n  tps mail publish <topic> <message> Publish to a topic [--from <agentId>]"
+          "Usage:\n  tps mail send <agent> <message>   Send mail to a local or remote agent\n  tps mail check [agent]             Read new messages (marks as read)\n  tps mail watch [agent]             Watch inbox for new messages\n  tps mail list [agent]              List all messages (read + unread)\n  tps mail read <agent> <id>         Show a specific message by ID (prefix ok)\n  tps mail search <query>            Search mail history using full-text search\n  tps mail log [agent]               Show audit log [--since YYYY-MM-DD] [--limit N]\n  tps mail relay [start|stop|status] Mail relay daemon\n  tps mail topic create <name>       Create a topic [--desc \"...\"]\n  tps mail topic list                List all topics\n  tps mail subscribe <topic>         Subscribe to a topic [--id <agentId>] [--from-beginning]\n  tps mail unsubscribe <topic>       Unsubscribe from a topic [--id <agentId>]\n  tps mail publish <topic> <message> Publish to a topic [--from <agentId>]"
         );
         process.exit(cli.flags.help ? 0 : 1);
       }
@@ -634,10 +634,7 @@ async function main() {
           messageId: action === "read" ? rest[2] : undefined,
           json: cli.flags.json,
           since: cli.flags.since,
-          limit:
-            action === "list"
-              ? Number(cli.flags.lines ?? 20)
-              : (cli.flags.limit ? Number(cli.flags.limit) : undefined),
+          limit: cli.flags.limit ? Number(cli.flags.limit) : undefined,
         });
       }
       break;
@@ -683,7 +680,6 @@ async function main() {
       break;
     }
     case "backup": {
-<<<<<<< HEAD
       const subCmd = rest[0];
       if (subCmd === "keys") {
         const { runBackupSecrets } = await import("../src/commands/backup.js");
@@ -692,10 +688,6 @@ async function main() {
         const { runBackup } = await import("../src/commands/backup.js");
         await runBackup({ agentId: subCmd });
       }
-=======
-      const { runBackup } = await import("../src/commands/backup.js");
-      await runBackup({});
->>>>>>> f5544c6 (task complete: bc996f0e-e0c5-435f-afa7-3dda8c11a702)
       break;
     }
     case "restore": {

packages/cli/src/commands/backup.ts

@@ -490,46 +490,22 @@ function backupFilesWithManifest(workspace: string, entry: OpenClawAgent | null,
 }
 
 export async function runBackup(args: BackupArgs): Promise<void> {
-<<<<<<< HEAD
   if (!args.agentId) throw new Error("Usage: tps backup <agent-id>");
   const safeId = sanitizeAgentId(args.agentId);
   const workspace = workspacePath(safeId);
-=======
-  void args;
->>>>>>> f5544c6 (task complete: bc996f0e-e0c5-435f-afa7-3dda8c11a702)
 
-  const home = homedir();
-  const backupDir = join(home, ".tps", "backups");
-  mkdirSync(backupDir, { recursive: true });
-
-  const archivePath = join(backupDir, `backup-${new Date().toISOString().slice(0, 10)}.tar.gz`);
-  const includedFiles = Array.from(new Set([
-    ...globSync(".tps/identity/*.key", { cwd: home }),
-    ...globSync(".tps/secrets/**/*", { cwd: home }),
-    ...globSync(".tps/agents/*/agent.yaml", { cwd: home }),
-    ...globSync(".codex/auth.json", { cwd: home }),
-  ])).filter((relativePath) => {
-    const absolutePath = join(home, relativePath);
-    return existsSync(absolutePath) && lstatSync(absolutePath).isFile();
-  }).sort();
-
-  if (includedFiles.length === 0) {
-    console.log("No TPS backup files found.");
-    return;
+  if (!existsSync(workspace)) {
+    throw new Error(`Workspace not found for ${safeId}`);
   }
 
-  const shellQuote = (value: string): string => `'${value.replace(/'/g, `'\\''`)}'`;
-  const tarArgs = includedFiles.map(shellQuote).join(" ");
-  execSync(`tar czf ${shellQuote(archivePath)} -C ${shellQuote(home)} ${tarArgs}`, {
-    stdio: "pipe",
-  });
-  chmodSync(archivePath, 0o600);
-
-  for (const relativePath of includedFiles) {
-    console.log(relativePath);
+  const configPath = args.configPath ?? resolveConfigPath();
+  let config: OpenClawConfig | null = null;
+  let agentEntry: OpenClawAgent | null = null;
+  if (configPath) {
+    config = readOpenClawConfig(configPath);
+    agentEntry = findOpenClawAgentEntry(config, safeId) ?? null;
   }
 
-<<<<<<< HEAD
   if (!agentEntry) {
     agentEntry = { id: safeId, name: safeId, workspace };
   }
@@ -665,10 +641,6 @@ export async function runBackupSecrets(): Promise<void> {
   console.log(`Archive: ${archivePath} (${statSync(archivePath).size} bytes)`);
 }
 
-=======
-  console.log(`Archive: ${archivePath} (${statSync(archivePath).size} bytes)`);
-}
->>>>>>> f5544c6 (task complete: bc996f0e-e0c5-435f-afa7-3dda8c11a702)
 export async function runRestore(args: RestoreArgs): Promise<void> {
   const safeTarget = sanitizeAgentId(args.agentId);
   const archive = resolve(args.archivePath);