@codeyam/codeyam-cli 0.1.0-staging.eb21b2f → 0.1.0-staging.fef152f

package/codeyam-cli/src/webserver/build/server/index.js

@@ -1 +1 @@
-import{Y as H,Z as I,M as J,N as K,W as L,O as _,R as $,T as rr,V as tr,U as or,X as ir,Q as pr}from"./assets/server-build-BSvme_Ao.js";import"react/jsx-runtime";import"node:stream";import"@react-router/node";import"react-router";import"isbot";import"react-dom/server";import"react";import"lucide-react";import"fetch-retry";import"better-sqlite3";import"pg";import"fs";import"path";import"kysely";import"kysely/helpers/sqlite";import"kysely/helpers/postgres";import"typescript";import"fs/promises";import"os";import"prompts";import"chalk";import"crypto";import"child_process";import"url";import"util";import"dotenv";import"events";import"uuid";import"openai";import"p-queue";import"p-retry";import"@aws-sdk/client-dynamodb";import"lru-cache";import"pluralize";import"piscina";import"json5";import"@aws-sdk/util-dynamodb";import"v8";import"react-syntax-highlighter";import"react-syntax-highlighter/dist/cjs/styles/prism/index.js";import"node:crypto";import"minimatch";import"react-markdown";import"remark-gfm";import"react-diff-viewer-continued";export{H as allowedActionOrigins,I as assets,J as assetsBuildDirectory,K as basename,L as entry,_ as future,$ as isSpaMode,rr as prerender,tr as publicPath,or as routeDiscovery,ir as routes,pr as ssr};
+import{Y as H,Z as I,M as J,N as K,W as L,O as _,R as $,T as rr,V as tr,U as or,X as ir,Q as pr}from"./assets/server-build-DyvoFrHR.js";import"react/jsx-runtime";import"node:stream";import"@react-router/node";import"react-router";import"isbot";import"react-dom/server";import"react";import"lucide-react";import"fetch-retry";import"better-sqlite3";import"pg";import"fs";import"path";import"kysely";import"kysely/helpers/sqlite";import"kysely/helpers/postgres";import"typescript";import"fs/promises";import"os";import"prompts";import"chalk";import"crypto";import"child_process";import"url";import"util";import"dotenv";import"events";import"uuid";import"openai";import"p-queue";import"p-retry";import"@aws-sdk/client-dynamodb";import"lru-cache";import"pluralize";import"piscina";import"json5";import"@aws-sdk/util-dynamodb";import"v8";import"react-syntax-highlighter";import"react-syntax-highlighter/dist/cjs/styles/prism/index.js";import"node:crypto";import"minimatch";import"react-markdown";import"remark-gfm";import"react-diff-viewer-continued";export{H as allowedActionOrigins,I as assets,J as assetsBuildDirectory,K as basename,L as entry,_ as future,$ as isSpaMode,rr as prerender,tr as publicPath,or as routeDiscovery,ir as routes,pr as ssr};

package/codeyam-cli/src/webserver/build-info.json

