takomi 2.1.39 → 2.1.41

package/plugins/takomi-flow/scripts/lib/commands.mjs

@@ -1,175 +1,192 @@
-import { defaultProfileDir, defaultRunsDir, FLOW_URL, resolvePath } from './paths.mjs';
-import { closeFlowBrowser, launchFlowBrowser } from './browser.mjs';
-import { createRun, baseResult, saveResult } from './result.mjs';
-import { capture, inspectFlowState, openFlow } from './flow-ui.mjs';
-import { launchTrustedChrome } from './trusted-chrome.mjs';
-import * as api from './api.mjs';
-
-export async function handleCommand(command, args) {
-  if (command === 'prepare') return prepare(args);
-  if (command === 'workflow') return printJson(await api.workflow({
-    ...args,
-    outputDir: args['output-dir'],
-    allowSpend: Boolean(args['allow-spend']),
-    extractFrames: args['extract-frames'],
-    sourceAssets: args.assets,
-    allowBrowser: Boolean(args['allow-browser']),
-    profileDir: args['profile-dir'],
-    browserChannel: args['browser-channel'],
-    cdpUrl: args['cdp-url'],
-    submit: Boolean(args.submit),
-  }));
-  if (command === 'template') return template(args);
-  if (command === 'examples') return printJson(api.examples({ name: args.name }));
-  if (command === 'trusted-chrome') return printJson(launchTrustedChrome({
-    profileDir: args['profile-dir'],
-    chromePath: args['chrome-path'],
-    port: args.port,
-    url: args.url,
-    printCommand: Boolean(args['print-command']),
-  }));
-  if (command === 'validate') return printJson(api.validate({ request: args.request }));
-  if (command === 'bootstrap') return bootstrap(args);
-  if (command === 'doctor') return doctor(args);
-  if (command === 'audit') return printJson(await api.audit({
-    profileDir: args['profile-dir'],
-    outputDir: args['output-dir'],
-    limit: args.limit,
-  }));
-  if (command === 'capabilities') return printJson(api.capabilities());
-  if (command === 'plan') return printJson(api.plan({
-    ...args,
-    outputDir: args['output-dir'],
-    allowSpend: Boolean(args['allow-spend']),
-    extractFrames: args['extract-frames'],
-    sourceAssets: args.assets,
-    submit: Boolean(args.submit),
-    targetDir: args['target-dir'],
-  }));
-  if (command === 'observe') return observe(args);
-  if (command === 'smoke') return smoke(args);
-  if (command === 'generate') return printJson(await api.generate({
-    request: args.request,
-    profileDir: args['profile-dir'],
-    browserChannel: args['browser-channel'],
-    cdpUrl: args['cdp-url'],
-    headless: Boolean(args.headless),
-  }));
-  if (command === 'selftest') return printJson(await api.selftest({ outputDir: args['output-dir'] }));
-  if (command === 'inspect') return printJson(api.inspect({ run: args.run }));
-  if (command === 'latest') return printJson(api.latest({ outputDir: args['output-dir'] }));
-  if (command === 'runs') return printJson(api.runs({ outputDir: args['output-dir'], limit: args.limit }));
-  if (command === 'assets') return assets(args);
-  if (command === 'review') return printJson(await api.review({
-    run: args.run,
-    frames: args.frames || 0,
-    reportPath: args['report-path'],
-  }));
-  if (command === 'collect') return printJson(await api.collect({
-    run: args.run,
-    targetDir: args['target-dir'],
-    frames: args.frames || 0,
-    includeFrames: Boolean(args['include-frames']),
-    reportPath: args['report-path'],
-  }));
-  if (command === 'report') return printJson(api.report({
-    run: args.run,
-    outputDir: args['output-dir'],
-    limit: args.limit,
-    reportPath: args['report-path'],
-  }));
-  throw new Error(`Unknown command: ${command}`);
-}
-
-async function observe(cliArgs) {
-  printJson(await api.observe({
-    profileDir: cliArgs['profile-dir'],
-    outputDir: cliArgs['output-dir'],
-    browserChannel: cliArgs['browser-channel'],
-    cdpUrl: cliArgs['cdp-url'],
-    headless: Boolean(cliArgs.headless),
-  }));
-}
-
-async function doctor(cliArgs) {
-  const report = await api.doctor({
-    profileDir: cliArgs['profile-dir'],
-    outputDir: cliArgs['output-dir'],
-  });
-  printJson(report);
-}
-
-async function assets(cliArgs) {
-  printJson(await api.assets({ run: cliArgs.run, frames: cliArgs.frames || 0 }));
-}
-
-async function prepare(cliArgs) {
-  printJson(api.prepare(cliArgs));
-}
-
-function template(cliArgs) {
-  printJson(api.template({ kind: cliArgs.kind, outputDir: cliArgs['output-dir'] }));
-}
-
-async function bootstrap(cliArgs) {
-  const outputDir = resolvePath(cliArgs['output-dir'], defaultRunsDir());
-  const run = createRun({ outputDir }, 'bootstrap');
-  const profileDir = resolvePath(cliArgs['profile-dir'], defaultProfileDir());
-  const result = baseResult('manual_action_required', run, {
-    command: 'bootstrap',
-    flowUrl: FLOW_URL,
-    profileDir,
-    manualActions: ['Log into Google Flow in the opened browser, then close it when finished.'],
-  });
-  const browser = await launchFlowBrowser({
-    profileDir,
-    downloadsDir: run.downloadsDir,
-    browserChannel: cliArgs['browser-channel'],
-    cdpUrl: cliArgs['cdp-url'],
-    headless: Boolean(cliArgs.headless),
-  });
-  try {
-    await openFlow(browser.page);
-    result.screenshots.push(await capture(browser.page, run, 'bootstrap-opened'));
-    Object.assign(result, await inspectFlowState(browser.page));
-    console.log(`[TakomiFlow] Browser opened for login/profile setup: ${FLOW_URL}`);
-    console.log('[TakomiFlow] Close the browser window when login/setup is complete.');
-    if (!browser.attached) await browser.context.waitForEvent('close', { timeout: 30 * 60 * 1000 }).catch(() => {});
-  } finally {
-    await closeFlowBrowser(browser);
-    saveResult(run, result);
-    console.log(`[TakomiFlow] Result: ${result.metadataPath}`);
-  }
-}
-
-async function smoke(cliArgs) {
-  const outputDir = resolvePath(cliArgs['output-dir'], defaultRunsDir());
-  const run = createRun({ outputDir }, 'smoke');
-  const profileDir = resolvePath(cliArgs['profile-dir'], defaultProfileDir());
-  const browser = await launchFlowBrowser({
-    profileDir,
-    downloadsDir: run.downloadsDir,
-    browserChannel: cliArgs['browser-channel'],
-    cdpUrl: cliArgs['cdp-url'],
-    headless: Boolean(cliArgs.headless),
-  });
-  const result = baseResult('ok', run, { command: 'smoke', flowUrl: FLOW_URL, profileDir });
-  try {
-    await openFlow(browser.page);
-    result.screenshots.push(await capture(browser.page, run, 'smoke-flow'));
-    const state = await inspectFlowState(browser.page);
-    Object.assign(result, state);
-    if (state.manualActions.length) result.status = 'manual_action_required';
-  } catch (error) {
-    result.status = 'failed';
-    result.errors.push(error.message);
-  } finally {
-    await closeFlowBrowser(browser);
-    saveResult(run, result);
-    printJson(result);
-  }
-}
-
-function printJson(value) {
-  console.log(JSON.stringify(value, null, 2));
-}
+import { defaultProfileDir, defaultRunsDir, FLOW_URL, resolvePath } from './paths.mjs';
+import { closeFlowBrowser, launchFlowBrowser } from './browser.mjs';
+import { createRun, baseResult, saveResult } from './result.mjs';
+import { capture, inspectFlowState, openFlow } from './flow-ui.mjs';
+import { launchTrustedChrome } from './trusted-chrome.mjs';
+import * as api from './api.mjs';
+
+export async function handleCommand(command, args) {
+  if (command === 'prepare') return prepare(args);
+  if (command === 'workflow') return printJson(await api.workflow({
+    ...args,
+    outputDir: args['output-dir'],
+    allowSpend: booleanArg(args['allow-spend']),
+    extractFrames: args['extract-frames'],
+    sourceAssets: args.assets,
+    allowBrowser: booleanArg(args['allow-browser']),
+    profileDir: args['profile-dir'],
+    browserChannel: args['browser-channel'],
+    cdpUrl: args['cdp-url'],
+    headless: booleanArg(args.headless),
+    submit: booleanArg(args.submit),
+    projectUrl: args['project-url'],
+    reuseCurrentProject: args['reuse-current-project'],
+    allowNewProject: args['allow-new-project'],
+    freshChatOnFailure: args['fresh-chat-on-failure'],
+    editorWaitMs: args['editor-wait-ms'],
+  }));
+  if (command === 'template') return template(args);
+  if (command === 'examples') return printJson(api.examples({ name: args.name }));
+  if (command === 'trusted-chrome') return printJson(launchTrustedChrome({
+    profileDir: args['profile-dir'],
+    chromePath: args['chrome-path'],
+    port: args.port,
+    url: args.url,
+    printCommand: booleanArg(args['print-command']),
+  }));
+  if (command === 'validate') return printJson(api.validate({ request: args.request }));
+  if (command === 'bootstrap') return bootstrap(args);
+  if (command === 'doctor') return doctor(args);
+  if (command === 'audit') return printJson(await api.audit({
+    profileDir: args['profile-dir'],
+    outputDir: args['output-dir'],
+    limit: args.limit,
+  }));
+  if (command === 'capabilities') return printJson(api.capabilities());
+  if (command === 'plan') return printJson(api.plan({
+    ...args,
+    outputDir: args['output-dir'],
+    allowSpend: booleanArg(args['allow-spend']),
+    extractFrames: args['extract-frames'],
+    sourceAssets: args.assets,
+    submit: booleanArg(args.submit),
+    targetDir: args['target-dir'],
+  }));
+  if (command === 'observe') return observe(args);
+  if (command === 'smoke') return smoke(args);
+  if (command === 'generate') return printJson(await api.generate({
+    request: args.request,
+    profileDir: args['profile-dir'],
+    browserChannel: args['browser-channel'],
+    cdpUrl: args['cdp-url'],
+    headless: booleanArg(args.headless),
+    projectUrl: args['project-url'],
+    reuseCurrentProject: args['reuse-current-project'],
+    allowNewProject: args['allow-new-project'],
+    freshChatOnFailure: args['fresh-chat-on-failure'],
+    editorWaitMs: args['editor-wait-ms'],
+  }));
+  if (command === 'selftest') return printJson(await api.selftest({ outputDir: args['output-dir'] }));
+  if (command === 'inspect') return printJson(api.inspect({ run: args.run }));
+  if (command === 'latest') return printJson(api.latest({ outputDir: args['output-dir'] }));
+  if (command === 'runs') return printJson(api.runs({ outputDir: args['output-dir'], limit: args.limit }));
+  if (command === 'assets') return assets(args);
+  if (command === 'review') return printJson(await api.review({
+    run: args.run,
+    frames: args.frames || 0,
+    reportPath: args['report-path'],
+  }));
+  if (command === 'collect') return printJson(await api.collect({
+    run: args.run,
+    targetDir: args['target-dir'],
+    frames: args.frames || 0,
+    includeFrames: booleanArg(args['include-frames']),
+    reportPath: args['report-path'],
+  }));
+  if (command === 'report') return printJson(api.report({
+    run: args.run,
+    outputDir: args['output-dir'],
+    limit: args.limit,
+    reportPath: args['report-path'],
+  }));
+  throw new Error(`Unknown command: ${command}`);
+}
+
+function booleanArg(value) {
+  if (value === undefined || value === null || value === '') return false;
+  if (typeof value === 'boolean') return value;
+  return ['1', 'true', 'yes', 'on'].includes(String(value).toLowerCase());
+}
+
+async function observe(cliArgs) {
+  printJson(await api.observe({
+    profileDir: cliArgs['profile-dir'],
+    outputDir: cliArgs['output-dir'],
+    browserChannel: cliArgs['browser-channel'],
+    cdpUrl: cliArgs['cdp-url'],
+    headless: booleanArg(cliArgs.headless),
+  }));
+}
+
+async function doctor(cliArgs) {
+  const report = await api.doctor({
+    profileDir: cliArgs['profile-dir'],
+    outputDir: cliArgs['output-dir'],
+  });
+  printJson(report);
+}
+
+async function assets(cliArgs) {
+  printJson(await api.assets({ run: cliArgs.run, frames: cliArgs.frames || 0 }));
+}
+
+async function prepare(cliArgs) {
+  printJson(api.prepare(cliArgs));
+}
+
+function template(cliArgs) {
+  printJson(api.template({ kind: cliArgs.kind, outputDir: cliArgs['output-dir'] }));
+}
+
+async function bootstrap(cliArgs) {
+  const outputDir = resolvePath(cliArgs['output-dir'], defaultRunsDir());
+  const run = createRun({ outputDir }, 'bootstrap');
+  const profileDir = resolvePath(cliArgs['profile-dir'], defaultProfileDir());
+  const result = baseResult('manual_action_required', run, {
+    command: 'bootstrap',
+    flowUrl: FLOW_URL,
+    profileDir,
+    manualActions: ['Log into Google Flow in the opened browser, then close it when finished.'],
+  });
+  const browser = await launchFlowBrowser({
+    profileDir,
+    downloadsDir: run.downloadsDir,
+    browserChannel: cliArgs['browser-channel'],
+    cdpUrl: cliArgs['cdp-url'],
+    headless: booleanArg(cliArgs.headless),
+  });
+  try {
+    await openFlow(browser.page);
+    result.screenshots.push(await capture(browser.page, run, 'bootstrap-opened'));
+    Object.assign(result, await inspectFlowState(browser.page));
+    console.log(`[TakomiFlow] Browser opened for login/profile setup: ${FLOW_URL}`);
+    console.log('[TakomiFlow] Close the browser window when login/setup is complete.');
+    if (!browser.attached) await browser.context.waitForEvent('close', { timeout: 30 * 60 * 1000 }).catch(() => {});
+  } finally {
+    await closeFlowBrowser(browser);
+    saveResult(run, result);
+    console.log(`[TakomiFlow] Result: ${result.metadataPath}`);
+  }
+}
+
+async function smoke(cliArgs) {
+  const outputDir = resolvePath(cliArgs['output-dir'], defaultRunsDir());
+  const run = createRun({ outputDir }, 'smoke');
+  const profileDir = resolvePath(cliArgs['profile-dir'], defaultProfileDir());
+  const browser = await launchFlowBrowser({
+    profileDir,
+    downloadsDir: run.downloadsDir,
+    browserChannel: cliArgs['browser-channel'],
+    cdpUrl: cliArgs['cdp-url'],
+    headless: booleanArg(cliArgs.headless),
+  });
+  const result = baseResult('ok', run, { command: 'smoke', flowUrl: FLOW_URL, profileDir });
+  try {
+    await openFlow(browser.page);
+    result.screenshots.push(await capture(browser.page, run, 'smoke-flow'));
+    const state = await inspectFlowState(browser.page);
+    Object.assign(result, state);
+    if (state.manualActions.length) result.status = 'manual_action_required';
+  } catch (error) {
+    result.status = 'failed';
+    result.errors.push(error.message);
+  } finally {
+    await closeFlowBrowser(browser);
+    saveResult(run, result);
+    printJson(result);
+  }
+}
+
+function printJson(value) {
+  console.log(JSON.stringify(value, null, 2));
+}

