fix(cli): isolate source development profile

Author: MoonOld

CONTRIBUTING.md

@@ -94,8 +94,8 @@ Architecture is documented in [ARCHITECTURE.md](./ARCHITECTURE.md).
 npm run dev          # desktop app with HMR
 npm run dev:full     # full build, then launch the desktop app
 
-npm --workspace maka-agent exec -- maka          # TUI
-npm --workspace maka-agent exec -- maka run "…"  # one non-interactive turn
+npm run cli:dev                                  # TUI with the Maka Dev profile
+npm run cli:dev -- run "…"                       # one non-interactive turn
 ```
 
 Evaluation commands and contracts live in [`packages/eval`](./packages/eval).

README.md

@@ -116,18 +116,20 @@ npm run build
 Then start the TUI or run one Turn:
 
 ```sh
-npm --workspace maka-agent exec -- maka
-npm --workspace maka-agent exec -- maka run "Summarize this repository and identify its most important risk"
-npm --workspace maka-agent exec -- maka run --graph "Implement two independent slices, integrate them, then review the result"
-npm --workspace maka-agent exec -- maka --help
+npm run cli:dev
+npm run cli:dev -- run "Summarize this repository and identify its most important risk"
+npm run cli:dev -- run --graph "Implement two independent slices, integrate them, then review the result"
+npm run cli:dev -- --help
 ```
 
 The TUI also accepts `/graph on`, `/graph off`, and `/graph <task>`. Non-interactive
 `--graph` runs wait for the durable Graph to finish before printing the final
 supervisor output. Graph implementation operators use isolated Git worktrees, so
 the source project must be a clean Git worktree.
 
-The CLI reads the same model connections and workspace configuration written by Desktop. Evaluation specs and adapters live in [`packages/eval`](./packages/eval).
+The repository CLI uses the same `Maka Dev` profile as a development Desktop build. The
+released `maka` binary continues to use the `Maka` profile; the two profiles are not copied or
+synchronized automatically. Evaluation specs and adapters live in [`packages/eval`](./packages/eval).
 
 ## Architecture
 

package.json

@@ -32,6 +32,7 @@
     "test:dist:serial": "node scripts/run-workspace-tests-parallel.mjs --serial",
     "dev": "npm --workspace @maka/desktop run dev:hmr --",
     "dev:full": "npm run build && npm --workspace @maka/desktop run start",
+    "cli:dev": "node packages/cli/dist/dev-cli.js",
     "build": "npm --workspace @maka/code-mode run build && npm --workspace @maka/core run build && npm --workspace @maka/storage run build && npm --workspace @maka/mcp run build && npm --workspace @maka/runtime run build && npm --workspace @maka/runtime-host run build && npm --workspace @maka/computer-use run build && npm --workspace @maka/eval run build && npm --workspace maka-agent run build && npm --workspace @maka/ui run build && npm --workspace @maka/desktop run build",
     "build:test": "npm run clean && npm --workspace @maka/code-mode run build && npm --workspace @maka/core run build && npm --workspace @maka/storage run build && npm --workspace @maka/mcp run build && npm --workspace @maka/runtime run build && npm --workspace @maka/runtime-host run build && npm --workspace @maka/computer-use run build && npm --workspace @maka/eval run build && npm --workspace maka-agent run build && npm --workspace @maka/ui run build && npm --workspace @maka/desktop run build:test",
     "clean": "node scripts/clean-build.mjs",

packages/cli/scripts/chmod-bin.mjs

@@ -3,4 +3,8 @@
 import { chmod } from 'node:fs/promises';
 import { join } from 'node:path';
 
-await chmod(join(process.cwd(), 'dist', 'cli.js'), 0o755);
+await Promise.all(
+  ['cli.js', 'dev-cli.js'].map((entrypoint) =>
+    chmod(join(process.cwd(), 'dist', entrypoint), 0o755),
+  ),
+);

packages/cli/src/__tests__/cli-invocation.test.ts

@@ -0,0 +1,23 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+import { formatMakaResumeCommand, formatMakaResumeHint } from '../cli-invocation.js';
+
+describe('Maka CLI invocation copy', () => {
+  test('keeps release resume instructions on the release launcher', () => {
+    assert.equal(
+      formatMakaResumeHint('maka', 'session-1'),
+      'Resume this session with:\n  maka --resume session-1',
+    );
+  });
+
+  test('keeps development remote and cwd retries on the development launcher', () => {
+    assert.equal(
+      formatMakaResumeHint('npm run cli:dev --', 'session-2', { hostProfileId: 'office' }),
+      'Resume this session with:\n  npm run cli:dev -- --resume session-2 --host office',
+    );
+    assert.equal(
+      formatMakaResumeCommand('npm run cli:dev --', 'session-2', { cwd: '<new-path>' }),
+      'npm run cli:dev -- --resume session-2 --cwd <new-path>',
+    );
+  });
+});

packages/cli/src/__tests__/cli.test.ts

@@ -1,8 +1,12 @@
 import assert from 'node:assert/strict';
 import { spawn } from 'node:child_process';
 import { once } from 'node:events';
+import { access, mkdtemp, mkdir, readFile, readdir, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 import { describe, test } from 'node:test';
-import { parseMakaCliArgs } from '../cli.js';
+import { fileURLToPath } from 'node:url';
+import { parseMakaCliArgs, runMakaCli } from '../cli.js';
 
 describe('Maka CLI args', () => {
   test('selects a Runtime Host and Project for TUI startup', () => {
@@ -13,6 +17,19 @@ describe('Maka CLI args', () => {
     });
   });
 
+  test('uses the active launcher in development help and rejects an empty profile name', async () => {
+    const help = parseMakaCliArgs(['--help'], '0.1.0', 'npm run cli:dev --');
+    assert.equal(help.kind, 'help');
+    if (help.kind === 'help') {
+      assert.match(help.text, /^Usage: npm run cli:dev --$/m);
+      assert.doesNotMatch(help.text, /maka-agent/);
+    }
+    await assert.rejects(
+      runMakaCli(['--version'], { dataProfileName: '', cliCommand: 'invalid' }),
+      /profile name must be a non-empty path segment/,
+    );
+  });
+
   test('establishes the fatal exit before reporting can throw', async () => {
     const cliUrl = new URL('../cli.js', import.meta.url).href;
     const childSource = `