@@ -1,7 +1,7 @@
 {
-  "buildTimestamp": "2026-02-14T10:09:27.718Z",
-  "buildTime": 1771063767718,
-  "buildNumber": 645,
-  "semanticVersion": "0.1.645",
-  "version": "0.1.645 (2026-02-14T10:09)"
+  "buildTimestamp": "2026-02-20T14:12:02.037Z",
+  "buildTime": 1771596722037,
+  "buildNumber": 662,
+  "semanticVersion": "0.1.662",
+  "version": "0.1.662 (2026-02-20T14:12)"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeyam/codeyam-cli",
-  "version": "0.1.0-staging.eb21b2f",
+  "version": "0.1.0-staging.fef152f",
   "description": "Local development CLI for CodeYam analysis",
   "type": "module",
   "bin": {
@@ -12,9 +12,9 @@
   "dependencies": {
     "@anthropic-ai/claude-code": "^2.1.7",
     "@anthropic-ai/sdk": "^0.74.0",
-    "@aws-sdk/client-dynamodb": "^3.956.0",
-    "@aws-sdk/s3-request-presigner": "^3.940.0",
-    "@aws-sdk/util-dynamodb": "^3.971.0",
+    "@aws-sdk/client-dynamodb": "^3.990.0",
+    "@aws-sdk/s3-request-presigner": "^3.990.0",
+    "@aws-sdk/util-dynamodb": "^3.990.0",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "@octokit/auth-app": "^8.1.0",
     "@octokit/request": "^10.0.3",
@@ -33,7 +33,7 @@
     "express": "^5.2.1",
     "fetch-retry": "^6.0.0",
     "get-port": "^7.1.0",
-    "htmlparser2": "^10.0.0",
+    "htmlparser2": "^10.1.0",
     "isbot": "^4",
     "jsdom": "^27.4.0",
     "json5": "^2.2.3",

package/packages/ai/src/lib/dataStructure/ScopeDataStructure.js

@@ -2306,6 +2306,21 @@ export class ScopeDataStructure {
      * ensure all sub-paths of that variable are reflected under signature[N].
      */
     propagateParameterToSignaturePaths(scopeNode) {
+        // Helper: check if a type is a concrete scalar that cannot have sub-properties.
+        const SCALAR_TYPES = new Set([
+            'string',
+            'number',
+            'boolean',
+            'bigint',
+            'symbol',
+            'void',
+            'never',
+        ]);
+        const isDefinitelyScalar = (type) => {
+            const parts = type.split('|').map((s) => s.trim());
+            const base = parts.filter((s) => s !== 'undefined' && s !== 'null');
+            return base.length > 0 && base.every((b) => SCALAR_TYPES.has(b));
+        };
         // Find variable → signature[N] equivalencies
         for (const [varName, equivalencies] of Object.entries(scopeNode.equivalencies)) {
             // Only process simple variable names (no dots, brackets, or parens)
@@ -2327,7 +2342,37 @@ export class ScopeDataStructure {
                             const sigKey = signaturePath + suffix;
                             // Only add if the signature path doesn't already exist
                             if (!scopeNode.schema[sigKey]) {
-                                scopeNode.schema[sigKey] = scopeNode.schema[key];
+                                // Check if this path represents variable conflation:
+                                // When a standalone variable (e.g., showWorkoutForm from useState)
+                                // appears as a sub-property of a scalar-typed ancestor (e.g.,
+                                // activity_type = "string"), it's from scope conflation, not real
+                                // property access. Block these while allowing legitimate built-in
+                                // accesses like string.length or string.slice.
+                                let isConflatedPath = false;
+                                let checkPos = signaturePath.length;
+                                while (true) {
+                                    checkPos = sigKey.indexOf('.', checkPos + 1);
+                                    if (checkPos === -1)
+                                        break;
+                                    const ancestorPath = sigKey.substring(0, checkPos);
+                                    const ancestorType = scopeNode.schema[ancestorPath];
+                                    if (ancestorType && isDefinitelyScalar(ancestorType)) {
+                                        // Ancestor is scalar — check if the immediate sub-property
+                                        // is also a standalone variable (indicating conflation)
+                                        const afterDot = sigKey.substring(checkPos + 1);
+                                        const nextSep = afterDot.search(/[.\[]/);
+                                        const subPropName = nextSep === -1
+                                            ? afterDot
+                                            : afterDot.substring(0, nextSep);
+                                        if (scopeNode.schema[subPropName] !== undefined) {
+                                            isConflatedPath = true;
+                                            break;
+                                        }
+                                    }
+                                }
+                                if (!isConflatedPath) {
+                                    scopeNode.schema[sigKey] = scopeNode.schema[key];
+                                }
                             }
                         }
                     }
@@ -2900,6 +2945,23 @@ export class ScopeDataStructure {
                 }
             }
         }
+        // Helper: check if a type is a concrete scalar that cannot have sub-properties.
+        // e.g., "string", "number | undefined", "boolean | null" are scalar.
+        // "object", "array", "function", "unknown", "Workout", etc. are NOT scalar.
+        const SCALAR_TYPES = new Set([
+            'string',
+            'number',
+            'boolean',
+            'bigint',
+            'symbol',
+            'void',
+            'never',
+        ]);
+        const isDefinitelyScalarType = (type) => {
+            const parts = type.split('|').map((s) => s.trim());
+            const base = parts.filter((s) => s !== 'undefined' && s !== 'null');
+            return base.length > 0 && base.every((b) => SCALAR_TYPES.has(b));
+        };
         // Propagate nested paths from variables to their signature equivalents
         // e.g., if workouts = signature[0].workouts, then workouts[].title becomes
         // signature[0].workouts[].title
@@ -2919,7 +2981,67 @@ export class ScopeDataStructure {
                     const signatureKey = signaturePath + suffix;
                     // Add to schema if not already present
                     if (!tempScopeNode.schema[signatureKey]) {
-                        tempScopeNode.schema[signatureKey] = schema[schemaKey];
+                        // Check if this path represents variable conflation:
+                        // When a standalone variable (e.g., showWorkoutForm from useState)
+                        // appears as a sub-property of a scalar-typed ancestor (e.g.,
+                        // activity_type = "string"), it's from scope conflation, not real
+                        // property access. Block these while allowing legitimate built-in
+                        // accesses like string.length or string.slice.
+                        let isConflatedPath = false;
+                        let checkPos = signaturePath.length;
+                        while (true) {
+                            checkPos = signatureKey.indexOf('.', checkPos + 1);
+                            if (checkPos === -1)
+                                break;
+                            const ancestorPath = signatureKey.substring(0, checkPos);
+                            const ancestorType = tempScopeNode.schema[ancestorPath];
+                            if (ancestorType && isDefinitelyScalarType(ancestorType)) {
+                                // Ancestor is scalar — check if the immediate sub-property
+                                // is also a standalone variable (indicating conflation)
+                                const afterDot = signatureKey.substring(checkPos + 1);
+                                const nextSep = afterDot.search(/[.\[]/);
+                                const subPropName = nextSep === -1 ? afterDot : afterDot.substring(0, nextSep);
+                                if (schema[subPropName] !== undefined) {
+                                    isConflatedPath = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!isConflatedPath) {
+                            tempScopeNode.schema[signatureKey] = schema[schemaKey];
+                        }
+                    }
+                }
+            }
+        }
+        // Post-process: filter out conflated signature paths.
+        // During phase 2 scope analysis, useState(false) conflation can create
+        // bad paths like signature[0].mockWorkouts[].activity_type.showWorkoutForm
+        // directly in scopeNode.schema. These flow through signatureInSchema into
+        // tempScopeNode.schema without any guard. Filter them out here by checking:
+        //   1. An ancestor in the path has a concrete scalar type (string, number, boolean, etc.)
+        //   2. The immediate sub-property of that scalar ancestor is also a standalone
+        //      variable in the schema (indicating conflation, not a real property access)
+        for (const key of Object.keys(tempScopeNode.schema)) {
+            if (!key.startsWith('signature['))
+                continue;
+            // Walk through the path looking for scalar-typed ancestors
+            let pos = 0;
+            while (true) {
+                pos = key.indexOf('.', pos + 1);
+                if (pos === -1)
+                    break;
+                const ancestorPath = key.substring(0, pos);
+                const ancestorType = tempScopeNode.schema[ancestorPath];
+                if (ancestorType && isDefinitelyScalarType(ancestorType)) {
+                    // Found a scalar ancestor — check if the sub-property name
+                    // is a standalone variable in the getSchema() result
+                    const afterDot = key.substring(pos + 1);
+                    const nextSep = afterDot.search(/[.\[]/);
+                    const subPropName = nextSep === -1 ? afterDot : afterDot.substring(0, nextSep);
+                    if (schema[subPropName] !== undefined) {
+                        delete tempScopeNode.schema[key];
+                        break;
                     }
                 }
             }
@@ -3534,7 +3656,95 @@ export class ScopeDataStructure {
         // Replace cyScope placeholders in all external function call data
         // This ensures call signatures and schema paths use actual callback text
         // instead of internal cyScope names, preventing mock data merge conflicts.
-        return this.externalFunctionCalls.map((efc) => this.cleanCyScopeFromFunctionCallInfo(efc));
+        const rootScopeName = this.scopeTreeManager.getRootName();
+        const rootSchema = this.scopeNodes[rootScopeName]?.schema ?? {};
+        return this.externalFunctionCalls.map((efc) => {
+            const cleaned = this.cleanCyScopeFromFunctionCallInfo(efc);
+            return this.filterConflatedExternalPaths(cleaned, rootSchema);
+        });
+    }
+    /**
+     * Filters out conflated paths from external function call schemas.
+     *
+     * When multiple useState(false) calls create equivalency conflation during
+     * Phase 1 analysis, standalone boolean state variables (like showWorkoutForm,
+     * showGoalForm) can bleed into external function call schemas as sub-properties
+     * of unrelated data fields (like data[].activity_type.showWorkoutForm).
+     *
+     * Detection: group sub-properties by parent path. If 2+ sub-properties of
+     * the same parent all match standalone root scope variable names, treat them
+     * as conflation artifacts and remove them.
+     */
+    filterConflatedExternalPaths(efc, rootSchema) {
+        // Build a set of top-level root scope variable names (simple names, no dots/brackets)
+        const topLevelRootVars = new Set();
+        for (const key of Object.keys(rootSchema)) {
+            if (!key.includes('.') && !key.includes('[')) {
+                topLevelRootVars.add(key);
+            }
+        }
+        if (topLevelRootVars.size === 0)
+            return efc;
+        // Group sub-property matches by their parent path.
+        // For a path like "...data[].activity_type.showWorkoutForm",
+        // parent = "...data[].activity_type", child = "showWorkoutForm"
+        const parentToConflatedKeys = new Map();
+        for (const key of Object.keys(efc.schema)) {
+            const lastDot = key.lastIndexOf('.');
+            if (lastDot === -1)
+                continue;
+            const parent = key.substring(0, lastDot);
+            const child = key.substring(lastDot + 1);
+            // Skip array access or function call patterns
+            if (child.includes('[') || child.includes('('))
+                continue;
+            // Only consider paths inside array element chains (contains []).
+            // Direct children of functionCallReturnValue are legitimate destructured
+            // return values, not conflation. Conflation happens deeper in the chain
+            // when array element fields get corrupted sub-properties.
+            if (!parent.includes('['))
+                continue;
+            if (topLevelRootVars.has(child)) {
+                if (!parentToConflatedKeys.has(parent)) {
+                    parentToConflatedKeys.set(parent, []);
+                }
+                parentToConflatedKeys.get(parent).push(key);
+            }
+        }
+        // Only filter when 2+ sub-properties of the same parent match root scope vars.
+        // This threshold avoids false positives from coincidental name matches.
+        const keysToRemove = new Set();
+        const parentsToRestore = new Set();
+        for (const [parent, conflatedKeys] of parentToConflatedKeys) {
+            if (conflatedKeys.length >= 2) {
+                for (const key of conflatedKeys) {
+                    keysToRemove.add(key);
+                }
+                parentsToRestore.add(parent);
+            }
+        }
+        if (keysToRemove.size === 0)
+            return efc;
+        // Create a new schema without the conflated paths
+        const newSchema = {};
+        for (const [key, value] of Object.entries(efc.schema)) {
+            if (keysToRemove.has(key))
+                continue;
+            // Restore parent type: if it was changed to "object" because of conflated
+            // sub-properties, and now all those sub-properties are removed, change it
+            // back to "unknown" (we don't know the original type)
+            if (parentsToRestore.has(key) && value === 'object') {
+                // Check if there are any remaining sub-properties
+                const hasRemainingSubProps = Object.keys(efc.schema).some((k) => !keysToRemove.has(k) &&
+                    k !== key &&
+                    (k.startsWith(key + '.') || k.startsWith(key + '[')));
+                newSchema[key] = hasRemainingSubProps ? value : 'unknown';
+            }
+            else {
+                newSchema[key] = value;
+            }
+        }
+        return { ...efc, schema: newSchema };
     }
     /**
      * Cleans cyScope placeholder references from a FunctionCallInfo.