fixup save-script

Author: thymikee

src/daemon/session-store.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import os from 'node:os';
+import path from 'node:path';
 import type { CommandFlags } from '../core/dispatch.ts';
 import type { SessionAction, SessionState } from './types.ts';
 import { inferFillText } from './action-utils.ts';
@@ -47,6 +47,9 @@ export class SessionStore {
     },
   ): void {
     if (entry.flags?.noRecord) return;
+    if (entry.flags?.saveScript) {
+      session.recordSession = true;
+    }
     session.actions.push({
       ts: Date.now(),
       command: entry.command,
@@ -58,25 +61,13 @@ export class SessionStore {
 
   writeSessionLog(session: SessionState): void {
     try {
+      if (!session.recordSession) return;
       if (!fs.existsSync(this.sessionsDir)) fs.mkdirSync(this.sessionsDir, { recursive: true });
       const safeName = session.name.replace(/[^a-zA-Z0-9._-]/g, '_');
       const timestamp = new Date(session.createdAt).toISOString().replace(/[:.]/g, '-');
       const scriptPath = path.join(this.sessionsDir, `${safeName}-${timestamp}.ad`);
-      const filePath = this.resolveSessionJsonPath(session, safeName, timestamp);
-      const payload = {
-        name: session.name,
-        device: session.device,
-        createdAt: session.createdAt,
-        appBundleId: session.appBundleId,
-        actions: session.actions,
-        optimizedActions: this.buildOptimizedActions(session),
-      };
-      const script = formatScript(session, payload.optimizedActions);
+      const script = formatScript(session, this.buildOptimizedActions(session));
       fs.writeFileSync(scriptPath, script);
-      if (session.actions.some((action) => action.flags?.recordJson)) {
-        fs.mkdirSync(path.dirname(filePath), { recursive: true });
-        fs.writeFileSync(filePath, JSON.stringify(payload, null, 2));
-      }
     } catch {
       // ignore
     }
@@ -95,36 +86,6 @@ export class SessionStore {
     return path.resolve(filePath);
   }
 
-  private resolveSessionJsonPath(session: SessionState, safeName: string, timestamp: string): string {
-    const defaultFile = path.join(this.sessionsDir, `${safeName}-${timestamp}.json`);
-    const actionWithOut = [...session.actions].reverse().find(
-      (action) =>
-        action.flags?.recordJson &&
-        typeof action.flags?.out === 'string' &&
-        action.flags.out.trim().length > 0,
-    );
-    if (!actionWithOut || !actionWithOut.flags?.out) {
-      return defaultFile;
-    }
-
-    const rawOut = actionWithOut.flags.out.trim();
-    const resolvedOut = SessionStore.expandHome(rawOut);
-    const wantsDirectory = rawOut.endsWith('/') || rawOut.endsWith('\\');
-    if (wantsDirectory) {
-      return path.join(resolvedOut, `${safeName}-${timestamp}.json`);
-    }
-
-    try {
-      if (fs.existsSync(resolvedOut) && fs.statSync(resolvedOut).isDirectory()) {
-        return path.join(resolvedOut, `${safeName}-${timestamp}.json`);
-      }
-    } catch {
-      return defaultFile;
-    }
-
-    return resolvedOut;
-  }
-
   private buildOptimizedActions(session: SessionState): SessionAction[] {
     const optimized: SessionAction[] = [];
     for (const action of session.actions) {
@@ -205,8 +166,8 @@ function sanitizeFlags(flags: CommandFlags | undefined): SessionAction['flags']
     snapshotRaw,
     snapshotBackend,
     appsMetadata,
+    saveScript,
     noRecord,
-    recordJson,
   } = flags;
   return {
     platform,
@@ -222,8 +183,8 @@ function sanitizeFlags(flags: CommandFlags | undefined): SessionAction['flags']
     snapshotRaw,
     snapshotBackend,
     appsMetadata,
+    saveScript,
     noRecord,
-    recordJson,
   };
 }
 

src/utils/args.ts

@@ -21,8 +21,8 @@ export type ParsedArgs = {
     appsFilter?: 'launchable' | 'user-installed' | 'all';
     appsMetadata?: boolean;
     activity?: string;
+    saveScript?: boolean;
     noRecord?: boolean;
-    recordJson?: boolean;
     replayUpdate?: boolean;
     help: boolean;
   };
@@ -62,8 +62,8 @@ export function parseArgs(argv: string[]): ParsedArgs {
       flags.noRecord = true;
       continue;
     }
-    if (arg === '--record-json') {
-      flags.recordJson = true;
+    if (arg === '--save-script') {
+      flags.saveScript = true;
       continue;
     }
     if (arg === '--update' || arg === '-u') {
@@ -225,8 +225,8 @@ Flags:
   --verbose                                  Stream daemon/runner logs
   --json                                     JSON output
   --no-record                                Do not record this action
-  --record-json                              Record JSON session log
-  --update, -u                               Replay: heal selectors and update replay file in place
+  --save-script                             Save session script (.ad) on close
+  --update, -u                               Replay: update selectors and rewrite replay file in place
   --user-installed                           Apps: list user-installed packages (Android only)
   --all                                      Apps: list all packages (Android only)
 `;