@ticatec/omniflow-core 0.1.1 → 0.2.0

package/dist/index.d.ts

@@ -1,15 +1,16 @@
 /**
- * @omniflow/core
+ * @ticatec/omniflow-core
  *
  * Foundational execution context, primitives, and toolchain SPI
  * for OmniFlow CI/CD orchestrator and its plugins.
  */
 export { getContext, tryGetContext, hasContext, runWithContext, createMockContext, executionLocalStorage, type ExecutionContext, type CommandResult, type Artifact, type Logger, type GitMetadata, type SourceMode } from './context/index.js';
-export { shell, run, sh, output, type RunOptions, type ShellOutputResult, type TemplateRunner } from './primitives/shell.js';
+export { shell, run, sh, output, createMaskTransform, type RunOptions, type ShellOutputResult, type TemplateRunner } from './primitives/shell.js';
 export { ssh, SshClient, type SshServerConfig, type SshConnectionConfig, type SshTarget, type SshResult } from './primitives/ssh.js';
-export { git } from './primitives/git.js';
+export { git, type GitCwdOptions, type GitFetchOptions, type GitResetOptions, type GitCheckoutOptions, type GitCleanOptions } from './primitives/git.js';
 export { docker, type DockerBuildOptions, type ComposeOptions } from './primitives/docker.js';
-export { registerToolchain, resolveToolchain, ToolchainRegistry, defaultToolchainRegistry, MavenToolchain, GradleToolchain, NodeToolchain, readPom, parseXml, type ToolchainProvider, type DetectionResult, type ProjectInfo } from './toolchain/index.js';
+export { registerToolchain, resolveToolchain, ToolchainRegistry, defaultToolchainRegistry, MavenToolchain, GradleToolchain, NodeToolchain, readPom, parseXml, type ToolchainProvider, type DetectionResult, type ProjectInfo, type ResolveToolchainOptions } from './toolchain/index.js';
 export { maskString, maskObject, isSecretKey, MASK } from './utils/mask.js';
 export { templateToArgv } from './utils/template.js';
+export { type PluginContext, type PluginRegisterFn, type ArtifactRegistryLike, type BranchRegistryLike, type CommandRegistryLike, type ToolchainRegistryLike } from './plugin/PluginContext.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EACL,UAAU,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EACL,KAAK,EACL,GAAG,EACH,EAAE,EACF,MAAM,EACN,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EACL,GAAG,EACH,SAAS,EACT,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAEzC,OAAO,EACL,MAAM,EACN,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAA;AAG/B,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,cAAc,EACd,eAAe,EACf,aAAa,EACb,OAAO,EACP,QAAQ,EACR,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAA;AAG7B,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,IAAI,EACL,MAAM,iBAAiB,CAAA;AAExB,OAAO,EACL,cAAc,EACf,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EACL,UAAU,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EACL,KAAK,EACL,GAAG,EACH,EAAE,EACF,MAAM,EACN,mBAAmB,EACnB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EACL,GAAG,EACH,SAAS,EACT,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,GAAG,EACH,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACrB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,MAAM,EACN,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAA;AAG/B,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,cAAc,EACd,eAAe,EACf,aAAa,EACb,OAAO,EACP,QAAQ,EACR,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC7B,MAAM,sBAAsB,CAAA;AAG7B,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,IAAI,EACL,MAAM,iBAAiB,CAAA;AAExB,OAAO,EACL,cAAc,EACf,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,2BAA2B,CAAA"}

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @omniflow/core
+ * @ticatec/omniflow-core
  *
  * Foundational execution context, primitives, and toolchain SPI
  * for OmniFlow CI/CD orchestrator and its plugins.
@@ -7,7 +7,7 @@
 // Context
 export { getContext, tryGetContext, hasContext, runWithContext, createMockContext, executionLocalStorage } from './context/index.js';
 // Primitives
