@fiodos/cli 0.1.29 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fiodos/cli",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "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": {
@@ -21,7 +21,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@fiodos/core": "^0.1.10",
+    "@fiodos/core": "^0.1.13",
     "esbuild": "^0.28.1",
     "jsdom": "^24.0.0",
     "typescript": "^5.6.0"

package/src/collect.js

@@ -80,14 +80,27 @@ function tierFor(rel, platform) {
     if (/^sections\//.test(p)) return 2;
     return 3; // snippets/, config/ (settings_data.json can be huge), rest
   }
+  return tierForApp(p);
+}
+
+function tierForApp(p) {
   if (/^(src\/)?app\//.test(p)) return 0; // expo-router / Next screens
-  if (/(^|\/)(screens?|pages?|views?|routes?|activities|fragments)\//i.test(p)) return 0;
-  if (/(screen|page|view|activity|fragment)\.(dart|kt|swift)$/i.test(p)) return 0;
+  // `sections/` and `panels/` are SCREEN BODIES in shell-based apps (a Shell
+  // page switches between section components): they carry the visible controls
+  // (color pickers, toggles) the analyzer must read to emit their actions.
+  // Ranking them as generic components (tier 3) silently dropped them under
+  // budget pressure and whole screens became invisible to the AI.
+  if (/(^|\/)(screens?|pages?|views?|routes?|sections?|panels?|activities|fragments)\//i.test(p)) return 0;
+  if (/(screen|page|view|activity|fragment|section)\.(dart|kt|swift)$/i.test(p)) return 0;
+  // Central state gets its OWN tier right after screens: the providers/stores
+  // define the setters that make screen controls wire-able actions. Sharing a
+  // tier with the (numerous) service/lib files let alphabetical fill starve
+  // out AppProvider-style files, and the AI had to guess every handler name.
   if (/(^|\/)(state|store|stores|context|contexts|redux|providers?|blocs?|cubits?|viewmodels?)\//i.test(p)) return 1;
   if (/(viewmodel|notifier|bloc|cubit|store|controller)\.(dart|kt|swift)$/i.test(p)) return 1;
-  if (/(^|\/)(services?|api|db|data|domain|agent|handlers?|actions?|lib|utils|repositories|repository|usecases?)\//i.test(p)) return 1;
-  if (/(^|\/)(hooks)\//.test(p)) return 2;
-  return 3; // generic components / ui
+  if (/(^|\/)(services?|api|db|data|domain|agent|handlers?|actions?|lib|utils|repositories|repository|usecases?)\//i.test(p)) return 2;
+  if (/(^|\/)(hooks)\//.test(p)) return 3;
+  return 4; // generic components / ui
 }
 
 function collectFiles(appRoot, { maxInputTokens = 150_000, platform = 'mobile' } = {}) {
@@ -108,7 +121,21 @@ function collectFiles(appRoot, { maxInputTokens = 150_000, platform = 'mobile' }
       if (!codeExt.has(path.extname(entry.name))) continue;
       if (SKIP_FILES.test(rel)) continue;
       if (isNative && SKIP_NATIVE_FILES.test(rel)) continue;
-      const content = fs.readFileSync(full, 'utf8');
+      let content = fs.readFileSync(full, 'utf8');
+      if (platform === 'shopify' && /^locales\//.test(rel.replace(/\\/g, '/'))) {
+        // Theme-editor translations (merchant-facing settings strings), not
+        // storefront language evidence — pure noise for the analysis.
+        if (/\.schema\.json$/.test(rel)) continue;
+        // Non-default storefront locales: what matters is THAT the language is
+        // published (the filename carries the code) — that is the evidence the
+        // MULTILINGUAL rule needs to emit appLanguages/bubblePrompts. Sending
+        // each file whole (tens of KB × dozens of locales) blew the budget and
+        // the alphabetical cut dropped exactly the important ones (en/es
+        // arrived after bg/cs/da…), so the AI saw a "monolingual" store.
+        if (!/\.default\.json$/.test(rel)) {
+          content = '{"__fyodos_note": "published storefront locale (content elided; this language IS offered to shoppers — count it in appLanguages/bubblePrompts)"}';
+        }
+      }
       files.push({ rel, content, tier: tierFor(rel, platform), chars: content.length });
     }
   };
@@ -118,10 +145,48 @@ function collectFiles(appRoot, { maxInputTokens = 150_000, platform = 'mobile' }
   files.sort((a, b) => a.tier - b.tier || a.rel.localeCompare(b.rel));
 
   const budgetChars = maxInputTokens * CHARS_PER_TOKEN;
+
+  // Floor-reserved fill. A pure greedy fill let a fat tier 0 (many large
+  // screen files) consume the WHOLE budget and push out tier 1 entirely —
+  // i.e. the app's central state/providers (AppProvider, stores) vanished
+  // from the analysis, so the AI could not see the setters that make
+  // configuration controls real actions and had to guess every handler name.
+  // Each lower tier gets a guaranteed FLOOR (share of the total budget,
+  // capped at its real demand); screens still get everything left over, and a
+  // final backfill hands unused room to deferred files in tier order.
+  const FLOOR_SHARE = { 1: 0.2, 2: 0.05, 3: 0.02, 4: 0.02 };
+  const demand = new Map();
+  for (const f of files) demand.set(f.tier, (demand.get(f.tier) ?? 0) + f.chars);
+
   const included = [];
-  const omitted = [];
+  const deferred = [];
   let used = 0;
-  for (const f of files) {
+  const tiers = [...demand.keys()].sort((a, b) => a - b);
+  for (const tier of tiers) {
+    // Reserve, for every LOWER-priority tier that still has files, the smaller
+    // of its floor and what it actually needs.
+    let reserved = 0;
+    for (const t of tiers) {
+      if (t <= tier) continue;
+      reserved += Math.min((FLOOR_SHARE[t] ?? 0) * budgetChars, demand.get(t));
+    }
+    const available = budgetChars - used - reserved;
+    let tierUsed = 0;
+    for (const f of files) {
+      if (f.tier !== tier) continue;
+      if (tierUsed + f.chars <= available) {
+        included.push(f);
+        tierUsed += f.chars;
+      } else {
+        deferred.push(f);
+      }
+    }
+    used += tierUsed;
+  }
+  // Backfill: any room the floors did not consume goes back to the deferred
+  // files, highest tier priority first.
+  const omitted = [];
+  for (const f of deferred) {
     if (used + f.chars <= budgetChars) {
       included.push(f);
       used += f.chars;
@@ -129,6 +194,8 @@ function collectFiles(appRoot, { maxInputTokens = 150_000, platform = 'mobile' }
       omitted.push({ rel: f.rel, chars: f.chars, tier: f.tier });
     }
   }
+  // Restore deterministic tier/path order after the backfill.
+  included.sort((a, b) => a.tier - b.tier || a.rel.localeCompare(b.rel));
 
   return {
     included,

package/src/wireHandlers.js

@@ -953,13 +953,20 @@ function buildRegistryModule(plan, opts = {}) {
   // 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(...)).
+  // "is not a function" here means a BRIDGE method whose host screen is not
+  // mounted yet — the SDK executor recognizes FYODOS_HANDLER_UNREADY, walks
+  // the user to the screen that hosts the action and retries automatically.
   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' +
+      '    const msg = err instanceof Error ? err.message : String(err);\n' +
+      "    if (err instanceof TypeError && /is not a function/.test(msg)) {\n" +
+      "      return { success: false, error: 'FYODOS_HANDLER_UNREADY: ' + msg };\n" +
+      '    }\n' +
+      '    return { success: false, error: msg };\n' +
       '  }\n' +
       '}\n'
     : 'async function __fyodosRun(call) {\n' +
@@ -967,7 +974,11 @@ function buildRegistryModule(plan, opts = {}) {
       '    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' +
+      '    const msg = err instanceof Error ? err.message : String(err);\n' +
+      "    if (err instanceof TypeError && /is not a function/.test(msg)) {\n" +
+      "      return { success: false, error: 'FYODOS_HANDLER_UNREADY: ' + msg };\n" +
+      '    }\n' +
+      '    return { success: false, error: msg };\n' +
       '  }\n' +
       '}\n';
 
@@ -1334,9 +1345,14 @@ function stripFiodosBlocks(content) {
   );
 }
 
-/** Insert an import block right after the file's last top-level import line. */
+/** Insert an import block right after the file's last top-level import statement.
+ *  Matches the WHOLE statement through its module string — a per-line regex put
+ *  the block INSIDE multi-line imports (`import {\n  a,\n} from 'x';`), corrupting
+ *  the file (TS1003 "Identifier expected") and failing the wiring of every action
+ *  in that file. `[^'"]*` cannot skip a quote, so the match always stops at the
+ *  first quoted module specifier, then runs to that line's end. */
 function insertImportBlock(content, importBlock) {
-  const importLineRe = /^[ \t]*import\b[^\n]*\n/gm;
+  const importLineRe = /^[ \t]*import\b[^'"]*['"][^'"]+['"][^\n]*\n/gm;
   let lastEnd = -1;
   let m;
   while ((m = importLineRe.exec(content))) lastEnd = m.index + m[0].length;