@typecad/cuttlefish 1.0.0-alpha.15 → 1.0.0-alpha.16

package/dist/cli.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import fs from "node:fs";
 import { parseCommandLine, printHelp } from "./utils/cli.js";
 import { runLibraryCommand } from "./library/cli.js";
-import { scaffoldProject, printCreateNextSteps, KNOWN_TARGETS, frameworksForTarget, frameworkCatalogEntry, FRAMEWORK_CATALOG, frameworkTargetProfile, probeMethodsForBoard } from "./create/index.js";
+import { scaffoldProject, printCreateNextSteps, KNOWN_TARGETS, frameworksForTarget, frameworkCatalogEntry, FRAMEWORK_CATALOG, frameworkTargetProfile, probeMethodsForBoard, probeRunnerQuirks } from "./create/index.js";
 import { findPackBoard, packBoardAsTarget } from "./create/pack-targets.js";
 import { activeBoardCatalog, assertZephyrSdkForCreate, formatZephyrSdkFound, ensureFreshBoardCatalog, resetBoardCatalogOverlayCache, sdkFingerprint, PINNED_ZEPHYR_MANIFEST_REV } from "./board-catalog/index.js";
 import { generateFrameworkDebugArtifacts } from "./create/debug-artifacts.js";
@@ -134,12 +134,17 @@ async function handleCreate(options) {
             throw new Error(`Unknown probe method '${options.probe}' for ${target.displayName}. Supported: ${list}.`);
         }
         const projectName = options.projectName || 'my-project';