-export { shell, run, sh, output } from './primitives/shell.js';
+export { shell, run, sh, output, createMaskTransform } from './primitives/shell.js';
 export { ssh, SshClient } from './primitives/ssh.js';
 export { git } from './primitives/git.js';
 export { docker } from './primitives/docker.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,UAAU;AACV,OAAO,EACL,UAAU,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EAOtB,MAAM,oBAAoB,CAAA;AAE3B,aAAa;AACb,OAAO,EACL,KAAK,EACL,GAAG,EACH,EAAE,EACF,MAAM,EAIP,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EACL,GAAG,EACH,SAAS,EAKV,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAEzC,OAAO,EACL,MAAM,EAGP,MAAM,wBAAwB,CAAA;AAE/B,aAAa;AACb,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,cAAc,EACd,eAAe,EACf,aAAa,EACb,OAAO,EACP,QAAQ,EAIT,MAAM,sBAAsB,CAAA;AAE7B,YAAY;AACZ,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,IAAI,EACL,MAAM,iBAAiB,CAAA;AAExB,OAAO,EACL,cAAc,EACf,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,UAAU;AACV,OAAO,EACL,UAAU,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EAOtB,MAAM,oBAAoB,CAAA;AAE3B,aAAa;AACb,OAAO,EACL,KAAK,EACL,GAAG,EACH,EAAE,EACF,MAAM,EACN,mBAAmB,EAIpB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EACL,GAAG,EACH,SAAS,EAKV,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,GAAG,EAMJ,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,MAAM,EAGP,MAAM,wBAAwB,CAAA;AAE/B,aAAa;AACb,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,cAAc,EACd,eAAe,EACf,aAAa,EACb,OAAO,EACP,QAAQ,EAKT,MAAM,sBAAsB,CAAA;AAE7B,YAAY;AACZ,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,IAAI,EACL,MAAM,iBAAiB,CAAA;AAExB,OAAO,EACL,cAAc,EACf,MAAM,qBAAqB,CAAA"}

package/dist/plugin/PluginContext.d.ts

@@ -0,0 +1,39 @@
+/**
+ * OmniFlow Plugin SPI Contracts
+ *
+ * Provides the context and registration hook for external plugins extending
+ * artifact publishers, branch strategies, commands, and toolchains.
+ */
+export interface ArtifactRegistryLike {
+    register(publisher: any): void;
+}
+export interface BranchRegistryLike {
+    register(strategy: any): void;
+}
+export interface CommandRegistryLike {
+    register(command: any): void;
+    registerFunction?(name: string, fn: any): void;
+}
+export interface ToolchainRegistryLike {
+    register(toolchain: any): void;
+}
+/**
+ * Standard SPI context passed to every plugin's `register(ctx, options)` hook.
+ */
+export interface PluginContext<TArtifactRegistry = any, TBranchRegistry = any, TCommandRegistry = any, TToolchainRegistry = any> {
+    /** Registry for Docker, NPM, Maven, Raw artifact publishers */
+    artifactRegistry: TArtifactRegistry;
+    /** Registry for Git branch promotion and PR/MR drivers */
+    branchRegistry: TBranchRegistry;
+    /** Registry for BaseCommand subclasses or functional recipes */
+    commandRegistry: TCommandRegistry;
+    /** Registry for detection and build toolchains */
+    toolchainRegistry: TToolchainRegistry;
+    /** Runtime environment variables */
+    env: Record<string, string | undefined>;
+}
+/**
+ * The standard entry function every OmniFlow plugin exports.
+ */
+export type PluginRegisterFn<TArtifactRegistry = any, TBranchRegistry = any, TCommandRegistry = any, TToolchainRegistry = any> = (ctx: PluginContext<TArtifactRegistry, TBranchRegistry, TCommandRegistry, TToolchainRegistry>, options?: Record<string, unknown>) => Promise<void> | void;
+//# sourceMappingURL=PluginContext.d.ts.map

