maka-agent 0.2.0-dev.4.20260830 → 0.2.0-dev.6.20260830

package/dist/eval-bundle-path.js

@@ -23,7 +23,7 @@ export function configureInstalledEvalBundle(environment = process.env, packageR
     if (Object.hasOwn(environment, MAKA_EVAL_BUNDLE_ENV))
         return;
     try {
-        if (!statSync(resolve(packageRoot, 'packages/eval')).isDirectory())
+        if (!statSync(resolve(packageRoot, 'node_modules/@maka/eval')).isDirectory())
             return;
     }
     catch {

package/dist/pi-tui-runner.js

@@ -870,6 +870,7 @@ export async function runMakaPiTui(input) {
     // in place after `/setup` saves so newly configured models are immediately
     // available — the single source the picker and connection/model lookups read.
     let modelChoices = input.modelChoices;
+    let connectionIdentities = input.connectionIdentities;
     // Monotonic attempt id: each setup submit captures one, and any transition
     // that abandons the in-flight attempt (back, re-pick, close) increments it so
     // a late verify/save settlement cannot clobber a newer attempt.
@@ -1142,7 +1143,7 @@ export async function runMakaPiTui(input) {
         model = summary.model;
         connectionId = summary.llmConnectionId;
         connectionSlug = summary.llmConnectionSlug;
-        const identityNotice = sessionConnectionIdentityNotice(summary, input.connectionIdentities, input.locale ?? 'en');
+        const identityNotice = sessionConnectionIdentityNotice(summary, connectionIdentities, input.locale ?? 'en');
         if (announceIdentity && identityNotice && identityNotice !== connectionIdentityNotice) {
             state.entries.push({ kind: 'notice', level: 'error', text: identityNotice });
         }
@@ -1832,6 +1833,7 @@ export async function runMakaPiTui(input) {
             // attempt must not overwrite choices refreshed by a newer save.
             if (result.refresh.kind === 'ok') {
                 modelChoices = result.refresh.modelChoices;
+                connectionIdentities = result.refresh.connectionIdentities;
             }
             if (input.firstRun) {
                 beginClose();

package/dist/runtime-host-onboarding.js

@@ -50,12 +50,14 @@ export function createRuntimeHostOnboardingSurface(connection) {
                     return result;
                 }
                 try {
+                    const catalog = await readRuntimeHostConnectionCatalog(connection);
                     return {
                         kind: 'ok',
                         connection: result.connection,
                         refresh: {
                             kind: 'ok',
-                            modelChoices: projectRuntimeHostModelChoices(await readRuntimeHostConnectionCatalog(connection)),
+                            modelChoices: projectRuntimeHostModelChoices(catalog),
+                            connectionIdentities: projectRuntimeHostConnectionIdentities(catalog),
                         },
                     };
                 }
@@ -108,6 +110,13 @@ export function projectRuntimeHostModelChoices(catalog) {
     }
     return choices;
 }
+export function projectRuntimeHostConnectionIdentities(catalog) {
+    return catalog.connections.map((connection) => ({
+        connectionId: connection.connectionId,
+        connectionSlug: connection.slug,
+        enabled: connection.enabled,
+    }));
+}
 export function projectProviders(catalog) {
     const entries = [];
     for (const provider of listApiKeyOnboardableProviders()) {

package/dist/runtime-host-tui-context.js

@@ -26,7 +26,7 @@ import { readRuntimeHostAgentGraphEpochs, readRuntimeHostInvocableSkills, readRu
 import { runtimeHostProfileUsesHostWorkspace } from '@maka/runtime-host/profile-kind';
 import { connectRuntimeHostCli, readHostChatDefaultPermissionMode, resolveRuntimeHostCliTarget, } from './runtime-host-cli-context.js';
 import { createRuntimeHostMakaSessionDriver, } from './runtime-host-session-driver.js';
-import { createRuntimeHostOnboardingSurface, projectRuntimeHostModelChoices, } from './runtime-host-onboarding.js';
+import { createRuntimeHostOnboardingSurface, projectRuntimeHostConnectionIdentities, projectRuntimeHostModelChoices, } from './runtime-host-onboarding.js';
 import { createTuiMcpController, } from './tui-mcp-control.js';
 export async function createRuntimeHostTuiContext(input) {
     const connected = await connectRuntimeHostCli({
@@ -88,11 +88,7 @@ export async function createRuntimeHostTuiContext(input) {
             ...(selectedTarget.connectionId === undefined
                 ? {}
                 : { connectionId: selectedTarget.connectionId }),
-            connectionIdentities: catalog.connections.map((entry) => ({
-                connectionId: entry.connectionId,
-                connectionSlug: entry.slug,
-                enabled: entry.enabled,
-            })),
+            connectionIdentities: projectRuntimeHostConnectionIdentities(catalog),
             connectionName: selectedTarget.connection?.name ?? selectedTarget.connectionSlug,
             ...(selectedTarget.connection
                 ? { providerType: selectedTarget.connection.providerType }

package/node_modules/@maka/eval/dist/external-subject.js

@@ -21,7 +21,7 @@ import { join } from 'node:path';
 import { meteringCheckpointMacMatches, readBoundedRegularFile } from './metering-checkpoint.js';
 import { deriveMetering } from './provider-metering.js';
 import { TOOLCHAIN_IDENTITIES, TOOLCHAIN_IDENTITY_ENV, isExternalProfile, verifyToolchainDirectory, } from './toolchain-verification.js';
-const BUNDLED_EXTERNAL_WRAPPER = '/opt/maka-agent/packages/eval/dist/harbor-external-subject.js';
+const BUNDLED_EXTERNAL_WRAPPER = '/opt/maka-agent/node_modules/@maka/eval/dist/harbor-external-subject.js';
 export function createExternalSubjectAdapter() {
     const verifiedToolchains = new Map();
     return {

package/node_modules/@maka/eval/dist/harbor-external-subject.js

@@ -44,7 +44,7 @@ const PROFILE_PREPARERS = {
     codex: async ({ env, home, root, proxyBaseUrl }) => {
         env.OPENAI_API_KEY = 'maka-eval-local';
         env.CODEX_HOME = home;
-        const catalog = rooted(root, '/opt/maka-agent/packages/eval/harbor/deepseek-codex-models.json');
+        const catalog = rooted(root, '/opt/maka-agent/node_modules/@maka/eval/harbor/deepseek-codex-models.json');
         await writeFile(join(home, 'config.toml'), [
             'model_provider = "maka-http"',
             `model_catalog_json = ${JSON.stringify(catalog)}`,
@@ -198,7 +198,7 @@ const PROFILE_PREPARERS = {
         env.DSH_HOME = join(home, 'dsh');
         const profile = join(env.DSH_HOME, 'profiles', DEEPSEEK_HARNESS_PROFILE);
         await mkdir(profile, { recursive: true, mode: 0o700 });
-        const source = rooted(root, '/opt/maka-agent/packages/eval/harbor/deepseek-harness-profile');
+        const source = rooted(root, '/opt/maka-agent/node_modules/@maka/eval/harbor/deepseek-harness-profile');
         for (const file of ['package.json', 'cordis.yml', 'cordis.patch.yml']) {
             await copyFile(join(source, file), join(profile, file));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maka-agent",
-  "version": "0.2.0-dev.4.20260830",
+  "version": "0.2.0-dev.6.20260830",
   "description": "Apache Maka (Incubating) developer snapshot; not an Apache release.",
   "license": "Apache-2.0",
   "type": "module",
@@ -39,7 +39,6 @@
   "files": [
     "dist",
     "native",
-    "packages/eval",
     "README.md",
     "README.zh-CN.md",
     "LICENSE",

package/packages/eval/dist/attempt-store.js

@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { createHash, randomUUID } from 'node:crypto';
-import { link, mkdir, open, readFile, readdir, unlink } from 'node:fs/promises';
-import { join } from 'node:path';
-import { decodeEvalResult } from './result.js';
-export class FileAttemptStore {
-    path;
-    constructor(path) {
-        this.path = path;
-    }
-    async runExclusive(operation) {
-        await mkdir(this.path, { recursive: true });
-        const path = join(this.path, '.writer.lock');
-        let lock;
-        try {
-            lock = await open(path, 'wx', 0o600);
-        }
-        catch (error) {
-            if (error.code === 'EEXIST') {
-                throw new Error(`${path}: experiment already has an active writer`);
-            }
-            throw error;
-        }
-        try {
-            return await operation();
-        }
-        finally {
-            await lock.close();
-            await unlink(path);
-        }
-    }
-    async list(cellId) {
-        const directory = this.#cellDirectory(cellId);
-        let names;
-        try {
-            names = await readdir(directory);
-        }
-        catch (error) {
-            if (error.code === 'ENOENT')
-                return [];
-            throw error;
-        }
-        const attempts = await Promise.all(names
-            .filter((name) => /^\d{6}\.json$/u.test(name))
-            .sort()
-            .map(async (name) => {
-            const attempt = decodeAttempt(JSON.parse(await readFile(join(directory, name), 'utf8')));
-            const sequence = Number(name.slice(0, 6));
-            if (attempt.cellId !== cellId || attempt.sequence !== sequence) {
-                throw new Error('attempt file does not match its immutable identity');
-            }
-            return attempt;
-        }));
-        return attempts;
-    }
-    async append(attempt) {
-        const record = decodeAttempt(attempt);
-        const expected = ((await this.list(record.cellId)).at(-1)?.sequence ?? 0) + 1;
-        if (record.sequence !== expected)
-            throw new Error(`attempt sequence must be ${expected}`);
-        const directory = this.#cellDirectory(record.cellId);
-        await mkdir(directory, { recursive: true });
-        const finalPath = join(directory, `${String(record.sequence).padStart(6, '0')}.json`);
-        const temporaryPath = `${finalPath}.${randomUUID()}.tmp`;
-        const temporary = await open(temporaryPath, 'wx', 0o600);
-        try {
-            await temporary.writeFile(`${JSON.stringify(record)}\n`);
-            await temporary.sync();
-            await temporary.close();
-            await link(temporaryPath, finalPath);
-        }
-        finally {
-            await temporary.close().catch(() => undefined);
-            await unlink(temporaryPath).catch(() => undefined);
-        }
-    }
-    #cellDirectory(cellId) {
-        return join(this.path, createHash('sha256').update(cellId).digest('hex'));
-    }
-}
-function decodeAttempt(value) {
-    const attempt = exact(value, 'attempt', [
-        'cellId',
-        'sequence',
-        'startedAt',
-        'completedAt',
-        'result',
-    ]);
-    return {
-        cellId: nonempty(attempt.cellId, 'attempt.cellId'),
-        sequence: positiveInteger(attempt.sequence, 'attempt.sequence'),
-        startedAt: nonnegative(attempt.startedAt, 'attempt.startedAt'),
-        completedAt: nonnegative(attempt.completedAt, 'attempt.completedAt'),
-        result: decodeEvalResult(attempt.result, 'attempt.result'),
-    };
-}
-function exact(value, where, fields) {
-    if (!value || typeof value !== 'object' || Array.isArray(value))
-        throw new Error(`${where} must be an object`);
-    const record = value;
-    if (Object.keys(record).length !== fields.length ||
-        fields.some((field) => !Object.hasOwn(record, field))) {
-        throw new Error(`${where} fields are invalid`);
-    }
-    return record;
-}
-function nonempty(value, where) {
-    if (typeof value !== 'string' || value.length === 0)
-        throw new Error(`${where} is invalid`);
-    return value;
-}
-function positiveInteger(value, where) {
-    if (!Number.isSafeInteger(value) || value < 1)
-        throw new Error(`${where} is invalid`);
-    return value;
-}
-function nonnegative(value, where) {
-    if (typeof value !== 'number' || !Number.isFinite(value) || value < 0)
-        throw new Error(`${where} is invalid`);
-    return value;
-}

package/packages/eval/dist/cli.js

@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { readFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
-import { createExternalSubjectAdapter } from './external-subject.js';
-import { createHarborExecutor, createPierExecutor, } from './harness-executor.js';
-import { openExperimentDirectory } from './experiment-directory.js';
-import { createMakaSubjectAdapter } from './maka-subject.js';
-import { runExperiment } from './runner.js';
-import { parseExperimentSpec } from './spec.js';
-const USAGE = 'usage: maka eval run <spec.json> --out <directory> [--cell <cell-id>]';
-export async function runMakaEvalCli(argv, overrides = {}) {
-    const controller = overrides.signal ? undefined : new AbortController();
-    const signal = overrides.signal ?? controller?.signal;
-    let interrupted;
-    const interrupt = () => {
-        interrupted = 130;
-        controller?.abort();
-    };
-    const terminate = () => {
-        interrupted = 143;
-        controller?.abort();
-    };
-    if (controller) {
-        process.once('SIGINT', interrupt);
-        process.once('SIGTERM', terminate);
-    }
-    try {
-        const command = parseArgs(argv);
-        if (command.kind === 'help') {
-            (overrides.stdout ?? process.stdout.write.bind(process.stdout))(`${USAGE}\n`);
-            return 0;
-        }
-        const specPath = resolve(command.specPath);
-        const spec = parseExperimentSpec(JSON.parse(await readFile(specPath, 'utf8')));
-        const directory = await openExperimentDirectory(resolve(command.outDir), spec);
-        let executor;
-        if (overrides.loadExecutor) {
-            executor = overrides.loadExecutor(spec, specPath);
-        }
-        else {
-            const builtin = builtinExecutor(spec, specPath);
-            await builtin.preflight({
-                subjectCredentialNames: [
-                    ...new Set(spec.subjects.flatMap((subject) => subject.credentials)),
-                ],
-                ...(signal ? { signal } : {}),
-            });
-            executor = builtin;
-        }
-        const results = await runExperiment({
-            spec,
-            store: directory.attempts,
-            executor,
-            subjects: overrides.subjects ?? [createMakaSubjectAdapter(), createExternalSubjectAdapter()],
-            ...(command.cellIds.length > 0 ? { cellIds: command.cellIds } : {}),
-            ...(signal ? { signal } : {}),
-        });
-        const incomplete = spec.tasks.length * spec.repetitions * spec.subjects.length - results.size;
-        (overrides.stdout ?? process.stdout.write.bind(process.stdout))(`${JSON.stringify({ experimentId: spec.id, cells: results.size, incomplete })}\n`);
-        return interrupted ?? (incomplete === 0 ? 0 : 1);
-    }
-    catch (error) {
-        (overrides.stderr ?? process.stderr.write.bind(process.stderr))(`maka eval: ${error instanceof Error ? error.message : String(error)}\n${USAGE}\n`);
-        return interrupted ?? 2;
-    }
-    finally {
-        if (controller) {
-            process.removeListener('SIGINT', interrupt);
-            process.removeListener('SIGTERM', terminate);
-        }
-    }
-}
-function builtinExecutor(spec, specPath) {
-    if (spec.executor.kind === 'harbor')
-        return createHarborExecutor(spec.executor.config, specPath);
-    if (spec.executor.kind === 'pier')
-        return createPierExecutor(spec.executor.config, specPath);
-    throw new Error(`unsupported executor: ${spec.executor.kind}`);
-}
-function parseArgs(argv) {
-    if (argv.length === 1 && (argv[0] === '--help' || argv[0] === '-h'))
-        return { kind: 'help' };
-    if (argv[0] !== 'run' || !argv[1] || argv[1].startsWith('-'))
-        throw new Error(USAGE);
-    let outDir;
-    const cellIds = [];
-    for (let index = 2; index < argv.length; index += 2) {
-        const flag = argv[index];
-        const value = argv[index + 1];
-        if (!value || value.startsWith('-'))
-            throw new Error(`${flag} requires a value`);
-        if (flag === '--out')
-            outDir = value;
-        else if (flag === '--cell')
-            cellIds.push(value);
-        else
-            throw new Error(`unexpected argument: ${flag}`);
-    }
-    if (!outDir)
-        throw new Error('--out is required');
-    return { kind: 'run', specPath: argv[1], outDir, cellIds };
-}

package/packages/eval/dist/experiment-directory.js

@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { randomUUID } from 'node:crypto';
-import { link, mkdir, open, readFile, unlink } from 'node:fs/promises';
-import { join } from 'node:path';
-import { FileAttemptStore } from './attempt-store.js';
-import { parseExperimentSpec } from './spec.js';
-export async function openExperimentDirectory(root, spec) {
-    await mkdir(root, { recursive: true });
-    const specPath = join(root, 'experiment.json');
-    const temporaryPath = join(root, `.experiment-${randomUUID()}.tmp`);
-    const canonical = `${canonicalJson(spec)}\n`;
-    const temporary = await open(temporaryPath, 'wx', 0o600);
-    try {
-        await temporary.writeFile(canonical);
-        await temporary.sync();
-        await temporary.close();
-        await link(temporaryPath, specPath);
-    }
-    catch (error) {
-        if (error.code !== 'EEXIST')
-            throw error;
-        const existing = parseExperimentSpec(JSON.parse(await readFile(specPath, 'utf8')));
-        if (canonicalJson(existing) !== canonicalJson(spec))
-            throw new Error('experiment spec differs');
-    }
-    finally {
-        await temporary.close().catch(() => undefined);
-        await unlink(temporaryPath).catch(() => undefined);
-    }
-    return { root, specPath, attempts: new FileAttemptStore(join(root, 'attempts')) };
-}
-function canonicalJson(value) {
-    if (Array.isArray(value))
-        return `[${value.map(canonicalJson).join(',')}]`;
-    if (value && typeof value === 'object') {
-        return `{${Object.entries(value)
-            .sort(([left], [right]) => left.localeCompare(right))
-            .map(([key, child]) => `${JSON.stringify(key)}:${canonicalJson(child)}`)
-            .join(',')}}`;
-    }
-    return JSON.stringify(value);
-}

package/packages/eval/dist/experiment.js

@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export function decodeJsonObject(value, where) {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-        throw new Error(`${where} must be an object`);
-    }
-    return Object.fromEntries(Object.entries(value).map(([key, child]) => [key, decodeJsonValue(child, `${where}.${key}`)]));
-}
-function decodeJsonValue(value, where) {
-    if (value === null || typeof value === 'string' || typeof value === 'boolean')
-        return value;
-    if (typeof value === 'number' && Number.isFinite(value))
-        return value;
-    if (Array.isArray(value)) {
-        return value.map((child, index) => decodeJsonValue(child, `${where}[${index}]`));
-    }
-    if (value && typeof value === 'object')
-        return decodeJsonObject(value, where);
-    throw new Error(`${where} must be JSON`);
-}
-export function expandExperiment(spec) {
-    return spec.tasks.flatMap((task) => Array.from({ length: spec.repetitions }, (_, repetition) => repetition + 1).flatMap((repetition) => spec.subjects.map((subject) => ({
-        id: `${task.id}::${repetition}::${subject.id}`,
-        experimentId: spec.id,
-        benchmark: spec.benchmark,
-        executor: spec.executor,
-        subject,
-        task,
-        repetition,
-        budget: spec.budget,
-        verifier: spec.verifier,
-    }))));
-}