fix: resolve create harness Dockerfile paths from command cwd (#1474)

Author: kiwigitops

src/cli/commands/create/command.tsx

@@ -156,7 +156,8 @@ function printCreateHarnessSummary(projectName: string, harnessName: string): vo
 
 /** Handle CLI mode for the harness path */
 async function handleCreateHarnessCLI(options: CreateOptions): Promise<void> {
-  const cwd = options.outputDir ?? getWorkingDirectory();
+  const commandCwd = getWorkingDirectory();
+  const cwd = options.outputDir ?? commandCwd;
   const name = options.name ?? options.projectName;
   const projectName = options.projectName ?? name;
 
@@ -266,6 +267,7 @@ async function handleCreateHarnessCLI(options: CreateOptions): Promise<void> {
         additionalParams,
         containerUri: containerOption.containerUri,
         dockerfilePath: containerOption.dockerfilePath,
+        dockerfileBaseDir: commandCwd,
         skipMemory: options.harnessMemory === false,
         maxIterations: options.maxIterations ? Number(options.maxIterations) : undefined,
         maxTokens: options.maxTokens ? Number(options.maxTokens) : undefined,

src/cli/commands/create/harness-action.ts

@@ -19,6 +19,7 @@ export interface CreateHarnessProjectOptions {
   skipMemory?: boolean;
   containerUri?: string;
   dockerfilePath?: string;
+  dockerfileBaseDir?: string;
   maxIterations?: number;
   maxTokens?: number;
   timeoutSeconds?: number;
@@ -69,6 +70,7 @@ export async function createProjectWithHarness(options: CreateHarnessProjectOpti
       additionalParams: options.additionalParams,
       containerUri: options.containerUri,
       dockerfilePath: options.dockerfilePath,
+      dockerfileBaseDir: options.dockerfileBaseDir ?? options.cwd,
       skipMemory: options.skipMemory,
       maxIterations: options.maxIterations,
       maxTokens: options.maxTokens,

src/cli/primitives/HarnessPrimitive.ts

@@ -153,6 +153,7 @@ export interface AddHarnessOptions {
   /** Harness-level tags, merged with project tags (CFN Tags). */
   tags?: Record<string, string>;
   withInvokeScript?: boolean;
+  dockerfileBaseDir?: string;
   selectedTools?: string[];
   mcpName?: string;
   mcpUrl?: string;
@@ -224,9 +225,10 @@ export class HarnessPrimitive extends BasePrimitive<AddHarnessOptions, Removable
       let dockerfile: string | undefined;
       if (options.dockerfilePath) {
         const projectRoot = dirname(configBaseDir);
+        const dockerfileBaseDir = options.dockerfileBaseDir ?? projectRoot;
         const srcPath = isAbsolute(options.dockerfilePath)
           ? options.dockerfilePath
-          : resolve(projectRoot, options.dockerfilePath);
+          : resolve(dockerfileBaseDir, options.dockerfilePath);
         try {
           await access(srcPath);
         } catch {

src/cli/primitives/__tests__/HarnessPrimitive.test.ts

@@ -0,0 +1,50 @@
+import { ConfigIO } from '../../../lib';
+import { createDefaultProjectSpec } from '../../project';
+import { HarnessPrimitive } from '../HarnessPrimitive';
+import { randomUUID } from 'node:crypto';
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+
+describe('HarnessPrimitive', () => {
+  const tempDirs: string[] = [];
+
+  afterEach(async () => {
+    await Promise.all(tempDirs.map(dir => rm(dir, { recursive: true, force: true })));
+    tempDirs.length = 0;
+  });
+
+  it('resolves create-flow Dockerfile paths from the command working directory', async () => {
+    const commandCwd = join(tmpdir(), `harness-dockerfile-${randomUUID()}`);
+    tempDirs.push(commandCwd);
+    const projectRoot = join(commandCwd, 'HarnessProject');
+    const configBaseDir = join(projectRoot, 'agentcore');
+    await mkdir(projectRoot, { recursive: true });
+
+    const configIO = new ConfigIO({ baseDir: configBaseDir });
+    await configIO.initializeBaseDir();
+    await configIO.writeAWSDeploymentTargets([]);
+    await configIO.writeDeployedState({ targets: {} });
+    await configIO.writeProjectSpec(createDefaultProjectSpec('HarnessProject'));
+
+    await writeFile(join(commandCwd, 'Dockerfile.custom'), 'FROM public.ecr.aws/docker/library/python:3.12\n');
+
+    const result = await new HarnessPrimitive().add({
+      name: 'MyHarness',
+      modelProvider: 'bedrock',
+      modelId: 'global.anthropic.claude-sonnet-4-6',
+      skipMemory: true,
+      dockerfilePath: './Dockerfile.custom',
+      dockerfileBaseDir: commandCwd,
+      configBaseDir,
+    });
+
+    expect(result.success).toBe(true);
+    const harnessDir = join(projectRoot, 'app', 'MyHarness');
+    await expect(readFile(join(harnessDir, 'Dockerfile.custom'), 'utf-8')).resolves.toContain('python:3.12');
+
+    const harnessSpec = JSON.parse(await readFile(join(harnessDir, 'harness.json'), 'utf-8'));
+    expect(harnessSpec.dockerfile).toBe('Dockerfile.custom');
+  });
+});

src/cli/tui/screens/create/useCreateFlow.ts

@@ -624,6 +624,7 @@ export function useCreateFlow(cwd: string): CreateFlowState {
                 ...memoryOptions,
                 containerUri: addHarnessConfig.containerUri,
                 dockerfilePath: addHarnessConfig.dockerfilePath,
+                dockerfileBaseDir: cwd,
                 maxIterations: addHarnessConfig.maxIterations,
                 maxTokens: addHarnessConfig.maxTokens,
                 timeoutSeconds: addHarnessConfig.timeoutSeconds,