package/dist/plugin/PluginContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PluginContext.d.ts","sourceRoot":"","sources":["../../src/plugin/PluginContext.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,CAAA;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAA;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAA;IAC5B,gBAAgB,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,IAAI,CAAA;CAC/C;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,CAAA;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa,CAC5B,iBAAiB,GAAG,GAAG,EACvB,eAAe,GAAG,GAAG,EACrB,gBAAgB,GAAG,GAAG,EACtB,kBAAkB,GAAG,GAAG;IAExB,+DAA+D;IAC/D,gBAAgB,EAAE,iBAAiB,CAAA;IACnC,0DAA0D;IAC1D,cAAc,EAAE,eAAe,CAAA;IAC/B,gEAAgE;IAChE,eAAe,EAAE,gBAAgB,CAAA;IACjC,kDAAkD;IAClD,iBAAiB,EAAE,kBAAkB,CAAA;IACrC,oCAAoC;IACpC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CACxC;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAC1B,iBAAiB,GAAG,GAAG,EACvB,eAAe,GAAG,GAAG,EACrB,gBAAgB,GAAG,GAAG,EACtB,kBAAkB,GAAG,GAAG,IACtB,CACF,GAAG,EAAE,aAAa,CAAC,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAC5F,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA"}

package/dist/plugin/PluginContext.js

@@ -0,0 +1,8 @@
+/**
+ * OmniFlow Plugin SPI Contracts
+ *
+ * Provides the context and registration hook for external plugins extending
+ * artifact publishers, branch strategies, commands, and toolchains.
+ */
+export {};
+//# sourceMappingURL=PluginContext.js.map

package/dist/plugin/PluginContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PluginContext.js","sourceRoot":"","sources":["../../src/plugin/PluginContext.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}