+        // Board-catalog quirk for the chosen probe method (e.g. an srst-based
+        // openocd.cfg behind a debug header with no NRST) — baked into the
+        // scaffolded config's runnerArgs so the first flash works.
+        const probeRunnerArgs = options.probe && frameworkId === 'zephyr' ? probeRunnerQuirks(target.id, options.probe) : [];
         // Framework-specific build target + toolchain (Zephyr board id + 'west').
         const profile = frameworkTargetProfile(target, frameworkId);
         const buildTarget = profile.buildTarget ?? target.buildTarget;
         const result = scaffoldProject({
             probeMethod: options.probe,
             probeMethods,
+            ...(probeRunnerArgs.length > 0 ? { probeRunnerArgs } : {}),
             projectName,
             targetId: target.id,
             targetDisplayName: target.displayName,

package/dist/create/framework-catalog.d.ts

@@ -59,6 +59,22 @@ export interface CatalogProbeMethod {
  * question is asked and no zephyr.probe section is scaffolded.
  */
 export declare function probeMethodsForBoard(boardId: string | undefined): CatalogProbeMethod[];
+/**
+ * Pre-baked zephyr.runnerArgs the selected probe method needs to flash
+ * reliably — sourced from the method's captured debugCfg (the board's
+ * support/openocd.cfg, verbatim), so the scaffold bakes in facts, not board
+ * names.
+ *
+ * The one quirk today: a cfg that drives OpenOCD resets through the SRST pin
+ * (`reset_config srst…`) while the probe's NRST line may not reach the target
+ * — hobby boards like the WeAct BlackPill break no NRST out at all, so
+ * `reset init` asserts a pin that reaches nothing and dies with "timed out
+ * while waiting for target halted". Core-domain resets (SYSRESETREQ) are
+ * pin-independent. Boards declaring `connect_assert_srst` are excluded: that
+ * strategy only works with NRST wired, so the pin is provably connected there
+ * and connect-under-reset is worth keeping.
+ */
+export declare function probeRunnerQuirks(boardId: string | undefined, methodId: string | undefined): string[];
 export interface FrameworkTargetProfile {
     /** Framework-specific build target (FQBN for Arduino, board id for Zephyr). */
     buildTarget?: string;

package/dist/create/framework-catalog.js

@@ -73,6 +73,34 @@ export function probeMethodsForBoard(boardId) {
         return [];
     return entry.probeMethods.map((m) => ({ id: m.id, description: m.description }));
 }
+/**
+ * Pre-baked zephyr.runnerArgs the selected probe method needs to flash
+ * reliably — sourced from the method's captured debugCfg (the board's
+ * support/openocd.cfg, verbatim), so the scaffold bakes in facts, not board
+ * names.
+ *
+ * The one quirk today: a cfg that drives OpenOCD resets through the SRST pin
+ * (`reset_config srst…`) while the probe's NRST line may not reach the target
+ * — hobby boards like the WeAct BlackPill break no NRST out at all, so
+ * `reset init` asserts a pin that reaches nothing and dies with "timed out
+ * while waiting for target halted". Core-domain resets (SYSRESETREQ) are
+ * pin-independent. Boards declaring `connect_assert_srst` are excluded: that
+ * strategy only works with NRST wired, so the pin is provably connected there
+ * and connect-under-reset is worth keeping.
+ */
+export function probeRunnerQuirks(boardId, methodId) {
+    if (!boardId || !methodId)
+        return [];
+    const method = findPackBoard(boardId)?.probeMethods?.find((m) => m.id === methodId);
+    // Only the openocd runner consumes the board cfg's reset_config — other
+    // runners (jlink, dfu-util, …) carry their own reset strategy.
+    if (!method || method.runner !== 'openocd')
+        return [];
+    const cfg = method.debugCfg ?? [];
+    const srst = cfg.some((line) => /reset_config\s+srst/.test(line));
+    const connectAssert = cfg.some((line) => /connect_assert_srst/.test(line));
+    return srst && !connectAssert ? ['--cmd-pre-init=reset_config none'] : [];
+}
 /**
  * Resolve the framework-specific buildTarget + toolchain type for a
  * (board, framework) pair. Zephyr maps the board id to its Zephyr board

package/dist/create/index.d.ts

@@ -1,6 +1,6 @@
 export { scaffoldProject, normalizeProjectName, KNOWN_TARGETS, printCreateNextSteps } from './scaffold.js';
 export type { KnownTarget, ScaffoldProjectResult } from './scaffold.js';
-export { FRAMEWORK_CATALOG, frameworksForTarget, frameworkCompatibleWithTarget, frameworkCatalogEntry, detectPackageManager, frameworkTargetProfile, probeMethodsForBoard } from './framework-catalog.js';
+export { FRAMEWORK_CATALOG, frameworksForTarget, frameworkCompatibleWithTarget, frameworkCatalogEntry, detectPackageManager, frameworkTargetProfile, probeMethodsForBoard, probeRunnerQuirks } from './framework-catalog.js';
 export type { FrameworkCatalogEntry, BoardLike, PackageManager, FrameworkTargetProfile, TargetProfileInput, CatalogProbeMethod } from './framework-catalog.js';
 export { installProjectDependencies, __setProjectInstallRunnerForTest } from './install-deps.js';
 export type { ProjectInstallResult } from './install-deps.js';

package/dist/create/index.js

@@ -1,5 +1,5 @@
 export { scaffoldProject, normalizeProjectName, KNOWN_TARGETS, printCreateNextSteps } from './scaffold.js';
-export { FRAMEWORK_CATALOG, frameworksForTarget, frameworkCompatibleWithTarget, frameworkCatalogEntry, detectPackageManager, frameworkTargetProfile, probeMethodsForBoard } from './framework-catalog.js';
+export { FRAMEWORK_CATALOG, frameworksForTarget, frameworkCompatibleWithTarget, frameworkCatalogEntry, detectPackageManager, frameworkTargetProfile, probeMethodsForBoard, probeRunnerQuirks } from './framework-catalog.js';
 export { installProjectDependencies, __setProjectInstallRunnerForTest } from './install-deps.js';
 export { generateProjectPackageJson, generateProjectTsconfig, generateProjectConfig, generateProjectEnvDts, generateStarterProgram, generateStarterTest, generateStarterSim, generateGitignore, generateEditorconfig, generateEslintConfig, } from './templates.js';
 export { runCreateWizard } from './wizard.js';

package/dist/create/templates.d.ts

@@ -29,6 +29,11 @@ export interface CreateProjectOptions {
         id: string;
         description?: string;
     }[];
+    /** Pre-baked zephyr.runnerArgs for the selected probe method (from
+     *  probeRunnerQuirks — board-catalog facts, e.g. an srst-based openocd.cfg
+     *  behind a debug header with no NRST). Emitted after probe with an
+     *  explanatory comment. */
+    probeRunnerArgs?: string[];
     /** Serial port picked at create time (test.port). Absent →
      *  the platform hint placeholder. */
     port?: string;

package/dist/create/templates.js

@@ -197,6 +197,16 @@ export default config;
     // flashing AND debugging.
     probe: '${options.probeMethod}',`);
     }
+    if (options.probeRunnerArgs && options.probeRunnerArgs.length > 0) {
+        const quirks = options.probeRunnerArgs.map((a) => `'${a}'`).join(', ');
+        zephyrFields.push(`    // Quirk: this board's openocd.cfg drives OpenOCD resets through the
+    // SRST pin. When the probe's NRST line isn't wired to the target (the
+    // BlackPill's SWD header has no NRST pin at all), \`reset init\` times out
+    // with "timed out while waiting for target halted". These args force
+    // pin-independent core resets instead — remove them if NRST is wired and
+    // pin resets are wanted.
+    runnerArgs: [${quirks}],`);
+    }
     const zephyrProbeBlock = zephyrFields.length > 0
         ? `
 

package/dist/create/wizard.js

@@ -7,7 +7,7 @@ import { KNOWN_TARGETS } from "./scaffold.js";
 import { findPackBoard, packBoardAsTarget } from "./pack-targets.js";
 import { pickTarget } from "./board-search.js";
 import { activeBoardCatalog } from "../board-catalog/index.js";
-import { frameworksForTarget, frameworkCatalogEntry, frameworkCompatibleWithTarget, FRAMEWORK_CATALOG, frameworkTargetProfile, probeMethodsForBoard } from './framework-catalog.js';
+import { frameworksForTarget, frameworkCatalogEntry, frameworkCompatibleWithTarget, FRAMEWORK_CATALOG, frameworkTargetProfile, probeMethodsForBoard, probeRunnerQuirks } from './framework-catalog.js';
 /**
  * Attached serial ports for the wizard's port question — dependency-free
  * (the wizard runs before any project deps exist, and cuttlefish itself
@@ -209,6 +209,10 @@ export async function runCreateWizard(partialOptions) {
                 probeMethod = chosen === "" ? undefined : chosen;
             }
         }
+        // Board-catalog quirk for the chosen probe (e.g. an srst-based openocd.cfg
+        // behind a debug header with no NRST) — baked into the scaffolded
+        // config's runnerArgs so the first flash works.
+        const probeRunnerArgs = probeMethod ? probeRunnerQuirks(target.id, probeMethod) : [];
         // 4. Serial port (only for embedded) — the port the board rides on.
         // Detected ports are offered as a choice; the answer seeds test.port in
         // the scaffolded config (no more guessing COM4). "skip" leaves the
@@ -272,6 +276,7 @@ export async function runCreateWizard(partialOptions) {
         return {
             probeMethod,
             probeMethods,
+            ...(probeRunnerArgs.length > 0 ? { probeRunnerArgs } : {}),
             projectName,
             targetId: target.id,
             targetDisplayName: target.displayName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typecad/cuttlefish",
-  "version": "1.0.0-alpha.15",
+  "version": "1.0.0-alpha.16",
   "description": "TypeScript to C++ transpiler \u2014 native, Arduino, and bare-metal targets",
   "type": "module",
   "main": "./dist/transpile.js",
@@ -107,14 +107,14 @@
     "start": "node dist/cli.js"
   },
   "dependencies": {
-    "@typecad/hal": "1.0.0-alpha.15",
+    "@typecad/hal": "1.0.0-alpha.16",
     "chalk": "^6.0.0",
     "inquirer-select-pro": "^1.0.0-alpha.9",
     "typescript": "^5.7.3",
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@typecad/ui": "1.0.0-alpha.15"
+    "@typecad/ui": "1.0.0-alpha.16"
   },
   "peerDependenciesMeta": {
     "@typecad/ui": {
@@ -122,7 +122,7 @@
     }
   },
   "optionalDependencies": {
-    "@typecad/expect": "1.0.0-alpha.15"
+    "@typecad/expect": "1.0.0-alpha.16"
   },
   "devDependencies": {
     "@types/node": "^22.10.7"