package/plugins/takomi-flow/scripts/lib/doctor.mjs

@@ -1,77 +1,77 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { defaultProfileDir, defaultRunsDir, ensureDir, FLOW_URL } from './paths.mjs';
-import { loadPlaywright } from './playwright-loader.mjs';
-
-const execFileAsync = promisify(execFile);
-
-export async function runDoctor(options = {}) {
-  const profileDir = path.resolve(options.profileDir || defaultProfileDir());
-  const outputDir = path.resolve(options.outputDir || defaultRunsDir());
-  const checks = [];
-  checks.push({ name: 'node', status: 'ok', version: process.version });
-  checks.push(await checkPlaywright());
-  checks.push(await checkExecutable('ffmpeg', ['-version']));
-  checks.push(await checkExecutable('ffprobe', ['-version']));
-  checks.push(checkPath('profileDir', profileDir, false));
-  checks.push(checkPath('outputDir', outputDir, true));
-  const failed = checks.some(check => check.status === 'failed');
-  return {
-    schemaVersion: 1,
-    status: failed ? 'failed' : 'ok',
-    flowUrl: FLOW_URL,
-    profileDir,
-    outputDir,
-    checks,
-    recommendations: recommendations(checks),
-  };
-}
-
-async function checkPlaywright() {
-  try {
-    await loadPlaywright();
-    return { name: 'playwright', status: 'ok' };
-  } catch (error) {
-    return { name: 'playwright', status: 'failed', message: error.message };
-  }
-}
-
-async function checkExecutable(name, args) {
-  try {
-    const { stdout, stderr } = await execFileAsync(name, args, { timeout: 10000 });
-    const version = `${stdout || stderr}`.split(/\r?\n/).find(Boolean) || '';
-    return { name, status: 'ok', version };
-  } catch (error) {
-    return { name, status: 'warning', message: `${name} is unavailable: ${error.message}` };
-  }
-}
-
-function checkPath(name, targetPath, createIfMissing) {
-  if (fs.existsSync(targetPath)) {
-    return { name, status: 'ok', path: targetPath, exists: true };
-  }
-  if (createIfMissing) {
-    ensureDir(targetPath);
-    return { name, status: 'ok', path: targetPath, exists: true, created: true };
-  }
-  return {
-    name,
-    status: 'warning',
-    path: targetPath,
-    exists: false,
-    message: 'Profile does not exist yet. Run bootstrap to create it and log into Flow.',
-  };
-}
-
-function recommendations(checks) {
-  return checks
-    .filter(check => check.status !== 'ok')
-    .map(check => {
-      if (check.name === 'playwright') return 'Run pnpm install in the TakomiFlow plugin folder.';
-      if (check.name === 'ffmpeg' || check.name === 'ffprobe') return 'Install FFmpeg if media metadata or frame extraction is needed.';
-      if (check.name === 'profileDir') return 'Run bootstrap in headed mode and log into Google Flow manually.';
-      return check.message || `Review ${check.name}.`;
-    });
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { defaultProfileDir, defaultRunsDir, ensureDir, FLOW_URL } from './paths.mjs';
+import { loadPlaywright } from './playwright-loader.mjs';
+
+const execFileAsync = promisify(execFile);
+
+export async function runDoctor(options = {}) {
+  const profileDir = path.resolve(options.profileDir || defaultProfileDir());
+  const outputDir = path.resolve(options.outputDir || defaultRunsDir());
+  const checks = [];
+  checks.push({ name: 'node', status: 'ok', version: process.version });
+  checks.push(await checkPlaywright());
+  checks.push(await checkExecutable('ffmpeg', ['-version']));
+  checks.push(await checkExecutable('ffprobe', ['-version']));
+  checks.push(checkPath('profileDir', profileDir, false));
+  checks.push(checkPath('outputDir', outputDir, true));
+  const failed = checks.some(check => check.status === 'failed');
+  return {
+    schemaVersion: 1,
+    status: failed ? 'failed' : 'ok',
+    flowUrl: FLOW_URL,
+    profileDir,
+    outputDir,
+    checks,
+    recommendations: recommendations(checks),
+  };
+}
+
+async function checkPlaywright() {
+  try {
+    await loadPlaywright();
+    return { name: 'playwright', status: 'ok' };
+  } catch (error) {
+    return { name: 'playwright', status: 'failed', message: error.message };
+  }
+}
+
+async function checkExecutable(name, args) {
+  try {
+    const { stdout, stderr } = await execFileAsync(name, args, { timeout: 10000 });
+    const version = `${stdout || stderr}`.split(/\r?\n/).find(Boolean) || '';
+    return { name, status: 'ok', version };
+  } catch (error) {
+    return { name, status: 'warning', message: `${name} is unavailable: ${error.message}` };
+  }
+}
+
+function checkPath(name, targetPath, createIfMissing) {
+  if (fs.existsSync(targetPath)) {
+    return { name, status: 'ok', path: targetPath, exists: true };
+  }
+  if (createIfMissing) {
+    ensureDir(targetPath);
+    return { name, status: 'ok', path: targetPath, exists: true, created: true };
+  }
+  return {
+    name,
+    status: 'warning',
+    path: targetPath,
+    exists: false,
+    message: 'Profile does not exist yet. Run bootstrap to create it and log into Flow.',
+  };
+}
+
+function recommendations(checks) {
+  return checks
+    .filter(check => check.status !== 'ok')
+    .map(check => {
+      if (check.name === 'playwright') return 'Run pnpm install in the TakomiFlow plugin folder.';
+      if (check.name === 'ffmpeg' || check.name === 'ffprobe') return 'Install FFmpeg if media metadata or frame extraction is needed.';
+      if (check.name === 'profileDir') return 'Run bootstrap in headed mode and log into Google Flow manually.';
+      return check.message || `Review ${check.name}.`;
+    });
+}

package/plugins/takomi-flow/scripts/lib/examples.mjs

@@ -1,17 +1,17 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
-const PLUGIN_ROOT = path.resolve(MODULE_DIR, '..', '..');
-const EXAMPLES_PATH = path.join(PLUGIN_ROOT, 'assets', 'examples.json');
-
-export function loadExamples(name = undefined) {
-  const data = JSON.parse(fs.readFileSync(EXAMPLES_PATH, 'utf8'));
-  if (!name) return data;
-  const example = data.examples.find(item => item.name === name);
-  if (!example) {
-    throw new Error(`Unknown example "${name}". Available: ${data.examples.map(item => item.name).join(', ')}`);
-  }
-  return { schemaVersion: data.schemaVersion, example };
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
+const PLUGIN_ROOT = path.resolve(MODULE_DIR, '..', '..');
+const EXAMPLES_PATH = path.join(PLUGIN_ROOT, 'assets', 'examples.json');
+
+export function loadExamples(name = undefined) {
+  const data = JSON.parse(fs.readFileSync(EXAMPLES_PATH, 'utf8'));
+  if (!name) return data;
+  const example = data.examples.find(item => item.name === name);
+  if (!example) {
+    throw new Error(`Unknown example "${name}". Available: ${data.examples.map(item => item.name).join(', ')}`);
+  }
+  return { schemaVersion: data.schemaVersion, example };
+}

package/plugins/takomi-flow/scripts/lib/flow-media.mjs

@@ -0,0 +1,39 @@
+export async function listMediaIds(page) {
+  const ids = await page.locator('img[src*="media.getMediaUrlRedirect"], video[src*="media.getMediaUrlRedirect"]').evaluateAll(items => (
+    items.map(item => mediaIdFromUrl(item.getAttribute('src') || item.src || '')).filter(Boolean)
+  )).catch(() => []);
+  return [...new Set(ids)];
+}
+
+export async function newMediaIds(page, baselineIds = []) {
+  const baseline = new Set(baselineIds);
+  return (await listMediaIds(page)).filter(id => !baseline.has(id));
+}
+
+export async function openGeneratedMediaById(page, mediaId) {
+  if (!mediaId) return false;
+  const candidates = [
+    page.locator(`img[src*="${mediaId}"]`).first(),
+    page.locator(`video[src*="${mediaId}"]`).first(),
+  ];
+  for (const locator of candidates) {
+    if (!(await locator.count().catch(() => 0))) continue;
+    try {
+      await locator.scrollIntoViewIfNeeded().catch(() => {});
+      await locator.click({ timeout: 10000, force: true });
+      await page.waitForTimeout(3000);
+      return true;
+    } catch {}
+  }
+  return false;
+}
+
+function mediaIdFromUrl(value) {
+  try {
+    const url = new URL(value, 'https://labs.google');
+    return url.searchParams.get('name');
+  } catch {
+    const match = /[?&]name=([^&]+)/.exec(value);
+    return match ? decodeURIComponent(match[1]) : null;
+  }
+}