@@ -29,4 +46,91 @@ describe('Maka CLI args', () => {
     assert.equal(signal, null);
     assert.equal(code, 1);
   });
+
+  test('compiled release and repository entries isolate profile writes', async (t) => {
+    const root = await mkdtemp(join(tmpdir(), 'maka-cli-launch-profile-'));
+    t.after(() => rm(root, { recursive: true, force: true }));
+    const home = join(root, 'home');
+    const applicationData = join(root, 'application-data');
+    const releaseRoot = platformProfileRoot(home, applicationData, 'Maka');
+    const developmentRoot = platformProfileRoot(home, applicationData, 'Maka Dev');
+    const env = {
+      ...process.env,
+      HOME: home,
+      USERPROFILE: home,
+      APPDATA: applicationData,
+      XDG_CONFIG_HOME: applicationData,
+      MAKA_TEST_RUNTIME_HOST_CREDENTIAL: 'opaque-token',
+    };
+    const profileArgs = [
+      'runtime-host',
+      'profile',
+      'set',
+      '--id',
+      'office',
+      '--name',
+      'Office',
+      '--tls-url',
+      'wss://runtime.example.com/runtime-host',
+      '--expected-root',
+      'a'.repeat(64),
+      '--credential-env',
+      'MAKA_TEST_RUNTIME_HOST_CREDENTIAL',
+    ];
+
+    const development = await runCompiledCli('dev-cli.js', profileArgs, env);
+    assert.equal(development.signal, null);
+    assert.equal(development.code, 0, development.stderr);
+    await assertProfileFiles(developmentRoot);
+    await assert.rejects(access(releaseRoot), { code: 'ENOENT' });
+
+    await mkdir(releaseRoot, { recursive: true });
+    await writeFile(join(releaseRoot, 'sentinel.txt'), 'release-data\n', 'utf8');
+    assert.deepEqual(await readdir(releaseRoot), ['sentinel.txt']);
+    assert.equal(await readFile(join(releaseRoot, 'sentinel.txt'), 'utf8'), 'release-data\n');
+
+    const developmentProfile = await readFile(
+      join(developmentRoot, 'runtime-host-profiles.json'),
+      'utf8',
+    );
+    const release = await runCompiledCli('cli.js', profileArgs, env);
+    assert.equal(release.signal, null);
+    assert.equal(release.code, 0, release.stderr);
+    await assertProfileFiles(releaseRoot);
+    assert.equal(
+      await readFile(join(developmentRoot, 'runtime-host-profiles.json'), 'utf8'),
+      developmentProfile,
+    );
+  });
 });
