maka-agent 0.2.0-dev.43.20260919 → 0.2.0-dev.45.20260921

package/node_modules/@maka/storage/dist/runtime-policy/coordinator.js

@@ -195,9 +195,6 @@ export class RuntimePolicyCoordinator {
     setDefaultTarget(input) {
         return this.inLane(async (root) => this.projectCatalogMutation(root, await this.catalog.setDefaultTarget(root, input)));
     }
-    migrateSystemSeed(input) {
-        return this.inLane((root) => this.catalog.migrateSystemSeed(root, input));
-    }
     setCredential(rawInput) {
         return this.setCredentialWithAuthority(rawInput, 'client');
     }
@@ -1114,29 +1111,6 @@ export class RuntimePolicyCoordinator {
             });
         }));
     }
-    beginConnectionUsage(connectionId) {
-        return this.inLane(async (root) => {
-            const prepared = await this.prepareConnectionOperation(root, connectionId, 'read_usage');
-            if (prepared.kind !== 'ready')
-                return prepared;
-            const ticket = this.issueTicket('connection_usage', connectionUsageSemanticBasis(prepared));
-            return deepFreeze({
-                kind: 'ready',
-                ticket: ticket,
-                connection: structuredClone(prepared.connection),
-                secretMaterial: prepared.secretMaterial,
-                networkProxy: structuredClone(prepared.networkProxy),
-            });
-        });
-    }
-    /**
-     * Read-only counterpart of `completeConnectionTest`: nothing was written, so
-     * there is no catalog state to revalidate — the ticket is simply spent.
-     */
-    async completeConnectionUsage(ticket) {
-        const claimed = this.claimTicket(ticket, 'connection_usage');
-        await this.completeClaimedTicket(claimed, async () => undefined);
-    }
     async prepareConnectionOperation(root, connectionId, action) {
         const catalog = await this.catalog.read(root);
         const connection = findConnection(catalog, { connectionId });
@@ -1597,9 +1571,6 @@ function connectionTestSemanticBasis(prepared) {
         model: connectionTestModelBasis(prepared.connection),
     };
 }
