@fiodos/cli 0.1.22 → 0.1.25

package/src/wireHandlers.js

@@ -49,7 +49,10 @@ const REGISTRY_EXPORT = 'fyodosGeneratedRegistries';
 const GENERATED_MARKER = 'GENERATED by Fiodos — handler wiring';
 // Markers wrapping every line Fiodos inserts INTO the user's own files, so the
 // edits are idempotent (re-runs strip+rewrite) and trivially reversible.
-const EDIT_START = '// FYODOS:BRIDGE:START (auto-generado por Fiodos — seguro de eliminar)';
+// The strip regex matches any text after START so blocks written by older CLI
+// versions (which localized the parenthetical) are still cleaned on re-runs.
+const EDIT_START_PREFIX = '// FYODOS:BRIDGE:START';
+const EDIT_START = `${EDIT_START_PREFIX} (generated by Fiodos — safe to remove)`;
 const EDIT_END = '// FYODOS:BRIDGE:END';
 
 // Directives that make OUR generated files (handlers.generated, bridge) invisible
@@ -449,7 +452,7 @@ function buildAiEntry({ appRoot, fyodosDirRel, base, aiW, manifestParams }) {
   for (const id of freeIdentifiers(call)) {
     if (JS_KEYWORDS.has(id) || importedNames.has(id) || SAFE_GLOBALS.has(id) || locals.has(id)) continue;
     return {
-      reason: `the AI's expression references '${id}', which is neither imported nor a known global/local variable; not wired to avoid calling something that doesn't exist`,
+      reason: `the proposed call references '${id}', which could not be verified in your code — wire this action manually`,
     };
   }
 
@@ -491,14 +494,14 @@ function buildAiBridgeEntry({ appRoot, fyodosDirRel, base, aiW }) {
   if (!anchor) return { reason: `the AI did not provide an insertion anchor in '${file}'` };
 
   const occ = countOccurrences(content, anchor);
-  if (occ === 0) return { reason: `the insertion anchor does not appear in '${file}'; cannot place the bridge safely` };
-  if (occ > 1) return { reason: `the insertion anchor appears ${occ} times in '${file}'; it is ambiguous, not inserted blindly` };
+  if (occ === 0) return { reason: `no safe insertion point was found in '${file}' — wire this action manually` };
+  if (occ > 1) return { reason: `the insertion point in '${file}' is ambiguous — wire this action manually` };
 
   // requiredSymbols must really exist.
   const required = Array.isArray(aiW.requiredSymbols) ? aiW.requiredSymbols : [];
   for (const r of required) {
     if (!fileHasSymbol(appRoot, r && r.file, r && r.name)) {
-      return { reason: `the verifier did not find symbol '${r && r.name}' in '${normRel(r && r.file)}' (bridge not verifiable)` };
+      return { reason: `symbol '${r && r.name}' was not found in '${normRel(r && r.file)}' — wire this action manually` };
     }
   }
 
@@ -534,7 +537,7 @@ function buildAiBridgeEntry({ appRoot, fyodosDirRel, base, aiW }) {
     if (id === 'args' || JS_KEYWORDS.has(id) || SAFE_GLOBALS.has(id) || locals.has(id) || importedNames.has(id)) continue;
     if (fileHasSymbol(appRoot, file, id)) continue;
     return {
-      reason: `the bridge references '${id}', which is not in the component '${file}' scope and is not imported; not wired to avoid breaking the code`,
+      reason: `references '${id}', which is not available in '${file}' — wire this action manually`,
     };
   }
 
@@ -582,9 +585,7 @@ function buildMechanicalEntry({ appRoot, fyodosDirRel, base, manifestParams }) {
   const store = exported ? null : findStoreMethod(content, handler);
   if (!exported && !store) {
     return {
-      reason:
-        `'${handler}' was not found as an exported function or a store method in '${evFile}'. ` +
-        'It may live in a component, a class or a hook/context. Not wired blindly.',
+      reason: `'${handler}' in '${evFile}' could not be reached safely from a generated module — wire it manually`,
     };
   }
 
@@ -740,36 +741,82 @@ function buildRegistryModule(plan, opts = {}) {
   // ActionRegistries so `<FiodosAgent registries={...}/>` type-checks. In
   // particular idempotencyCheckers must match IdempotencyChecker —
   // `(context) => Promise<{ alreadyApplied; message? }>` — not a boolean.
+  // Handlers accept the engine's optional (context, intent) trailing args so a
+  // handler shared by several manifest actions can dispatch on the intent.
   const typeDefs = ts
     ? 'type FiodosActionResult = { success: boolean; data?: Record<string, unknown>; error?: string };\n' +
       'type FiodosRegistries = {\n' +
-      '  handlers: Record<string, (params: Record<string, any>) => Promise<FiodosActionResult>>;\n' +
+      '  handlers: Record<string, (params: Record<string, any>, context?: Record<string, any>, intent?: string) => Promise<FiodosActionResult>>;\n' +
       '  idempotencyCheckers: Record<string, (context: Record<string, any>) => Promise<{ alreadyApplied: boolean; message?: string }>>;\n' +
       '};\n'
     : '';
   const resultType = ts ? ': Promise<FiodosActionResult>' : '';
   const paramsType = ts ? ': Record<string, any>' : '';
+  const intentType = ts ? ': string | undefined' : '';
+
+  // Shared runner: one place normalizes any wired call into an action result,
+  // so each handler below stays a one-liner. `unknown` keeps the truthiness
+  // test legal even when the wired call returns void (e.g. db.delete(...)).
+  const runHelper = ts
+    ? 'async function __fyodosRun(call: () => unknown): Promise<FiodosActionResult> {\n' +
+      '  try {\n' +
+      '    const result: unknown = await Promise.resolve(call());\n' +
+      "    return { success: true, data: (result && typeof result === 'object') ? result as Record<string, unknown> : { result } };\n" +
+      '  } catch (err) {\n' +
+      '    return { success: false, error: err instanceof Error ? err.message : String(err) };\n' +
+      '  }\n' +
+      '}\n'
+    : 'async function __fyodosRun(call) {\n' +
+      '  try {\n' +
+      '    const result = await Promise.resolve(call());\n' +
+      "    return { success: true, data: (result && typeof result === 'object') ? result : { result } };\n" +
+      '  } catch (err) {\n' +
+      '    return { success: false, error: err instanceof Error ? err.message : String(err) };\n' +
+      '  }\n' +
+      '}\n';
+
+  const entryTakesParams = (e) =>
+    e.usesParams != null ? e.usesParams : /\bparams\b/.test(e.callExpr);
+
+  // Group auto entries by handler name: several manifest actions may share one
+  // handler (e.g. three section jumps calling scrollToSection with different
+  // arguments). An object literal keeps only the LAST duplicate key, which
+  // would silently break the others — so shared handlers dispatch on the
+  // intent the engine passes as the third argument instead.
+  const byHandler = new Map();
+  for (const e of plan.auto) {
+    if (!byHandler.has(e.handler)) byHandler.set(e.handler, []);
+    byHandler.get(e.handler).push(e);
+  }
 
-  const handlerBlocks = plan.auto.map((e) => {
-    const takesParams = e.usesParams != null ? e.usesParams : /\bparams\b/.test(e.callExpr);
+  const handlerBlocks = [];
+  for (const [handlerName, group] of byHandler) {
+    const distinctCalls = new Set(group.map((e) => e.callExpr));
+    if (group.length === 1 || distinctCalls.size === 1) {
+      const e = group[0];
+      const arg = entryTakesParams(e) ? `params${paramsType}` : `_params${paramsType}`;
+      handlerBlocks.push(
+        `    ${handlerName}: async (${arg})${resultType} => __fyodosRun(() => ${e.callExpr}),`,
+      );
+      continue;
+    }
+    const takesParams = group.some(entryTakesParams);
     const arg = takesParams ? `params${paramsType}` : `_params${paramsType}`;
-    // `: unknown` lets the truthiness test below be legal even when the wired
-    // call returns void (e.g. db.delete(...)) — otherwise TS errors on `result &&`.
-    const resultDecl = ts ? 'const result: unknown' : 'const result';
-    return (
-      `    ${e.handler}: async (${arg})${resultType} => {\n` +
-      `      try {\n` +
-      `        ${resultDecl} = await Promise.resolve(${e.callExpr});\n` +
-      `        return { success: true, data: (result && typeof result === 'object') ? result as Record<string, unknown> : { result } };\n` +
-      `      } catch (err) {\n` +
-      `        return { success: false, error: err instanceof Error ? err.message : String(err) };\n` +
+    const cases = group
+      .slice(1)
+      .map((e) => `        case ${JSON.stringify(e.intent)}: return __fyodosRun(() => ${e.callExpr});`)
+      .join('\n');
+    handlerBlocks.push(
+      `    ${handlerName}: async (${arg}, _context${ts ? ': Record<string, any> | undefined' : ''}, intent${intentType})${resultType} => {\n` +
+      `      switch (intent) {\n` +
+      `${cases}\n` +
+      `        default: return __fyodosRun(() => ${group[0].callExpr});\n` +
       `      }\n` +
-      `    },`
+      `    },`,
     );
-  });
+  }
 
-  // Plain-JS variant: drop the `as` cast.
-  const handlerText = (ts ? handlerBlocks.join('\n') : handlerBlocks.join('\n').replace(/ as Record<string, unknown>/g, ''));
+  const handlerText = handlerBlocks.join('\n');
 
   // List each handler that needs manual wiring once. Skip any handler already
   // auto-wired above (the same handler name can back both an auto-wired and a
@@ -794,6 +841,7 @@ function buildRegistryModule(plan, opts = {}) {
     `${header}\n` +
     `${importLines.join('\n')}\n\n` +
     (typeDefs ? `${typeDefs}\n` : '') +
+    `${runHelper}\n` +
     `${decl}\n` +
     `  handlers: {\n` +
     `${handlerText}\n` +
@@ -955,7 +1003,7 @@ function confLabel(e) {
 function buildHandlerDoc(plan, ctx = {}) {
   const {
     appName = 'your app', framework = 'web', registryRel = '', mountSnippet = '',
-    bridgeRel = '', edits = [],
+    bridgeRel = '', edits = [], verification = [],
   } = ctx;
   const review = plan.review || plan.manual || [];
   const bridgeEntries = plan.auto.filter((e) => e.kind === 'bridge');
@@ -993,6 +1041,17 @@ function buildHandlerDoc(plan, ctx = {}) {
   L.push('```');
   L.push('');
 
+  if (verification.length) {
+    L.push('## Automatic verification');
+    L.push('');
+    L.push('Every action below was verified in your project before being written; anything that could not be verified was left for manual wiring instead of being installed broken.');
+    L.push('');
+    for (const v of verification) {
+      L.push(`- \`${v.intent}\`: ${v.status === 'ready' ? 'verified and wired' : 'could not be verified — see manual wiring below'}`);
+    }
+    L.push('');
+  }
+
   if (plan.auto.length) {
     L.push(`## Wired automatically (${plan.auto.length})`);
     L.push('');
@@ -1021,13 +1080,18 @@ function buildHandlerDoc(plan, ctx = {}) {
     L.push('| Action | Handler | Reason |');
     L.push('| --- | --- | --- |');
     for (const e of review) {
-      // Keep the reason to a clean one-liner: collapse whitespace, drop the
-      // npm/compiler dump after the first `|`, and cap length (no leaked paths).
-      const reason = String(e.reason || '')
+      // Keep the reason to a clean one-liner: collapse whitespace and drop the
+      // npm/compiler dump after the first `|` (no leaked paths). When capping
+      // the length, cut at a word boundary and mark the cut with an ellipsis.
+      let reason = String(e.reason || '')
         .split('|')[0]
         .replace(/\s+/g, ' ')
-        .trim()
-        .slice(0, 160);
+        .trim();
+      if (reason.length > 160) {
+        const cut = reason.slice(0, 160);
+        const atWord = cut.lastIndexOf(' ');
+        reason = `${(atWord > 100 ? cut.slice(0, atWord) : cut).trimEnd()}…`;
+      }
       L.push(`| \`${e.intent}\` | \`${e.handler}\` | ${reason} |`);
     }
     L.push('');
@@ -1049,7 +1113,7 @@ function buildHandlerDoc(plan, ctx = {}) {
 
 /** Remove any previously-inserted Fiodos blocks (idempotence across re-runs). */
 function stripFiodosBlocks(content) {
-  const re = new RegExp(`\\n?${esc(EDIT_START)}[\\s\\S]*?${esc(EDIT_END)}\\n?`, 'g');
+  const re = new RegExp(`\\n?${esc(EDIT_START_PREFIX)}[^\\n]*[\\s\\S]*?${esc(EDIT_END)}\\n?`, 'g');
   return content.replace(re, '\n');
 }
 
@@ -1436,7 +1500,7 @@ async function wireHandlers(appRoot, opts = {}) {
     `import { ${REGISTRY_EXPORT} } from '${registryImport}';\n` +
     `\n` +
     `<FiodosAgent\n` +
-    `  apiKey={/* tu API key */}\n` +
+    `  apiKey={/* your API key */}\n` +
     `  registries={${REGISTRY_EXPORT}}\n` +
     `/>`;
 
@@ -1790,4 +1854,26 @@ module.exports = {
   findExportedFunction,
   findStoreMethod,
   mapParams,
+  // shared with wireSession (same verification + injection machinery)
+  fileHasSymbol,
+  freeIdentifiers,
+  declaredLocals,
+  detachedInstanceReceiver,
+  countOccurrences,
+  readFileSafe,
+  normRel,
+  relImport,
+  detectTsEsm,
+  resolveFiodosDirRel,
+  askYesNo,
+  JS_KEYWORDS,
+  SAFE_GLOBALS,
+  GENERATED_FILE_DIRECTIVES,
+  INJECT_ESLINT_DISABLE,
+  INJECT_ESLINT_ENABLE,
+  EDIT_START,
+  EDIT_END,
+  BRIDGE_BASENAME,
+  insertImportBlock,
+  insertRegisterBlock,
 };

package/src/wireReactNative.js

@@ -165,6 +165,7 @@ function unwireOrb(source) {
     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 (/^import\s+\{\s*fyodosIsAuthenticated\b/.test(t)) return true; // session pass import
     if (/^<FiodosExpoAgent\b[^]*>$/.test(t)) return true; // our single-line open tag
     if (/^<\/FiodosExpoAgent>$/.test(t)) return true;
     return false;
@@ -258,6 +259,56 @@ function wireReactNativeOrb(appRoot, { manifest, colors = {}, noWire = false } =
   return { status: 'added', file: layout.rel };
 }
 
+/**
+ * Connect the generated SESSION module to the wired <FiodosExpoAgent> tag:
+ * adds `isAuthenticated={fyodosIsAuthenticated}` and `getUserId={fyodosGetUserId}`
+ * plus the import. Mirrors the web mount session pass. Idempotent; never
+ * overrides a developer-wired isAuthenticated; validated with the same parse
+ * safety net as the orb wrap.
+ */
+function connectRnSession(appRoot, { sessionFileAbs, colors = {} } = {}) {
+  if (!sessionFileAbs || !fs.existsSync(sessionFileAbs)) return { status: 'no-session-file' };
+  const layout = findRootLayout(appRoot);
+  if (!layout) return { status: 'not-mounted' };
+
+  let source;
+  try {
+    source = fs.readFileSync(layout.abs, 'utf8');
+  } catch (e) {
+    return { status: 'skipped', reason: `read-failed: ${e.message}` };
+  }
+  const tagRe = /<FiodosExpoAgent\b[^>]*>/;
+  const m = source.match(tagRe);
+  if (!m) return { status: 'not-mounted' };
+  const tag = m[0];
+  if (/isAuthenticated=\{fyodosIsAuthenticated\}/.test(tag)) return { status: 'already', file: layout.rel };
+  if (/\bisAuthenticated=/.test(tag)) return { status: 'dev-wired', file: layout.rel };
+
+  let specifier = path.relative(path.dirname(layout.abs), sessionFileAbs).split(path.sep).join('/');
+  specifier = specifier.replace(/\.(tsx?|jsx?)$/, '');
+  if (!specifier.startsWith('.')) specifier = `./${specifier}`;
+
+  const newTag = tag.replace(
+    />$/,
+    ' isAuthenticated={fyodosIsAuthenticated} getUserId={fyodosGetUserId}>',
+  );
+  let next = source.replace(tag, newTag);
+  const importLine = `import { fyodosIsAuthenticated, fyodosGetUserId } from '${specifier}';`;
+  if (!next.includes(importLine)) {
+    next = insertImportsAfterLastImport(next, importLine);
+  }
+
+  if (!parsesAsTsx(next, layout.rel)) {
+    return { status: 'skipped', file: layout.rel, reason: 'session props would not parse — left untouched' };
+  }
+  try {
+    fs.writeFileSync(layout.abs, next);
+  } catch (e) {
+    return { status: 'skipped', reason: `write-failed: ${e.message}` };
+  }
+  return { status: 'connected', file: layout.rel };
+}
+
 function reportReactNativeWire(result, colors = {}, { quiet = false } = {}) {
   const { blue, cyan, dim, reset } = colors;
   if (!result) return;
@@ -271,6 +322,7 @@ function reportReactNativeWire(result, colors = {}, { quiet = false } = {}) {
 module.exports = {
   wireReactNativeOrb,
   reportReactNativeWire,
+  connectRnSession,
   // exported for tests
   buildWiredLayout,
   unwireOrb,