@grunnverk/tree-execution 1.5.0 → 1.5.2

package/dist/tree.d.ts

@@ -2,11 +2,12 @@
 import type { TreeExecutionConfig } from './types/config.js';
 import type { PackageInfo } from '@grunnverk/tree-core';
 export declare const __resetGlobalState: () => void;
-export declare const executePackage: (packageName: string, packageInfo: PackageInfo, commandToRun: string, runConfig: TreeExecutionConfig, isDryRun: boolean, index: number, total: number, allPackageNames: Set<string>, isBuiltInCommand?: boolean) => Promise<{
+export declare const executePackage: (packageName: string, packageInfo: PackageInfo, commandToRun: string, runConfig: TreeExecutionConfig, isDryRun: boolean, index: number, total: number, allPackageNames: Set<string>, isBuiltInCommand?: boolean, context?: any) => Promise<{
     success: boolean;
     error?: any;
     isTimeoutError?: boolean;
     skippedNoChanges?: boolean;
+    skipReason?: "no-changes" | "already-published" | "other";
     logFile?: string;
 }>;
 export declare const execute: (runConfig: TreeExecutionConfig) => Promise<string>;

package/dist/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":";AAwCA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,KAAK,EACR,WAAW,EAEd,MAAM,sBAAsB,CAAC;AA6D9B,eAAO,MAAM,kBAAkB,YAG9B,CAAC;AAimBF,eAAO,MAAM,cAAc,GACvB,aAAa,MAAM,EACnB,aAAa,WAAW,EACxB,cAAc,MAAM,EACpB,WAAW,mBAAmB,EAC9B,UAAU,OAAO,EACjB,OAAO,MAAM,EACb,OAAO,MAAM,EACb,iBAAiB,GAAG,CAAC,MAAM,CAAC,EAC5B,mBAAkB,OAAe,KAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAyanH,CAAC;AA4HF,eAAO,MAAM,OAAO,GAAU,WAAW,mBAAmB,KAAG,OAAO,CAAC,MAAM,CA2oD5E,CAAC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":";AAwCA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,KAAK,EACR,WAAW,EAEd,MAAM,sBAAsB,CAAC;AA8D9B,eAAO,MAAM,kBAAkB,YAG9B,CAAC;AAimBF,eAAO,MAAM,cAAc,GACvB,aAAa,MAAM,EACnB,aAAa,WAAW,EACxB,cAAc,MAAM,EACpB,WAAW,mBAAmB,EAC9B,UAAU,OAAO,EACjB,OAAO,MAAM,EACb,OAAO,MAAM,EACb,iBAAiB,GAAG,CAAC,MAAM,CAAC,EAC5B,mBAAkB,OAAe,EACjC,UAAU,GAAG,KACd,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,YAAY,GAAG,mBAAmB,GAAG,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAsc9K,CAAC;AA4HF,eAAO,MAAM,OAAO,GAAU,WAAW,mBAAmB,KAAG,OAAO,CAAC,MAAM,CA2oD5E,CAAC"}

package/dist/tree.js

@@ -45,6 +45,7 @@ import { getOutputPath, PerformanceTimer, isInGitRepository, runGitWithLock, opt
 // Built-in commands - using stubs for now
 // TODO: Refactor to use callbacks/dependency injection
 import { Updates, Commit, Link, Unlink } from './util/commandStubs.js';
+import { escapeShellArg } from './util/shellEscape.js';
 // Define constants locally
 const DEFAULT_OUTPUT_DIRECTORY = 'output/kodrdriv';
 // Global state to track published versions during tree execution - protected by mutex
@@ -567,7 +568,8 @@ const formatSubprojectError = (packageName, error, _packageInfo, _position, _tot
 // Note: PackageInfo, DependencyGraph, scanForPackageJsonFiles, parsePackageJson,
 // buildDependencyGraph, and topologicalSort are now imported from ../util/dependencyGraph
 // Execute a single package and return execution result
-export const executePackage = async (packageName, packageInfo, commandToRun, runConfig, isDryRun, index, total, allPackageNames, isBuiltInCommand = false) => {
+export const executePackage = async (packageName, packageInfo, commandToRun, runConfig, isDryRun, index, total, allPackageNames, isBuiltInCommand = false, context // PackageExecutionContext - optional for backward compatibility
+) => {
     const packageLogger = createPackageLogger(packageName, index + 1, total, isDryRun);
     const packageDir = packageInfo.path;
     const logger = getLogger();
@@ -609,6 +611,7 @@ export const executePackage = async (packageName, packageInfo, commandToRun, run
     }
     // Track if publish was skipped due to no changes
     let publishWasSkipped = false;
+    let publishSkipReason = 'no-changes';
     // Track execution timing
     const executionTimer = new PerformanceTimer(`Package ${packageName} execution`);
     let executionDuration;
@@ -789,7 +792,20 @@ export const executePackage = async (packageName, packageInfo, commandToRun, run
                     else {
                         commandTimeoutMs = 300000; // 5 minutes default for other commands
                     }
-                    const commandPromise = runWithLogging(effectiveCommand, packageLogger, {}, showOutput, logFilePath);
+                    // Pass context through environment variables for parallel execution isolation
+                    const contextEnv = {};
+                    if (context) {
+                        contextEnv.KODRDRIV_CONTEXT_PACKAGE_NAME = context.packageName;
+                        contextEnv.KODRDRIV_CONTEXT_REPOSITORY_URL = context.repositoryUrl;
+                        contextEnv.KODRDRIV_CONTEXT_REPOSITORY_OWNER = context.repositoryOwner;
+                        contextEnv.KODRDRIV_CONTEXT_REPOSITORY_NAME = context.repositoryName;
+                        contextEnv.KODRDRIV_CONTEXT_GIT_REMOTE = context.gitRemote;
+                        if (runConfig.debug) {
+                            packageLogger.debug(`Using isolated execution context for ${context.packageName}`);
+                            packageLogger.debug(`  Repository: ${context.repositoryOwner}/${context.repositoryName}`);
+                        }
+                    }
+                    const commandPromise = runWithLogging(effectiveCommand, packageLogger, contextEnv, showOutput, logFilePath);
                     const commandTimeoutPromise = new Promise((_, reject) => {
                         setTimeout(() => reject(new Error(`Command timed out after ${commandTimeoutMs / 60000} minutes`)), commandTimeoutMs);
                     });
@@ -804,6 +820,11 @@ export const executePackage = async (packageName, packageInfo, commandToRun, run
                                 (stderr && stderr.includes('KODRDRIV_PUBLISH_SKIPPED')))) {
                             packageLogger.info('Publish skipped for this package; will not record or propagate a version.');
                             publishWasSkipped = true;
+                            // Parse skip reason if available
+                            const reasonMatch = (stdout || stderr || '').match(/KODRDRIV_PUBLISH_SKIP_REASON:(\S+)/);
+                            if (reasonMatch) {
+                                publishSkipReason = reasonMatch[1];
+                            }
                         }
                     }
                     catch (error) {
@@ -904,7 +925,8 @@ export const executePackage = async (packageName, packageInfo, commandToRun, run
         // Show completion status (for publish/commit commands, this supplements the timing message above)
         if (runConfig.debug || runConfig.verbose) {
             if (publishWasSkipped) {
-                packageLogger.info(`⊘ Skipped (no code changes)`);
+                const reasonText = publishSkipReason === 'already-published' ? 'already published' : 'no code changes';
+                packageLogger.info(`⊘ Skipped (${reasonText})`);
             }
             else {
                 packageLogger.info(`✅ Completed successfully`);
@@ -915,7 +937,8 @@ export const executePackage = async (packageName, packageInfo, commandToRun, run
             // Include timing if available
             const timeStr = executionDuration !== undefined ? ` (${(executionDuration / 1000).toFixed(1)}s)` : '';
             if (publishWasSkipped) {
-                logger.info(`[${index + 1}/${total}] ${packageName}: ⊘ Skipped (no code changes)`);
+                const reasonText = publishSkipReason === 'already-published' ? 'already published' : 'no code changes';
+                logger.info(`[${index + 1}/${total}] ${packageName}: ⊘ Skipped (${reasonText})`);
             }
             else {
                 logger.info(`[${index + 1}/${total}] ${packageName}: ✅ Completed${timeStr}`);
@@ -925,7 +948,12 @@ export const executePackage = async (packageName, packageInfo, commandToRun, run
         if (executionDuration === undefined) {
             executionDuration = executionTimer.end();
         }
-        return { success: true, skippedNoChanges: publishWasSkipped, logFile: logFilePath };
+        return {
+            success: true,
+            skippedNoChanges: publishWasSkipped,
+            skipReason: publishWasSkipped ? publishSkipReason : undefined,
+            logFile: logFilePath
+        };
     }
     catch (error) {
         // Record timing even on error
@@ -2011,19 +2039,19 @@ export const execute = async (runConfig) => {
                 globalOptions.push('--overrides');
             // Propagate global options with values
             if (runConfig.model)
-                globalOptions.push(`--model "${runConfig.model}"`);
+                globalOptions.push(`--model ${escapeShellArg(runConfig.model)}`);
             if (runConfig.configDirectory)
-                globalOptions.push(`--config-dir "${runConfig.configDirectory}"`);
+                globalOptions.push(`--config-dir ${escapeShellArg(runConfig.configDirectory)}`);
             if (runConfig.outputDirectory)
-                globalOptions.push(`--output-dir "${runConfig.outputDirectory}"`);
+                globalOptions.push(`--output-dir ${escapeShellArg(runConfig.outputDirectory)}`);
             if (runConfig.preferencesDirectory)
-                globalOptions.push(`--preferences-dir "${runConfig.preferencesDirectory}"`);
+                globalOptions.push(`--preferences-dir ${escapeShellArg(runConfig.preferencesDirectory)}`);
             // Build the command with global options
             const optionsString = globalOptions.length > 0 ? ` ${globalOptions.join(' ')}` : '';
             // Add package argument for link/unlink/updates commands
             const packageArg = runConfig.tree?.packageArgument;
             const packageArgString = (packageArg && (builtInCommand === 'link' || builtInCommand === 'unlink' || builtInCommand === 'updates'))
-                ? ` "${packageArg}"`
+                ? ` ${escapeShellArg(packageArg)}`
                 : '';
             // Add command-specific options
             let commandSpecificOptions = '';
@@ -2063,15 +2091,15 @@ export const execute = async (runConfig) => {
                     commandSpecificOptions += ` --max-diff-bytes ${runConfig.commit.maxDiffBytes}`;
                 }
                 if (runConfig.commit?.direction) {
-                    commandSpecificOptions += ` --direction "${runConfig.commit.direction}"`;
+                    commandSpecificOptions += ` --direction ${escapeShellArg(runConfig.commit.direction)}`;
                 }
                 if (runConfig.commit?.context) {
-                    commandSpecificOptions += ` --context "${runConfig.commit.context}"`;
+                    commandSpecificOptions += ` --context ${escapeShellArg(runConfig.commit.context)}`;
                 }
                 // Push option can be boolean or string (remote name)
                 if (runConfig.commit?.push) {
                     if (typeof runConfig.commit.push === 'string') {
-                        commandSpecificOptions += ` --push "${runConfig.commit.push}"`;
+                        commandSpecificOptions += ` --push ${escapeShellArg(runConfig.commit.push)}`;
                     }
                     else {
                         commandSpecificOptions += ' --push';
@@ -2079,7 +2107,7 @@ export const execute = async (runConfig) => {
                 }
                 // Model-specific options for commit
                 if (runConfig.commit?.model) {
-                    commandSpecificOptions += ` --model "${runConfig.commit.model}"`;
+                    commandSpecificOptions += ` --model ${escapeShellArg(runConfig.commit.model)}`;
                 }
                 if (runConfig.commit?.openaiReasoning) {
                     commandSpecificOptions += ` --openai-reasoning ${runConfig.commit.openaiReasoning}`;
@@ -2103,16 +2131,16 @@ export const execute = async (runConfig) => {
                     commandSpecificOptions += ' --interactive';
                 }
                 if (runConfig.release?.from) {
-                    commandSpecificOptions += ` --from "${runConfig.release.from}"`;
+                    commandSpecificOptions += ` --from ${escapeShellArg(runConfig.release.from)}`;
                 }
                 if (runConfig.release?.to) {
-                    commandSpecificOptions += ` --to "${runConfig.release.to}"`;
+                    commandSpecificOptions += ` --to ${escapeShellArg(runConfig.release.to)}`;
                 }
                 if (runConfig.release?.focus) {
-                    commandSpecificOptions += ` --focus "${runConfig.release.focus}"`;
+                    commandSpecificOptions += ` --focus ${escapeShellArg(runConfig.release.focus)}`;
                 }
                 if (runConfig.release?.context) {
-                    commandSpecificOptions += ` --context "${runConfig.release.context}"`;
+                    commandSpecificOptions += ` --context ${escapeShellArg(runConfig.release.context)}`;
                 }
                 if (runConfig.release?.messageLimit) {
                     commandSpecificOptions += ` --message-limit ${runConfig.release.messageLimit}`;
@@ -2128,7 +2156,7 @@ export const execute = async (runConfig) => {
                 }
                 // Model-specific options for release
                 if (runConfig.release?.model) {
-                    commandSpecificOptions += ` --model "${runConfig.release.model}"`;
+                    commandSpecificOptions += ` --model ${escapeShellArg(runConfig.release.model)}`;
                 }
                 if (runConfig.release?.openaiReasoning) {
                     commandSpecificOptions += ` --openai-reasoning ${runConfig.release.openaiReasoning}`;
@@ -2157,7 +2185,7 @@ export const execute = async (runConfig) => {
             }
             // Link/Unlink externals
             if ((builtInCommand === 'link' || builtInCommand === 'unlink') && runConfig.tree?.externals && runConfig.tree.externals.length > 0) {
-                commandSpecificOptions += ` --externals ${runConfig.tree.externals.join(' ')}`;
+                commandSpecificOptions += ` --externals ${runConfig.tree.externals.map(e => escapeShellArg(e)).join(' ')}`;
             }
             commandToRun = `kodrdriv ${builtInCommand}${optionsString}${packageArgString}${commandSpecificOptions}`;
             isBuiltInCommand = true;
@@ -2354,7 +2382,7 @@ export const execute = async (runConfig) => {
                 // Execute
                 const result = await adapter.execute();
                 // Format and return result
-                const formattedResult = formatParallelResult(result);
+                const formattedResult = formatParallelResult(result, commandToRun);
                 return formattedResult;
             }
             // Sequential execution