@fiodos/cli 0.1.21 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fiodos/cli",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Fiodos CLI — analyzes your app's source code and generates the in-app voice-agent manifest, then wires the orb. Powers `npx @fiodos/cli analyze`.",
   "type": "commonjs",
   "bin": {

package/src/index.js

@@ -85,6 +85,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const readline = require('readline');
 const { loadEnv, loadAppEnv } = require('./loadEnv');
 loadEnv();
 
@@ -161,6 +162,30 @@ function logUser(line) {
   console.log(`${cyan}◉${reset} ${blue}Fiodos${reset} · ${line}`);
 }
 
+/**
+ * Ask the developer to confirm before the analysis runs. `yes` continues; any
+ * other answer (or `no`) cancels instantly — the command ends without analyzing.
+ * Non-interactive runs (no TTY: CI, pipes) proceed automatically so automation
+ * is never blocked waiting on stdin.
+ */
+function askProceed() {
+  return new Promise((resolve) => {
+    if (!process.stdin.isTTY) {
+      resolve(true);
+      return;
+    }
+    const { blue, cyan, reset } = fyodosTermColors();
+    const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+    rl.question(
+      `${cyan}◉${reset} ${blue}Fiodos${reset} · Analyze and publish this project? (yes/no) `,
+      (answer) => {
+        rl.close();
+        resolve(/^(y|yes|s|si|sí)$/i.test((answer || '').trim()));
+      },
+    );
+  });
+}
+
 /** Spinner copy: "website" for web targets, "app" for mobile/native. */
 function surfaceNoun(platform) {
   return platform === 'web' ? 'website' : 'app';
@@ -226,6 +251,14 @@ async function withSpinner(label, work) {
 }
 
 async function main() {
+  // Consent gate: confirm before doing anything. `yes` continues; `no` (or any
+  // other answer) cancels instantly — no analysis is run, the command just ends.
+  const proceed = await askProceed();
+  if (!proceed) {
+    logUser('Cancelled — no analysis was run.');
+    return;
+  }
+
   // Accept an optional leading `analyze` subcommand: `fiodos analyze <dir>`.
   let positionals = positionalArgs();
   if (positionals[0] === 'analyze') positionals = positionals.slice(1);

package/src/wireReactNative.js

@@ -19,8 +19,13 @@
 const fs = require('fs');
 const path = require('path');
 
-const ORB_START = '{/* FYODOS:ORB:START (auto-generated — safe to remove) */}';
-const ORB_END = '{/* FYODOS:ORB:END */}';
+// Markers are JS LINE comments, never JSX `{/* */}` comment-expressions. A
+// `return ( … )` accepts exactly ONE root JSX node, and a `{/* */}` is itself an
+// expression node: placing it as a sibling of the wrapper ("{/* */} <Orb>…")
+// makes the return have multiple roots → "Unexpected token, expected ','".
+// Line comments are pure trivia, valid before/after the single root element.
+const ORB_START = '// FYODOS:ORB:START (auto-generated — safe to remove)';
+const ORB_END = '// FYODOS:ORB:END';
 const IMPORT_START = '// FYODOS:ORB:START (auto-generated — safe to remove)';
 const IMPORT_END = '// FYODOS:ORB:END';
 
@@ -31,6 +36,23 @@ const LAYOUT_CANDIDATES = [
   'src/app/_layout.jsx',
 ];
 
+/**
+ * Last-line defense: NEVER write a layout that won't parse. esbuild is already a
+ * CLI dependency; we use it to validate the generated TSX/JSX. On any doubt we
+ * return false and the caller falls back to the (non-destructive) snippet path.
+ */
+function parsesAsTsx(source, layoutRel) {
+  try {
+    const esbuild = require('esbuild');
+    const loader = layoutRel && layoutRel.endsWith('.jsx') ? 'jsx' : 'tsx';
+    esbuild.transformSync(source, { loader });
+    return true;
+  } catch (e) {
+    if (e && e.code === 'MODULE_NOT_FOUND') return true; // esbuild unavailable → don't block
+    return false;
+  }
+}
+
 function findRootLayout(appRoot) {
   for (const rel of LAYOUT_CANDIDATES) {
     const abs = path.join(appRoot, rel);
@@ -131,6 +153,29 @@ function buildWiredLayout(source, manifestSpecifier) {
   return insertImportsAfterLastImport(withWrap, importBlock);
 }
 
+/**
+ * Strip a previous orb wrap so we can re-wire cleanly. Removes our markers (both
+ * the current line-comment form and the legacy broken JSX-comment form), our
+ * imports, and the single-line FiodosExpoAgent open/close tags — leaving the
+ * user's original tree (possibly over-indented, which is harmless / re-wrapped).
+ */
+function unwireOrb(source) {
+  const drop = (line) => {
+    const t = line.trim();
+    if (/FYODOS:ORB/.test(line)) return true; // `// …` or `{/* … */}` markers
+    if (/^import\s+\{?\s*FiodosExpoAgent\b/.test(t)) return true;
+    if (/^import\s+fyodosManifest\b/.test(t)) return true;
+    if (/^<FiodosExpoAgent\b[^]*>$/.test(t)) return true; // our single-line open tag
+    if (/^<\/FiodosExpoAgent>$/.test(t)) return true;
+    return false;
+  };
+  return source
+    .split('\n')
+    .filter((line) => !drop(line))
+    .join('\n')
+    .replace(/\n{3,}/g, '\n\n');
+}
+
 /** The copy-paste snippet shown when we can't safely auto-wrap. */
 function mountSnippet(manifestSpecifier) {
   return (
@@ -174,8 +219,19 @@ function wireReactNativeOrb(appRoot, { manifest, colors = {}, noWire = false } =
   }
 
   if (source.includes('FiodosExpoAgent') || source.includes('FYODOS:ORB')) {
-    if (!noWire && manifest) writeManifestFile(appRoot, manifest);
-    return { status: 'already', file: layout.rel };
+    // Already wired AND still valid → nothing to do.
+    if (parsesAsTsx(source, layout.rel)) {
+      if (!noWire && manifest) writeManifestFile(appRoot, manifest);
+      return { status: 'already', file: layout.rel };
+    }
+    // A previous CLI version may have left an UNPARSEABLE wrap (e.g. JSX
+    // `{/* */}` markers as siblings of the return root). Self-heal: strip our
+    // own markers/imports and re-wire cleanly below.
+    if (!noWire) {
+      source = unwireOrb(source);
+    } else {
+      return { status: 'skipped', reason: 'no-wire' };
+    }
   }
 
   if (noWire) return { status: 'skipped', reason: 'no-wire' };
@@ -187,6 +243,13 @@ function wireReactNativeOrb(appRoot, { manifest, colors = {}, noWire = false } =
     return { status: 'printed', file: layout.rel, reason: 'unrecognized-layout' };
   }
 
+  // Safety net: if the auto-wrap would produce code that doesn't parse, do NOT
+  // write it. Leave the file untouched and show the manual snippet instead.
+  if (!parsesAsTsx(wired, layout.rel)) {
+    printSnippet(colors, layout.rel, manifestSpecifier, 'auto-wrap would not parse — left untouched');
+    return { status: 'printed', file: layout.rel, reason: 'wrap-unparseable' };
+  }
+
   try {
     fs.writeFileSync(layout.abs, wired);
   } catch (e) {
@@ -210,6 +273,8 @@ module.exports = {
   reportReactNativeWire,
   // exported for tests
   buildWiredLayout,
+  unwireOrb,
+  parsesAsTsx,
   findReturnParenSpan,
   writeManifestFile,
   manifestImportSpecifier,