-function connectionUsageSemanticBasis(prepared) {
-    return { kind: 'connection_usage', ...commonSemanticConnectionBasis(prepared) };
-}
 function isCanonicalConnectionTestModel(connection, modelId) {
     const basis = connectionTestModelBasis(connection);
     // Either source admits: testing a discovered model before enabling it is the
@@ -1712,8 +1683,6 @@ function ticketLabel(kind) {
             return 'model fetch';
         case 'connection_test':
             return 'connection test';
-        case 'connection_usage':
-            return 'connection usage';
     }
 }
 function networkProxyCredentialLocator() {

package/node_modules/@maka/storage/dist/runtime-policy-stores.js

@@ -97,7 +97,6 @@ function createWriterFacade(coordinator) {
             update: (input) => coordinator.updateConnection(input),
             remove: (input) => coordinator.removeConnection(input),
             setDefaultTarget: (input) => coordinator.setDefaultTarget(input),
-            migrateSystemSeed: (input) => coordinator.migrateSystemSeed(input),
         },
         credentialVault: {
             getSnapshot: () => coordinator.getVaultSnapshot(),
@@ -127,8 +126,6 @@ function createWriterFacade(coordinator) {
             completeConnectionOnboarding: (ticket, input) => coordinator.completeConnectionOnboarding(ticket, input),
             beginConnectionTest: (connectionId, modelId) => coordinator.beginConnectionTest(connectionId, modelId),
             completeConnectionTest: (ticket, result) => coordinator.completeConnectionTest(ticket, result),
-            beginConnectionUsage: (connectionId) => coordinator.beginConnectionUsage(connectionId),
-            completeConnectionUsage: (ticket) => coordinator.completeConnectionUsage(ticket),
         },
     };
     freezeFacade(stores);

package/node_modules/@maka/storage/dist/sqlite-usage-schema.js

@@ -203,6 +203,7 @@ export function migrateSqliteUsageDatabase(db) {
 
     CREATE INDEX IF NOT EXISTS usage_llm_calls_session_ts
       ON usage_llm_calls(session_id, ts DESC, id);
+    DROP INDEX IF EXISTS usage_llm_calls_session_id;
   `);
     // A ledger old enough to predate Session attribution has no column to carry
     // through, and the conversion below reads one.
@@ -224,6 +225,8 @@ export function migrateSqliteUsageDatabase(db) {
     INSERT OR IGNORE INTO usage_screen_revision VALUES (1, lower(hex(randomblob(16))), 0);
     CREATE INDEX IF NOT EXISTS usage_llm_calls_screen ON usage_llm_calls(ts DESC, storage_key DESC);
     CREATE INDEX IF NOT EXISTS usage_tool_invocations_screen ON usage_tool_invocations(ts DESC, storage_key DESC);
+    CREATE INDEX IF NOT EXISTS usage_tool_invocations_session_id
+      ON usage_tool_invocations(json_extract(record_json, '$.sessionId'));
     CREATE INDEX IF NOT EXISTS usage_model_call_attempts_screen ON usage_model_call_attempts(completed_at DESC, attempt_id DESC);
   `);
     // These are invalidation metadata, never an accounting or repair authority.
@@ -246,11 +249,26 @@ export function migrateSqliteUsageDatabase(db) {
         for (const event of ['INSERT', 'UPDATE', 'DELETE']) {
             let when = '';
             if (table === 'session_metadata') {
-                // Only title/identity changes affect the Usage activity projection.
+                // Metadata only participates in Usage through activity titles. Avoid
+                // fencing an open screen for Sessions that have no retained activity.
+                const hasUsage = (row) => `(
+          EXISTS (SELECT 1 FROM usage_llm_calls WHERE session_id = ${row}.session_id LIMIT 1)
+          OR EXISTS (
+            SELECT 1 FROM usage_tool_invocations
+            WHERE json_extract(record_json, '$.sessionId') = ${row}.session_id LIMIT 1
+          )
+          OR EXISTS (
+            SELECT 1 FROM usage_model_call_attempts
+            WHERE session_id = ${row}.session_id LIMIT 1
+          )
+        )`;
                 when =
-                    event === 'UPDATE'
-                        ? 'WHEN OLD.name IS NOT NEW.name OR OLD.session_id IS NOT NEW.session_id'
-                        : '';
+                    event === 'INSERT'
+                        ? `WHEN ${hasUsage('NEW')}`
+                        : event === 'DELETE'
+                            ? `WHEN ${hasUsage('OLD')}`
+                            : `WHEN (OLD.name IS NOT NEW.name OR OLD.session_id IS NOT NEW.session_id)
+                  AND (${hasUsage('OLD')} OR ${hasUsage('NEW')})`;
             }
             else if (table === 'core_agent_run_events') {
                 const old = "OLD.event_type = 'model_call_attempt_recorded'";
@@ -265,7 +283,13 @@ export function migrateSqliteUsageDatabase(db) {
                             ? 'WHEN OLD.latest_model_call_sequence IS NOT NULL'
                             : 'WHEN OLD.latest_model_call_sequence IS NOT NEW.latest_model_call_sequence OR OLD.session_id IS NOT NEW.session_id OR OLD.run_id IS NOT NEW.run_id';
             }
-            db.exec(`CREATE TRIGGER IF NOT EXISTS ${table}_screen_${event.toLowerCase()}
+            const trigger = `${table}_screen_${event.toLowerCase()}`;
+            // Schema v8 originally installed unconditional metadata INSERT/DELETE
+            // triggers. Recreate those named triggers so existing databases receive
+            // the narrowed predicate as well as fresh databases.
+            if (table === 'session_metadata')
+                db.exec(`DROP TRIGGER IF EXISTS ${trigger}`);
+            db.exec(`CREATE TRIGGER IF NOT EXISTS ${trigger}
         AFTER ${event} ON ${table} ${when} BEGIN
           UPDATE usage_screen_revision SET revision = revision + 1 WHERE singleton = 1;
         END`);

package/node_modules/@maka/storage/dist/sqlite-workflow-schema.js

@@ -57,6 +57,8 @@ export function migrateSqliteWorkflowDatabase(db) {
       UNIQUE (session_id, store_version)
     );
 
+    -- Retained for existing State Roots: schema validation compares the complete DDL.
+    -- The research writer is retired, but its stored events must survive upgrades.
     CREATE TABLE IF NOT EXISTS workflow_deep_research_events (
       session_id TEXT NOT NULL,
       sequence INTEGER NOT NULL CHECK (sequence >= 0),

package/node_modules/@maka/storage/dist/storage-writer-composition.js

@@ -19,7 +19,6 @@
 import { openInteractiveArtifactStoreForWrite } from './artifact-stores.js';
 import { openInteractiveContextOffloadStoreForWrite } from './context-offload-store.js';
 import { openInteractiveDailyReviewAuthorityForWrite } from './daily-review-authority.js';
-import { openInteractiveDeepResearchStoreForWrite } from './deep-research-authority.js';
 import { openInteractiveExecutionStoresForWrite } from './execution-stores.js';
 import { openInteractiveLongTermMemoryStoreForWrite } from './long-term-memory-store.js';
 import { openInteractiveMemoryBundleStoreForWrite } from './memory-bundle-store.js';
@@ -87,7 +86,6 @@ async function createComposition(lease, options) {
     }
     const scheduledTasks = await openWriter(() => openInteractiveScheduledTaskStoreForWrite(lease), closeWriter);
     const plan = await openWriter(() => openInteractivePlanStoreForWrite(lease), closeWriter);
-    const deepResearch = await openWriter(() => openInteractiveDeepResearchStoreForWrite(lease), closeWriter);
     const dailyReview = await openWriter(() => openInteractiveDailyReviewAuthorityForWrite(lease), closeWriter);
     const goal = execution.goalStore;
     const memoryBundle = await openWriter(() => openInteractiveMemoryBundleStoreForWrite(lease));
@@ -117,7 +115,6 @@ async function createComposition(lease, options) {
         runtimePolicy,
         scheduledTasks,
         plan,
-        deepResearch,
         dailyReview,
         goal,
         memoryBundle,

package/node_modules/@maka/storage/dist/telemetry-file-schema.js

@@ -17,6 +17,7 @@
  * under the License.
  */
 import { MODEL_CALL_KINDS, } from '@maka/core/usage-stats/types';
+import { isUsageTimestamp } from '@maka/core/settings';
 import { isContextBudgetDiagnostic, isPromptSegmentEstimate } from '@maka/core/usage-record-schema';
 function exactKeys(shape) {
     return new Set(Object.keys(shape));
@@ -110,8 +111,8 @@ export function decodePersistedLlmCallRecord(input) {
         'latencyMs',
         'costUsd',
         'startedAt',
-        'ts',
-    ])) {
+    ]) ||
+        !isUsageTimestamp(input.ts)) {
         throw invalid('invalid required LLM number');
     }
     if (input.cachedInputTokens !== input.cacheHitInputTokens) {
@@ -172,7 +173,8 @@ export function decodePersistedToolInvocationRecord(input) {
     if (!strings(input, ['id', 'toolName', 'date'])) {
         throw invalid('invalid required tool string');
     }
-    if (!nonNegativeNumbers(input, ['durationMs', 'bytesIn', 'bytesOut', 'startedAt', 'ts'])) {
+    if (!nonNegativeNumbers(input, ['durationMs', 'bytesIn', 'bytesOut', 'startedAt']) ||
+        !isUsageTimestamp(input.ts)) {
         throw invalid('invalid required tool number');
     }
     if (!['success', 'error', 'aborted'].includes(input.status)) {

package/node_modules/@maka/storage/dist/usage-screen.js

@@ -17,6 +17,7 @@
  * under the License.
  */
 import { createHash, randomUUID } from 'node:crypto';
+import { isUsageScreenSearch, isUsageTimestamp, } from '@maka/core/settings';
 import { acquireOperationalStateDatabase } from './operational-state-store.js';
 import { CACHE_READ_TOKENS } from './model-call-usage-sql.js';
 import { TelemetryQueryValidationError } from './telemetry-repo.js';
@@ -201,12 +202,10 @@ export function createUsageScreenReader(root) {
     };
 }
 function validateQuery(query) {
-    if (!Number.isSafeInteger(query.range.from) ||
-        !Number.isSafeInteger(query.range.to) ||
-        query.range.from < 0 ||
+    if (!isUsageTimestamp(query.range.from) ||
+        !isUsageTimestamp(query.range.to) ||
         query.range.to < query.range.from ||
-        typeof query.search !== 'string' ||
-        query.search.length > 1024 ||
+        !isUsageScreenSearch(query.search) ||
         !['all', 'success', 'error', 'aborted'].includes(query.status)) {
         throw new TelemetryQueryValidationError('Invalid Usage screen query');
     }
@@ -246,7 +245,7 @@ function activity(db, query, cursor) {
         if (!Array.isArray(value) ||
             value.length !== 4 ||
             value[0] !== hash(query) ||
-            !Number.isSafeInteger(value[1]) ||
+            !isUsageTimestamp(value[1]) ||
             value[1] < query.range.from ||
             value[1] > query.range.to ||
             !['canonical', 'legacy', 'tool'].includes(value[2]) ||

package/node_modules/@maka/storage/dist/usage-stores.js

@@ -110,11 +110,15 @@ export function authenticateInteractiveUsageStoresWriter(stores) {
 export async function openInteractiveUsageStoresForRead(lease) {
     const repos = await runWithStorageRootLease(lease, 'interactive', 'read', (root) => openRepos(root, false));
     let closed = false;
+    let barrier = Promise.resolve();
     let closePromise;
     const run = (operation) => {
         if (closed)
             return Promise.reject(new InteractiveUsageStoresClosedError());
-        return runWithStorageRootLease(lease, 'interactive', 'read', async () => operation());
+        const admitted = runWithStorageRootLease(lease, 'interactive', 'read', async () => operation());
+        const settled = admitted.then(() => undefined, () => undefined);
+        barrier = Promise.all([barrier, settled]).then(() => undefined);
+        return admitted;
     };
     const stores = {
         readUsageScreen: (input) => run(() => repos.screen.read(input)),
@@ -128,8 +132,11 @@ export async function openInteractiveUsageStoresForRead(lease) {
             if (closePromise)
                 return closePromise;
             closed = true;
-            repos.screen.close();
-            closePromise = closeRepos(repos.telemetry, repos.modelCalls, repos.pricing);
+            const accepted = barrier;
+            closePromise = accepted.then(async () => {
+                repos.screen.close();
+                await closeRepos(repos.telemetry, repos.modelCalls, repos.pricing);
+            });
             return closePromise;
         },
     };
@@ -230,7 +237,10 @@ function createWriterFacade(lease, telemetry, modelCalls, pricing, screen) {
     });
     const read = (operation) => {
         assertOpen();
-        return run(operation);
+        const admitted = Promise.resolve().then(() => run(operation));
+        const settled = admitted.then(() => undefined, () => undefined);
+        barrier = Promise.all([barrier, settled]).then(() => undefined);
+        return admitted;
     };
     const beginDrain = () => {
         if (drainPromise)

package/node_modules/@maka/storage/package.json

@@ -13,8 +13,6 @@
     "./tool-result-archive-evidence": "./dist/tool-result-archive-evidence.js",
     "./credential-store": "./dist/credential-store.js",
     "./daily-review-authority": "./dist/daily-review-authority.js",
-    "./deep-research-authority": "./dist/deep-research-authority.js",
-    "./deep-research-store": "./dist/deep-research-store.js",
     "./encrypted-file-managed-secret-store": "./dist/encrypted-file-managed-secret-store.js",
     "./execution-stores": "./dist/execution-stores.js",
     "./execution-persistence-provider": "./dist/execution-persistence-provider.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maka-agent",
-  "version": "0.2.0-dev.43.20260919",
+  "version": "0.2.0-dev.45.20260921",
   "description": "Apache Maka (Incubating) developer snapshot; not an Apache release.",
   "license": "Apache-2.0",
   "type": "module",

package/node_modules/@maka/core/dist/connection-usage.js

@@ -1,27 +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.
- */
-/**
- * The providers Maka can read account usage from. The single source of truth
- * for both the settings section's visibility and the runtime dispatch, so a
- * provider that gains a mapper is offered the card in the same change.
- */
-const USAGE_PROVIDERS = new Set(['commandcode-go']);
-export function providerReportsUsage(providerType) {
-    return USAGE_PROVIDERS.has(providerType);
-}

package/node_modules/@maka/core/dist/deep-research-client-progress.js

@@ -1,132 +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 { buildDeepResearchImplementationPrompt } from './deep-research.js';
-import { DEEP_RESEARCH_CLIENT_IMPLEMENTATION_PROMPT_MAX_BYTES, DEEP_RESEARCH_CLIENT_OBJECTIVE_MAX_BYTES, DEEP_RESEARCH_CLIENT_PROGRESS_MAX_BYTES, DEEP_RESEARCH_CLIENT_RECENT_ITEMS_MAX, DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES, } from './deep-research-run.js';
-/** Build the single bounded product projection used by local and hosted clients. */
-export function projectDeepResearchClientProgress(run) {
-    const blockers = [
-        ...run.checklist.flatMap((item) => item.blockedReason ? [labeledBlocker(item.title, item.blockedReason)] : []),
-        ...run.steps.flatMap((step) => step.blockedReason ? [labeledBlocker(step.objective, step.blockedReason)] : []),
-    ];
-    const base = {
-        sessionId: run.sessionId,
-        objective: truncateUtf8(run.objective, DEEP_RESEARCH_CLIENT_OBJECTIVE_MAX_BYTES),
-        scopeLevel: run.scopeLevel,
-        status: run.status,
-        stage: run.stage,
-        round: run.round,
-        createdAt: run.createdAt,
-        updatedAt: run.updatedAt,
-        artifactsCount: run.artifacts.length,
-        stepsCount: run.steps.length,
-        checklist: run.checklist.map((item) => ({
-            itemId: item.itemId,
-            title: truncateUtf8(item.title, DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES),
-            status: item.status,
-            ...(item.blockedReason
-                ? { blockedReason: truncateUtf8(item.blockedReason, DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES) }
-                : {}),
-        })),
-        reportSections: run.reportSections.map(({ key, status }) => ({ key, status })),
-        recentInspectedRefs: run.steps
-            .flatMap((step) => step.inspectedRefs)
-            .slice(-DEEP_RESEARCH_CLIENT_RECENT_ITEMS_MAX)
-            .map((ref) => ({
-            kind: ref.kind,
-            locator: truncateUtf8(ref.locator, DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES),
-            ...(ref.label
-                ? { label: truncateUtf8(ref.label, DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES) }
-                : {}),
-        })),
-        workerRunIds: [...new Set(run.steps.flatMap((step) => step.workerRunIds))].slice(-DEEP_RESEARCH_CLIENT_RECENT_ITEMS_MAX),
-        blockers: [
-            ...new Set(blockers.map((value) => truncateUtf8(value, DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES))),
-        ].slice(-DEEP_RESEARCH_CLIENT_RECENT_ITEMS_MAX),
-        ...(run.reportArtifactId ? { reportArtifactId: run.reportArtifactId } : {}),
-    };
-    if (encodedBytes(base) > DEEP_RESEARCH_CLIENT_PROGRESS_MAX_BYTES) {
-        throw new Error('Deep Research client progress cannot fit its required fields');
-    }
-    if (run.status !== 'completed')
-        return base;
-    return fitImplementationPrompt(base, buildDeepResearchImplementationPrompt(run));
-}
-function labeledBlocker(label, reason) {
-    const separator = ': ';
-    const reasonBudget = Math.floor(DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES * 0.75);
-    const boundedReason = truncateUtf8(reason, reasonBudget);
-    const titleBudget = DEEP_RESEARCH_CLIENT_TEXT_MAX_BYTES - utf8Bytes(separator) - utf8Bytes(boundedReason);
-    return `${truncateUtf8(label, titleBudget)}${separator}${boundedReason}`;
-}
-function fitImplementationPrompt(base, prompt) {
-    const bounded = truncateUtf8(prompt, DEEP_RESEARCH_CLIENT_IMPLEMENTATION_PROMPT_MAX_BYTES);
-    const full = { ...base, implementationPrompt: bounded };
-    if (encodedBytes(full) <= DEEP_RESEARCH_CLIENT_PROGRESS_MAX_BYTES)
-        return full;
-    const characters = Array.from(bounded);
-    let low = 1;
-    let high = characters.length;
-    let best = base;
-    while (low <= high) {
-        const midpoint = Math.floor((low + high) / 2);
-        const candidate = {
-            ...base,
-            implementationPrompt: truncateCharacters(bounded, midpoint),
-        };
-        if (encodedBytes(candidate) <= DEEP_RESEARCH_CLIENT_PROGRESS_MAX_BYTES) {
-            best = candidate;
-            low = midpoint + 1;
-        }
-        else {
-            high = midpoint - 1;
-        }
-    }
-    return best;
-}
-function truncateCharacters(value, maxCharacters) {
-    const characters = Array.from(value);
-    if (characters.length <= maxCharacters)
-        return value;
-    if (maxCharacters === 1)
-        return characters[0] ?? '…';
-    return `${characters.slice(0, maxCharacters - 1).join('')}…`;
-}
-function encodedBytes(value) {
-    return new TextEncoder().encode(JSON.stringify(value)).byteLength;
-}
-function utf8Bytes(value) {
-    return new TextEncoder().encode(value).byteLength;
-}
-function truncateUtf8(value, maxBytes) {
-    const encoder = new TextEncoder();
-    if (encoder.encode(value).byteLength <= maxBytes)
-        return value;
-    const marker = '…';
-    const markerBytes = encoder.encode(marker).byteLength;
-    let bytes = 0;
-    let output = '';
-    for (const character of value) {
-        const characterBytes = encoder.encode(character).byteLength;
-        if (bytes + characterBytes + markerBytes > maxBytes)
-            break;
-        output += character;
-        bytes += characterBytes;
-    }
-    return `${output}${marker}`;
-}