package/dist/primitives/docker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/primitives/docker.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAEnD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,eAAO,MAAM,MAAM;IACjB;;OAEG;mBACkB,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAgC3D;;OAEG;qBACoB,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAUtE;;OAEG;gBACe,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU5C;;OAEG;wBACsB,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;IAsC5D;;OAEG;0BACwB,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;CAqB/D,CAAA"}
+{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/primitives/docker.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAEnD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,eAAO,MAAM,MAAM;IACjB;;OAEG;mBACkB,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAoC3D;;OAEG;qBACoB,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAUtE;;OAEG;gBACe,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU5C;;OAEG;wBACsB,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;IAsC5D;;OAEG;0BACwB,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;CA6B/D,CAAA"}

package/dist/primitives/docker.js

@@ -6,6 +6,9 @@ export const docker = {
      * Build a Docker image.
      */
     async build(options) {
+        if (!options.image || typeof options.image !== 'string' || options.image.trim() === '') {
+            throw new Error('Docker build requires a non-empty "image" identifier');
+        }
         const ctx = tryGetContext();
         const cwd = options.cwd ?? (ctx?.moduleFolder ? path.resolve(ctx.workspace, ctx.moduleFolder) : ctx?.workspace ?? process.cwd());
         const dockerfile = options.dockerfile ?? 'Dockerfile';
@@ -98,10 +101,16 @@ export const docker = {
                 args.push('-f', f);
             }
         }
+        if (options.envFile) {
+            args.push('--env-file', options.envFile);
+        }
         args.push('down');
         if (options.flags) {
             args.push(...options.flags);
         }
+        if (options.services && options.services.length > 0) {
+            args.push(...options.services);
+        }
         ctx?.logger.info('Docker Compose down');
         await shell.run({ cwd }) `docker ${args}`;
     }

package/dist/primitives/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/primitives/docker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/primitives/docker.ts"],"names":[],"mappings":"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"}

package/dist/primitives/git.d.ts

@@ -1,19 +1,61 @@
+export interface GitCwdOptions {
+    dir?: string;
+}
+export interface GitFetchOptions extends GitCwdOptions {
+    remote?: string;
+    branch?: string;
+}
+export interface GitResetOptions extends GitCwdOptions {
+    target?: string;
+}
+export interface GitCheckoutOptions extends GitCwdOptions {
+    ref?: string;
+}
+export interface GitCleanOptions extends GitCwdOptions {
+    forceIgnored?: boolean;
+}
 export declare const git: {
-    /** Return full SHA of current commit */
-    currentCommit(dir?: string): Promise<string>;
-    /** Return short SHA of current commit */
-    shortCommit(dir?: string): Promise<string>;
-    /** Return current checked-out branch name, or empty string if detached HEAD */
-    currentBranch(dir?: string): Promise<string>;
-    /** Check if working tree has untracked or uncommitted changes */
-    isDirty(dir?: string): Promise<boolean>;
-    /** Fetch latest changes from remote */
-    fetch(dir?: string, remote?: string, branch?: string): Promise<void>;
-    /** Hard reset to target (defaults to HEAD) */
-    resetHard(dir?: string, target?: string): Promise<void>;
-    /** Clean working tree */
-    clean(dir?: string, forceIgnored?: boolean): Promise<void>;
-    /** Switch or checkout a ref */
-    checkout(dir?: string, ref?: string): Promise<void>;
+    /**
+     * Return full SHA of current commit.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    currentCommit(options?: string | GitCwdOptions): Promise<string>;
+    /**
+     * Return short SHA of current commit.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    shortCommit(options?: string | GitCwdOptions): Promise<string>;
+    /**
+     * Return current checked-out branch name, or empty string if detached HEAD.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    currentBranch(options?: string | GitCwdOptions): Promise<string>;
+    /**
+     * Check if working tree has untracked or uncommitted changes.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    isDirty(options?: string | GitCwdOptions): Promise<boolean>;
+    /**
+     * Fetch latest changes from remote.
+     * @param options GitFetchOptions object { remote, branch, dir }. Defaults to { remote: 'origin' } at repo root.
+     */
+    fetch(options?: GitFetchOptions): Promise<void>;
+    /**
+     * Hard reset working tree to target commit/ref (defaults to HEAD).
+     * @param targetOrOptions Target ref name (string, e.g. 'HEAD', 'origin/main'), or GitResetOptions { target, dir }.
+     * Note: A bare string argument is treated as the target ref, NOT a directory. Pass { dir: '...' } to change directory.
+     */
+    resetHard(targetOrOptions?: string | GitResetOptions): Promise<void>;
+    /**
+     * Clean working tree untracked files.
+     * @param options GitCleanOptions { forceIgnored, dir }. Defaults to repo root.
+     */
+    clean(options?: GitCleanOptions): Promise<void>;
+    /**
+     * Switch or checkout a ref (defaults to main).
+     * @param refOrOptions Ref name (string, e.g. 'main', 'feature/login'), or GitCheckoutOptions { ref, dir }.
+     * Note: A bare string argument is treated as the ref name, NOT a directory. Pass { dir: '...' } to change directory.
+     */
+    checkout(refOrOptions?: string | GitCheckoutOptions): Promise<void>;
 };
 //# sourceMappingURL=git.d.ts.map

package/dist/primitives/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/primitives/git.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,GAAG;IACd,wCAAwC;wBACd,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMlD,yCAAyC;sBACjB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMhD,+EAA+E;wBACrD,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUlD,iEAAiE;kBAC7C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM7C,uCAAuC;gBACrB,MAAM,4BAA8B,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5E,8CAA8C;oBACxB,MAAM,oBAAoB,OAAO,CAAC,IAAI,CAAC;IAU7D,yBAAyB;gBACP,MAAM,2BAAyB,OAAO,CAAC,IAAI,CAAC;IAW9D,+BAA+B;mBACV,MAAM,iBAAiB,OAAO,CAAC,IAAI,CAAC;CAS1D,CAAA"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/primitives/git.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACvD,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAgBD,eAAO,MAAM,GAAG;IACd;;;OAGG;4BAC2B,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtE;;;OAGG;0BACyB,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAMpE;;;OAGG;4BAC2B,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IActE;;;OAGG;sBACqB,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAMjE;;;OAGG;oBACkB,eAAe,GAAQ,OAAO,CAAC,IAAI,CAAC;IAezD;;;;OAIG;gCAC8B,MAAM,GAAG,eAAe,GAAY,OAAO,CAAC,IAAI,CAAC;IAoBlF;;;OAGG;oBACkB,eAAe,GAAQ,OAAO,CAAC,IAAI,CAAC;IAYzD;;;;OAIG;4BAC0B,MAAM,GAAG,kBAAkB,GAAY,OAAO,CAAC,IAAI,CAAC;CAmBlF,CAAA"}