+
+async function runCompiledCli(
+  entrypoint: string,
+  args: readonly string[],
+  env: NodeJS.ProcessEnv,
+): Promise<{ code: number | null; signal: NodeJS.Signals | null; stderr: string }> {
+  const child = spawn(
+    process.execPath,
+    [fileURLToPath(new URL(`../${entrypoint}`, import.meta.url)), ...args],
+    { env, stdio: ['ignore', 'ignore', 'pipe'], timeout: 15_000, killSignal: 'SIGKILL' },
+  );
+  let stderr = '';
+  child.stderr.setEncoding('utf8');
+  child.stderr.on('data', (chunk: string) => {
+    stderr += chunk;
+  });
+  const [code, signal] = (await once(child, 'close')) as [number | null, NodeJS.Signals | null];
+  return { code, signal, stderr };
+}
+
+function platformProfileRoot(home: string, applicationData: string, profileName: string): string {
+  if (process.platform === 'darwin') {
+    return join(home, 'Library', 'Application Support', profileName);
+  }
+  return join(applicationData, profileName);
+}
+
+async function assertProfileFiles(root: string): Promise<void> {
+  await access(join(root, 'runtime-host-profiles.json'));
+  await access(join(root, 'runtime-host-client', 'credentials.json'));
+}

packages/cli/src/__tests__/runtime-host-cli-context.test.ts

@@ -1,9 +1,12 @@
 import assert from 'node:assert/strict';
-import { basename } from 'node:path';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { basename, join } from 'node:path';
 import { test } from 'node:test';
 import { fileURLToPath } from 'node:url';
 import {
   connectRemoteRuntimeHostProfile,
+  createClientRuntimeHostProfileCatalog,
   type RuntimeHostConnection,
 } from '@maka/runtime-host/client';
 import {
@@ -165,6 +168,64 @@ test('remote CLI profiles pin root identity and resolve credential outside the p
   await context.close();
 });
 
+test('remote CLI profile state and Client identity use the explicit Client Data Root', async (t) => {
+  const clientDataRoot = await mkdtemp(join(tmpdir(), 'maka-cli-client-root-'));
+  t.after(() => rm(clientDataRoot, { recursive: true, force: true }));
+  const rootId = 'b'.repeat(64);
+  await createClientRuntimeHostProfileCatalog(clientDataRoot).save(
+    {
+      id: 'office',
+      name: 'Office',
+      kind: 'remote',
+      transport: { kind: 'tls', url: 'wss://runtime.example.com/runtime-host' },
+      rootId,
+    },
+    'opaque-token',
+  );
+  let identityPath: string | undefined;
+  let credential: string | undefined;
+  const connection = {
+    rootId,
+    hostEpoch: 'host-remote',
+    connectionId: 'connection-remote',
+    selectedProtocol: 0,
+    closed: new Promise<void>(() => {}),
+    status: async () => ({ state: 'ready' }),
+    subscribeConfigurationChanges: () => () => {},
+    subscribeProjectCatalogChanges: () => () => {},
+    subscribeSessionCatalogChanges: () => () => {},
+    subscribeScheduledTaskChanges: () => () => {},
+    close: async () => {},
+  } as unknown as RuntimeHostConnection;
+
+  const context = await connectRuntimeHostCli(
+    {
+      rootPath: '/unused-local-root',
+      clientDataRoot,
+      surface: 'run',
+      profileId: 'office',
+    },
+    {
+      connectOrSpawn: async () => {
+        throw new Error('remote profile must not use local discovery');
+      },
+      connectRemoteProfile: async (input) => {
+        credential = input.credential;
+        return connection;
+      },
+      loadClientInstanceId: async (path) => {
+        identityPath = path;
+        return '22222222-2222-4222-8222-222222222222';
+      },
+      readConnectionCatalog: async () => ({ revision: 1, defaultTarget: null, connections: [] }),
+    },
+  );
+
+  assert.equal(credential, 'opaque-token');
+  assert.equal(identityPath, join(clientDataRoot, 'runtime-host-client.json'));
+  await context.close();
+});
+
 function hostRegistration(overrides: Partial<{ compatibilityEpoch: number }> = {}) {
   return {
     kind: 'maka-runtime-host' as const,

packages/cli/src/__tests__/runtime-host-run-command.test.ts

@@ -43,15 +43,18 @@ describe('Runtime Host maka run adapter', () => {
           return publicCommandContext(input);
         },
       },
+      { clientDataRoot: '/client-data', cliCommand: 'npm run cli:dev --' },
     );
 
     assert.equal(exitCode, 2);
     assert.equal(contextCreations, 0);
     assert.match(stderr.join(''), /model_connection_disabled/);
-    assert.match(stderr.join(''), /repair connection "openai-main" in `maka`/);
+    assert.match(stderr.join(''), /repair connection "openai-main" in `npm run cli:dev --`/);
   });
 
-  test('routes a remote run through the selected Host profile and canonical Project', async () => {
+  test('routes both launch roots through the selected Host profile and canonical Project', async () => {
+    let selectedWorkspaceRoot: string | undefined;
+    let selectedClientDataRoot: string | undefined;
     let selectedProfile: string | undefined;
     let contextInput: MakaRunContextInput | undefined;
     const connection = remoteReadinessConnection();
@@ -68,7 +71,9 @@ describe('Runtime Host maka run adapter', () => {
         newId: () => 'turn-remote',
       },
       {
-        connect: async (_rootPath, profileId) => {
+        connect: async (rootPath, profileId, clientDataRoot) => {
+          selectedWorkspaceRoot = rootPath;
+          selectedClientDataRoot = clientDataRoot;
           selectedProfile = profileId;
           return {
             connection,
@@ -88,9 +93,12 @@ describe('Runtime Host maka run adapter', () => {
           return publicCommandContext(input);
         },
       },
+      { clientDataRoot: '/client-data', cliCommand: 'npm run cli:dev --' },
     );
 
     assert.equal(exitCode, 0);
+    assert.equal(selectedWorkspaceRoot, '/runtime-host-data');
+    assert.equal(selectedClientDataRoot, '/client-data');
     assert.equal(selectedProfile, 'office');
     assert.equal(contextInput?.projectId, 'project-1');
   });

packages/cli/src/cli-invocation.ts

@@ -0,0 +1,25 @@
+export interface MakaResumeCommandOptions {
+  readonly cwd?: string;
+  readonly hostProfileId?: string;
+}
+
+export function formatMakaResumeCommand(
+  cliCommand: string,
+  sessionId: string,
+  options: MakaResumeCommandOptions = {},
+): string {
+  return [
+    `${cliCommand} --resume ${sessionId}`,
+    ...(options.cwd ? ['--cwd', options.cwd] : []),
+    ...(options.hostProfileId ? ['--host', options.hostProfileId] : []),
+  ].join(' ');
+}
+
+export function formatMakaResumeHint(
+  cliCommand: string,
+  sessionId: string | null,
+  options: MakaResumeCommandOptions = {},
+): string | null {
+  if (!sessionId) return null;
+  return `Resume this session with:\n  ${formatMakaResumeCommand(cliCommand, sessionId, options)}`;
+}