package/dist/primitives/git.js

@@ -1,57 +1,98 @@
 import { execa } from 'execa';
 import { tryGetContext } from '../context/index.js';
-function resolveDir(dir) {
-    if (dir)
-        return dir;
+function resolveGitCwd(optionsOrDir) {
+    if (typeof optionsOrDir === 'string') {
+        return optionsOrDir;
+    }
+    if (optionsOrDir?.dir) {
+        return optionsOrDir.dir;
+    }
     const ctx = tryGetContext();
-    return ctx?.workspace ?? process.cwd();
+    if (ctx) {
+        return ctx.projectRoot ?? ctx.workspace ?? process.cwd();
+    }
+    return process.cwd();
 }
 export const git = {
-    /** Return full SHA of current commit */
-    async currentCommit(dir) {
-        const cwd = resolveDir(dir);
+    /**
+     * Return full SHA of current commit.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    async currentCommit(options) {
+        const cwd = resolveGitCwd(options);
         const { stdout } = await execa('git', ['rev-parse', 'HEAD'], { cwd });
         return stdout.trim();
     },
-    /** Return short SHA of current commit */
-    async shortCommit(dir) {
-        const cwd = resolveDir(dir);
+    /**
+     * Return short SHA of current commit.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    async shortCommit(options) {
+        const cwd = resolveGitCwd(options);
         const { stdout } = await execa('git', ['rev-parse', '--short', 'HEAD'], { cwd });
         return stdout.trim();
     },
-    /** Return current checked-out branch name, or empty string if detached HEAD */
-    async currentBranch(dir) {
-        const cwd = resolveDir(dir);
+    /**
+     * Return current checked-out branch name, or empty string if detached HEAD.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    async currentBranch(options) {
+        const cwd = resolveGitCwd(options);
         try {
             const { stdout } = await execa('git', ['symbolic-ref', '--short', 'HEAD'], { cwd });
             return stdout.trim();
         }
         catch {
-            return '';
+            const isInside = await execa('git', ['rev-parse', '--is-inside-work-tree'], { cwd, reject: false });
+            if (!isInside.failed) {
+                return ''; // Valid git repo, but detached HEAD
+            }
+            throw new Error(`Not a git repository: ${cwd}`);
         }
     },
-    /** Check if working tree has untracked or uncommitted changes */
-    async isDirty(dir) {
-        const cwd = resolveDir(dir);
+    /**
+     * Check if working tree has untracked or uncommitted changes.
+     * @param options Directory path or GitCwdOptions object. Defaults to repository root.
+     */
+    async isDirty(options) {
+        const cwd = resolveGitCwd(options);
         const { stdout } = await execa('git', ['status', '--porcelain'], { cwd });
         return stdout.trim().length > 0;
     },
-    /** Fetch latest changes from remote */
-    async fetch(dir, remote = 'origin', branch) {
-        const cwd = resolveDir(dir);
+    /**
+     * Fetch latest changes from remote.
+     * @param options GitFetchOptions object { remote, branch, dir }. Defaults to { remote: 'origin' } at repo root.
+     */
+    async fetch(options = {}) {
+        const cwd = resolveGitCwd(options);
+        const rem = options.remote ?? 'origin';
+        const br = options.branch;
         const ctx = tryGetContext();
         if (ctx?.dryRun) {
-            ctx.logger.info(`[DRY-RUN] git fetch ${remote} ${branch ?? ''}`);
+            ctx.logger.info(`[DRY-RUN] git fetch ${rem}${br ? ` ${br}` : ''}`);
             return;
         }
-        const args = ['fetch', remote];
-        if (branch)
-            args.push(branch);
+        const args = ['fetch', rem];
+        if (br)
+            args.push(br);
         await execa('git', args, { cwd });
     },
-    /** Hard reset to target (defaults to HEAD) */
-    async resetHard(dir, target = 'HEAD') {
-        const cwd = resolveDir(dir);
+    /**
+     * Hard reset working tree to target commit/ref (defaults to HEAD).
+     * @param targetOrOptions Target ref name (string, e.g. 'HEAD', 'origin/main'), or GitResetOptions { target, dir }.
+     * Note: A bare string argument is treated as the target ref, NOT a directory. Pass { dir: '...' } to change directory.
+     */
+    async resetHard(targetOrOptions = 'HEAD') {
+        let target = 'HEAD';
+        let cwd;
+        if (typeof targetOrOptions === 'object' && targetOrOptions !== null) {
+            target = targetOrOptions.target ?? 'HEAD';
+            cwd = resolveGitCwd(targetOrOptions);
+        }
+        else {
+            target = targetOrOptions;
+            cwd = resolveGitCwd();
+        }
         const ctx = tryGetContext();
         if (ctx?.dryRun) {
             ctx.logger.info(`[DRY-RUN] git reset --hard ${target}`);
@@ -59,10 +100,14 @@ export const git = {
         }
         await execa('git', ['reset', '--hard', target], { cwd });
     },
-    /** Clean working tree */
-    async clean(dir, forceIgnored = false) {
-        const cwd = resolveDir(dir);
+    /**
+     * Clean working tree untracked files.
+     * @param options GitCleanOptions { forceIgnored, dir }. Defaults to repo root.
+     */
+    async clean(options = {}) {
+        const cwd = resolveGitCwd(options);
         const ctx = tryGetContext();
+        const forceIgnored = options.forceIgnored ?? false;
         if (ctx?.dryRun) {
             ctx.logger.info(`[DRY-RUN] git clean -fd${forceIgnored ? 'x' : ''}`);
             return;
@@ -70,9 +115,22 @@ export const git = {
         const flags = forceIgnored ? ['clean', '-fdx'] : ['clean', '-fd'];
         await execa('git', flags, { cwd });
     },
-    /** Switch or checkout a ref */
-    async checkout(dir, ref = 'main') {
-        const cwd = resolveDir(dir);
+    /**
+     * Switch or checkout a ref (defaults to main).
+     * @param refOrOptions Ref name (string, e.g. 'main', 'feature/login'), or GitCheckoutOptions { ref, dir }.
+     * Note: A bare string argument is treated as the ref name, NOT a directory. Pass { dir: '...' } to change directory.
+     */
+    async checkout(refOrOptions = 'main') {
+        let ref = 'main';
+        let cwd;
+        if (typeof refOrOptions === 'object' && refOrOptions !== null) {
+            ref = refOrOptions.ref ?? 'main';
+            cwd = resolveGitCwd(refOrOptions);
+        }
+        else {
+            ref = refOrOptions;
+            cwd = resolveGitCwd();
+        }
         const ctx = tryGetContext();
         if (ctx?.dryRun) {
             ctx.logger.info(`[DRY-RUN] git checkout ${ref}`);

package/dist/primitives/git.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/primitives/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,SAAS,UAAU,CAAC,GAAY;IAC9B,IAAI,GAAG;QAAE,OAAO,GAAG,CAAA;IACnB,MAAM,GAAG,GAAG,aAAa,EAAE,CAAA;IAC3B,OAAO,GAAG,EAAE,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;AACxC,CAAC;AAED,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,wCAAwC;IACxC,KAAK,CAAC,aAAa,CAAC,GAAY;QAC9B,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QACrE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,WAAW,CAAC,GAAY;QAC5B,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QAChF,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;IAED,+EAA+E;IAC/E,KAAK,CAAC,aAAa,CAAC,GAAY;QAC9B,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACnF,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;QACtB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,KAAK,CAAC,OAAO,CAAC,GAAY;QACxB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QACzE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,uCAAuC;IACvC,KAAK,CAAC,KAAK,CAAC,GAAY,EAAE,MAAM,GAAG,QAAQ,EAAE,MAAe;QAC1D,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAA;QAC3B,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,MAAM,IAAI,MAAM,IAAI,EAAE,EAAE,CAAC,CAAA;YAChE,OAAM;QACR,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC9B,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC7B,MAAM,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;IACnC,CAAC;IAED,8CAA8C;IAC9C,KAAK,CAAC,SAAS,CAAC,GAAY,EAAE,MAAM,GAAG,MAAM;QAC3C,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAA;QAC3B,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,MAAM,EAAE,CAAC,CAAA;YACvD,OAAM;QACR,CAAC;QACD,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,yBAAyB;IACzB,KAAK,CAAC,KAAK,CAAC,GAAY,EAAE,YAAY,GAAG,KAAK;QAC5C,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAA;QAC3B,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YACpE,OAAM;QACR,CAAC;QACD,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACjE,MAAM,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;IACpC,CAAC;IAED,+BAA+B;IAC/B,KAAK,CAAC,QAAQ,CAAC,GAAY,EAAE,GAAG,GAAG,MAAM;QACvC,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAA;QAC3B,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAA;YAChD,OAAM;QACR,CAAC;QACD,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;IAChD,CAAC;CACF,CAAA"}
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/primitives/git.ts"],"names":[],"mappings":"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"}

package/dist/primitives/shell.d.ts

@@ -1,3 +1,5 @@
+import { createMaskTransform } from './subprocess.js';
+export { createMaskTransform };
 export interface RunOptions {
     /** Working directory (defaults to context's active module or workspace) */
     cwd?: string;
@@ -12,6 +14,8 @@ export interface ShellOutputResult {
     stdout: string;
     stderr: string;
     exitCode: number;
+    failed?: boolean;
+    signal?: string;
 }
 /**
  * Tagged template runner signature.

package/dist/primitives/shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/primitives/shell.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,UAAU;IACzB,2EAA2E;IAC3E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,sEAAsE;IACtE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,yCAAyC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB;AA4GD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;CACnF;AAED;;;;GAIG;AACH,wBAAgB,GAAG,CAAC,OAAO,EAAE,UAAU,GAAG,cAAc,CAAA;AACxD,wBAAgB,GAAG,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AA4BrG;;GAEG;AACH,wBAAsB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAE1F;AAED;;GAEG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAE9F;AAED,eAAO,MAAM,KAAK;;;;CAIjB,CAAA"}
+{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/primitives/shell.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,mBAAmB,EACpB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B,MAAM,WAAW,UAAU;IACzB,2EAA2E;IAC3E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,sEAAsE;IACtE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,yCAAyC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAkED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;CACnF;AAED;;;;GAIG;AACH,wBAAgB,GAAG,CAAC,OAAO,EAAE,UAAU,GAAG,cAAc,CAAA;AACxD,wBAAgB,GAAG,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AA4BrG;;GAEG;AACH,wBAAsB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAE1F;AAED;;GAEG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAE9F;AAED,eAAO,MAAM,KAAK;;;;CAIjB,CAAA"}

package/dist/primitives/shell.js

@@ -1,9 +1,10 @@
 import path from 'node:path';
-import fs from 'node:fs';
 import { execa } from 'execa';
 import { tryGetContext } from '../context/index.js';
 import { templateToArgv } from '../utils/template.js';
-import { isSecretKey, maskString } from '../utils/mask.js';
+import { maskString } from '../utils/mask.js';
+import { resolveEnv, getSecretValues, runSubprocess, createMaskTransform } from './subprocess.js';
+export { createMaskTransform };
 function resolveCwd(explicitCwd) {
     if (explicitCwd)
         return explicitCwd;
@@ -18,29 +19,6 @@ function resolveCwd(explicitCwd) {
     }
     return process.cwd();
 }
-function resolveEnv(explicitEnv) {
-    const ctx = tryGetContext();
-    const base = { ...process.env };
-    if (ctx?.env) {
-        Object.assign(base, ctx.env);
-    }
-    if (explicitEnv) {
-        Object.assign(base, explicitEnv);
-    }
-    return base;
-}
-function getSecretValues() {
-    const ctx = tryGetContext();
-    if (!ctx?.env)
-        return [];
-    const secrets = [];
-    for (const [k, v] of Object.entries(ctx.env)) {
-        if (isSecretKey(k) && typeof v === 'string' && v.length >= 3) {
-            secrets.push(v);
-        }
-    }
-    return secrets;
-}
 /**
  * Execute command via execa, piping output and handling dryRun.
  */
@@ -50,14 +28,15 @@ async function executeInternal(fileOrCmd, args, options) {
     const env = resolveEnv(options.env);
     const secrets = getSecretValues();
     const cmdDisplay = args ? [fileOrCmd, ...args].join(' ') : fileOrCmd;
+    const maskedCmd = maskString(cmdDisplay, secrets);
     // Dry-run interception
     if (ctx?.dryRun) {
-        const maskedCmd = maskString(cmdDisplay, secrets);
         ctx.logger.info(`[DRY-RUN] Executing: ${maskedCmd} (cwd: ${cwd})`);
         return {
-            stdout: `[DRY-RUN] ${maskedCmd}`,
+            stdout: '',
             stderr: '',
-            exitCode: 0
+            exitCode: 0,
+            failed: false
         };
     }
     const execaOpts = {
@@ -66,38 +45,19 @@ async function executeInternal(fileOrCmd, args, options) {
         reject: options.reject ?? true,
         shell: options.isShell ?? false
     };
-    // If a log file is defined in the context, write to it
-    let logStream;
-    if (ctx?.logFile) {
-        try {
-            logStream = fs.createWriteStream(ctx.logFile, { flags: 'a' });
-        }
-        catch {
-            // Ignored if unable to open log file
-        }
-    }
-    try {
-        const subprocess = args
-            ? execa(fileOrCmd, args, execaOpts)
-            : execa(fileOrCmd, execaOpts);
-        if (subprocess.stdout && logStream) {
-            subprocess.stdout.pipe(logStream, { end: false });
-        }
-        if (subprocess.stderr && logStream) {
-            subprocess.stderr.pipe(logStream, { end: false });
-        }
-        const result = await subprocess;
-        return {
-            stdout: typeof result.stdout === 'string' ? result.stdout : (result.stdout ? String(result.stdout) : ''),
-            stderr: typeof result.stderr === 'string' ? result.stderr : (result.stderr ? String(result.stderr) : ''),
-            exitCode: result.exitCode ?? 0
-        };
-    }
-    finally {
-        if (logStream) {
-            logStream.end();
-        }
-    }
+    const displayCmd = `$ ${maskedCmd}`;
+    ctx?.logger?.info?.(displayCmd);
+    const subprocess = args
+        ? execa(fileOrCmd, args, execaOpts)
+        : execa(fileOrCmd, execaOpts);
+    return runSubprocess({
+        subprocess,
+        displayCmd,
+        cmdText: maskedCmd,
+        errorPrefix: 'Command',
+        reject: options.reject ?? true,
+        secrets
+    });
 }
 export function run(templateOrOptions, ...values) {
     // Overload 2: options passed first, returns a TemplateRunner

package/dist/primitives/shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/primitives/shell.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/primitives/shell.ts"],"names":[],"mappings":"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"}