@amodalai/runtime 0.3.49 → 0.3.51

package/dist/src/agent/completion-tools.integration.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+export {};

package/dist/src/agent/completion-tools.integration.test.js

@@ -0,0 +1,263 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+/**
+ * Phase E.3 + E.4 + E.10 integration test. Pins the agent-admin
+ * completion tools end-to-end through the actual runtime path:
+ * LocalToolExecutor compiles each handler.ts via esbuild, dynamic-imports
+ * the resulting .mjs, and runs it with a CustomToolContext whose
+ * completion ops are backed by the real commitSetup primitive +
+ * deleteSetupState query (against a temp Postgres + temp repo).
+ *
+ * Skips when DATABASE_URL or the agent-admin cache isn't populated.
+ */
+import { existsSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import { homedir, tmpdir } from 'node:os';
+import * as path from 'node:path';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { and, eq } from 'drizzle-orm';
+import { closeDb, deleteSetupState, ensureSchema, getDb, setupState, upsertSetupState, } from '@amodalai/db';
+import { LocalFsBackend } from '../tools/fs/local.js';
+import { commitSetup } from '../setup/commit-setup.js';
+import { LocalToolExecutor } from './tool-executor-local.js';
+const ADMIN_AGENT_PATH = path.join(homedir(), '.amodal', 'admin-agent', 'latest');
+const REQUEST_HANDLER = path.join(ADMIN_AGENT_PATH, 'tools', 'request_complete_setup', 'handler.ts');
+const FORCE_HANDLER = path.join(ADMIN_AGENT_PATH, 'tools', 'force_complete_setup', 'handler.ts');
+const CANCEL_HANDLER = path.join(ADMIN_AGENT_PATH, 'tools', 'cancel_setup', 'handler.ts');
+const HAS_DEPS = Boolean(process.env['DATABASE_URL']) &&
+    existsSync(REQUEST_HANDLER) &&
+    existsSync(FORCE_HANDLER) &&
+    existsSync(CANCEL_HANDLER);
+const describeWhenReady = HAS_DEPS ? describe : describe.skip;
+function makePlan(overrides) {
+    return {
+        templatePackage: '@amodalai/test-template',
+        slots: [],
+        config: [],
+        completion: { title: 'Test Agent', suggestions: [], automationTitle: null },
+        ...overrides,
+    };
+}
+const slackSlot = {
+    label: 'Slack',
+    description: 'Where the digest gets posted.',
+    required: true,
+    multi: false,
+    options: [
+        {
+            packageName: '@amodalai/connection-slack',
+            displayName: 'Slack',
+            authType: 'bearer',
+            oauthScopes: [],
+        },
+    ],
+};
+describeWhenReady('completion tools (Phase E.3 / E.4 / E.10 integration)', () => {
+    let db;
+    let repoRoot;
+    let fs;
+    let executor;
+    let agentId;
+    const scopeId = '';
+    beforeAll(async () => {
+        db = getDb();
+        await ensureSchema(db);
+    });
+    afterAll(async () => {
+        await closeDb();
+    });
+    beforeEach(async () => {
+        repoRoot = await mkdtemp(path.join(tmpdir(), 'completion-'));
+        fs = new LocalFsBackend({ repoRoot });
+        executor = new LocalToolExecutor();
+        agentId = `agent_${randomUUID()}`;
+    });
+    afterEach(async () => {
+        executor.dispose();
+        try {
+            await deleteSetupState(db, agentId, scopeId);
+        }
+        catch {
+            // Best-effort.
+        }
+        await rm(repoRoot, { recursive: true, force: true });
+    });
+    function loadedTool(handlerPath, name) {
+        return {
+            name,
+            description: `${name} test`,
+            parameters: {},
+            confirm: false,
+            timeout: 10_000,
+            env: [],
+            handlerPath,
+            location: path.dirname(handlerPath),
+            hasPackageJson: false,
+            hasSetupScript: false,
+            hasRequirementsTxt: false,
+            hasDockerfile: false,
+            sandboxLanguage: 'typescript',
+        };
+    }
+    function buildCompletionOps() {
+        return {
+            async commit(opts) {
+                const result = await commitSetup({
+                    db,
+                    fs,
+                    agentId,
+                    scopeId,
+                    force: opts?.force ?? false,
+                });
+                if (result.ok) {
+                    return {
+                        ok: true,
+                        alreadyComplete: result.alreadyComplete,
+                        completedAt: result.completedAt.toISOString(),
+                    };
+                }
+                if (result.reason === 'not_ready') {
+                    return { ok: false, reason: 'not_ready', warnings: result.warnings };
+                }
+                return { ok: false, reason: 'no_state', message: result.message };
+            },
+            async cancel() {
+                const deleted = await deleteSetupState(db, agentId, scopeId);
+                return { ok: true, deleted };
+            },
+        };
+    }
+    function buildCtx(opts) {
+        const completion = opts && Object.prototype.hasOwnProperty.call(opts, 'completion')
+            ? opts.completion
+            : buildCompletionOps();
+        return {
+            async request() {
+                throw new Error('not used');
+            },
+            async exec() {
+                throw new Error('not used');
+            },
+            async store() {
+                throw new Error('not used');
+            },
+            env: () => undefined,
+            log: () => undefined,
+            signal: AbortSignal.timeout(30_000),
+            agentId,
+            scopeId,
+            sessionId: 'sess_test',
+            ...(completion ? { completion } : {}),
+            ...(opts?.emitCapture
+                ? {
+                    emit: (event) => {
+                        opts.emitCapture?.push(event);
+                    },
+                }
+                : {}),
+        };
+    }
+    // -------------------------------------------------------------------
+    // request_complete_setup (E.3)
+    // -------------------------------------------------------------------
+    it('request_complete_setup returns not_ready with warnings when slots are missing', async () => {
+        await upsertSetupState(db, agentId, scopeId, {
+            phase: 'configuring',
+            plan: makePlan({ slots: [slackSlot] }),
+        });
+        const result = await executor.execute(loadedTool(REQUEST_HANDLER, 'request_complete_setup'), {}, buildCtx());
+        expect(result).toMatchObject({ ok: false, reason: 'not_ready' });
+        const r = result;
+        expect(r.warnings[0]?.target).toBe('Slack');
+        // amodal.json was NOT written.
+        await expect(readFile(path.join(repoRoot, 'amodal.json'), 'utf-8')).rejects.toThrow();
+    });
+    it('request_complete_setup commits when validation passes and writes amodal.json', async () => {
+        await upsertSetupState(db, agentId, scopeId, {
+            phase: 'configuring',
+            plan: makePlan({
+                slots: [slackSlot],
+                completion: { title: 'Slackbot', suggestions: [], automationTitle: null },
+            }),
+            appendCompleted: [
+                {
+                    slotLabel: 'Slack',
+                    packageName: '@amodalai/connection-slack',
+                    connectedAt: new Date().toISOString(),
+                    validatedAt: new Date().toISOString(),
+                    validationFormatted: 'Found 12 channels',
+                },
+            ],
+        });
+        const result = await executor.execute(loadedTool(REQUEST_HANDLER, 'request_complete_setup'), {}, buildCtx());
+        expect(result).toMatchObject({ ok: true, alreadyComplete: false });
+        const written = JSON.parse(await readFile(path.join(repoRoot, 'amodal.json'), 'utf-8'));
+        expect(written.name).toBe('slackbot');
+        expect(written.packages).toContain('@amodalai/connection-slack');
+    });
+    it('request_complete_setup is idempotent — second call returns alreadyComplete:true', async () => {
+        await upsertSetupState(db, agentId, scopeId, {
+            phase: 'configuring',
+            plan: makePlan(),
+        });
+        const r1 = await executor.execute(loadedTool(REQUEST_HANDLER, 'request_complete_setup'), {}, buildCtx());
+        const r2 = await executor.execute(loadedTool(REQUEST_HANDLER, 'request_complete_setup'), {}, buildCtx());
+        expect(r1).toMatchObject({ ok: true });
+        expect(r2).toMatchObject({ ok: true, alreadyComplete: true });
+    });
+    it('request_complete_setup returns no_ops when ctx.completion is absent', async () => {
+        const result = await executor.execute(loadedTool(REQUEST_HANDLER, 'request_complete_setup'), {}, buildCtx({ completion: null }));
+        expect(result).toMatchObject({ ok: false, reason: 'no_ops' });
+    });
+    // -------------------------------------------------------------------
+    // force_complete_setup (E.4)
+    // -------------------------------------------------------------------
+    it('force_complete_setup commits even with missing required slots', async () => {
+        await upsertSetupState(db, agentId, scopeId, {
+            phase: 'configuring',
+            plan: makePlan({ slots: [slackSlot] }),
+        });
+        const result = await executor.execute(loadedTool(FORCE_HANDLER, 'force_complete_setup'), {}, buildCtx());
+        expect(result).toMatchObject({ ok: true, alreadyComplete: false });
+        const written = await readFile(path.join(repoRoot, 'amodal.json'), 'utf-8');
+        expect(written.length).toBeGreaterThan(0);
+    });
+    // -------------------------------------------------------------------
+    // cancel_setup (E.10)
+    // -------------------------------------------------------------------
+    it('cancel_setup deletes the row + emits a setup_cancelled SSE event', async () => {
+        await upsertSetupState(db, agentId, scopeId, { phase: 'planning' });
+        const captured = [];
+        const result = await executor.execute(loadedTool(CANCEL_HANDLER, 'cancel_setup'), { reason: 'wants a different template' }, buildCtx({ emitCapture: captured }));
+        expect(result).toMatchObject({ ok: true, deleted: true });
+        expect(captured).toHaveLength(1);
+        const event = captured[0];
+        if (event.type !== 'setup_cancelled')
+            throw new Error('expected setup_cancelled');
+        expect(event.reason).toBe('wants a different template');
+        // Row is gone.
+        const fresh = await db
+            .select()
+            .from(setupState)
+            .where(and(eq(setupState.agentId, agentId), eq(setupState.scopeId, scopeId)));
+        expect(fresh).toHaveLength(0);
+    });
+    it('cancel_setup returns deleted: false when no row existed', async () => {
+        const captured = [];
+        const result = await executor.execute(loadedTool(CANCEL_HANDLER, 'cancel_setup'), {}, buildCtx({ emitCapture: captured }));
+        expect(result).toMatchObject({ ok: true, deleted: false });
+        // The setup_cancelled event still fires — the agent emitting it
+        // is signaling intent, not confirming a row delete; Studio
+        // should flip to picker either way.
+        expect(captured).toHaveLength(1);
+    });
+    it('cancel_setup returns no_ops when ctx.completion is absent', async () => {
+        const result = await executor.execute(loadedTool(CANCEL_HANDLER, 'cancel_setup'), {}, buildCtx({ completion: null }));
+        expect(result).toMatchObject({ ok: false, reason: 'no_ops' });
+    });
+});
+//# sourceMappingURL=completion-tools.integration.test.js.map

package/dist/src/agent/completion-tools.integration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"completion-tools.integration.test.js","sourceRoot":"","sources":["../../../src/agent/completion-tools.integration.test.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/load-template-plan.integration.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+export {};

package/dist/src/agent/load-template-plan.integration.test.js

@@ -0,0 +1,152 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+/**
+ * Phase C integration test for `load_template_plan`. Pins the
+ * end-to-end runtime path: LocalToolExecutor compiles the
+ * agent-admin handler via esbuild, dynamic-imports the resulting
+ * .mjs, and runs it with a CustomToolContext carrying a real
+ * `ctx.plan.compose` ops object backed by `composePlan` from
+ * `@amodalai/core`.
+ *
+ * The test sets up a synthetic repo with a fake template package +
+ * connection packages so the entire compose chain runs against real
+ * disk reads. Skips when the agent-admin cache isn't populated.
+ */
+import { existsSync } from 'node:fs';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { homedir, tmpdir } from 'node:os';
+import * as path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { composePlan } from '@amodalai/core';
+import { LocalToolExecutor } from './tool-executor-local.js';
+const ADMIN_AGENT_PATH = path.join(homedir(), '.amodal', 'admin-agent', 'latest');
+const HANDLER = path.join(ADMIN_AGENT_PATH, 'tools', 'load_template_plan', 'handler.ts');
+const HAS_HANDLER = existsSync(HANDLER);
+const describeWhenReady = HAS_HANDLER ? describe : describe.skip;
+describeWhenReady('load_template_plan (Phase C integration)', () => {
+    let repoRoot;
+    let executor;
+    beforeEach(async () => {
+        repoRoot = await mkdtemp(path.join(tmpdir(), 'phase-c-'));
+        executor = new LocalToolExecutor();
+    });
+    afterEach(async () => {
+        executor.dispose();
+        await rm(repoRoot, { recursive: true, force: true });
+    });
+    function loadedTool() {
+        return {
+            name: 'load_template_plan',
+            description: 'load_template_plan test',
+            parameters: {},
+            confirm: false,
+            timeout: 10_000,
+            env: [],
+            handlerPath: HANDLER,
+            location: path.dirname(HANDLER),
+            hasPackageJson: false,
+            hasSetupScript: false,
+            hasRequirementsTxt: false,
+            hasDockerfile: false,
+            sandboxLanguage: 'typescript',
+        };
+    }
+    function buildPlanOps() {
+        return {
+            async compose(templatePackageName) {
+                try {
+                    const composed = await composePlan({ repoPath: repoRoot, templatePackage: templatePackageName });
+                    return { ok: true, plan: composed };
+                }
+                catch (err) {
+                    if (err !== null &&
+                        typeof err === 'object' &&
+                        'code' in err &&
+                        err.code === 'CONFIG_NOT_FOUND') {
+                        return {
+                            ok: false,
+                            reason: 'not_installed',
+                            message: `Template "${templatePackageName}" is not installed.`,
+                        };
+                    }
+                    return {
+                        ok: false,
+                        reason: 'malformed',
+                        message: err instanceof Error ? err.message : String(err),
+                    };
+                }
+            },
+        };
+    }
+    function buildCtx(opts) {
+        // null = explicitly omit ctx.plan; undefined / missing = use the default real ops.
+        const planOps = opts && Object.prototype.hasOwnProperty.call(opts, 'planOps')
+            ? opts.planOps
+            : buildPlanOps();
+        return {
+            async request() {
+                throw new Error('not used');
+            },
+            async exec() {
+                throw new Error('not used');
+            },
+            async store() {
+                throw new Error('not used');
+            },
+            env: () => undefined,
+            log: () => undefined,
+            signal: AbortSignal.timeout(30_000),
+            agentId: 'agent_test',
+            scopeId: '',
+            sessionId: 'sess_test',
+            ...(planOps ? { plan: planOps } : {}),
+        };
+    }
+    async function writeJson(rel, value) {
+        const full = path.join(repoRoot, rel);
+        await mkdir(path.dirname(full), { recursive: true });
+        await writeFile(full, JSON.stringify(value), 'utf-8');
+    }
+    it('returns a SetupPlan composed from the template + connection packages', async () => {
+        await writeJson('node_modules/@amodalai/test-template/template.json', {
+            connections: [
+                {
+                    label: 'Slack',
+                    description: 'Where the digest gets posted.',
+                    options: ['@amodalai/connection-slack'],
+                    required: true,
+                },
+            ],
+        });
+        await writeJson('node_modules/@amodalai/connection-slack/package.json', {
+            name: '@amodalai/connection-slack',
+            amodal: {
+                displayName: 'Slack',
+                auth: { type: 'bearer' },
+                oauth: { scopes: ['chat:write'] },
+            },
+        });
+        const result = await executor.execute(loadedTool(), { packageName: '@amodalai/test-template' }, buildCtx());
+        const r = result;
+        expect(r.ok).toBe(true);
+        expect(r.plan.slots).toHaveLength(1);
+        expect(r.plan.slots[0].label).toBe('Slack');
+        expect(r.plan.slots[0].options[0].displayName).toBe('Slack');
+    });
+    it('surfaces not_installed soft-fail when the template is missing', async () => {
+        const result = await executor.execute(loadedTool(), { packageName: '@amodalai/never-installed' }, buildCtx());
+        expect(result).toMatchObject({ ok: false, reason: 'not_installed' });
+    });
+    it('rejects path-traversal package names without filesystem access', async () => {
+        const result = await executor.execute(loadedTool(), { packageName: '../../etc/passwd' }, buildCtx());
+        expect(result).toMatchObject({ ok: false, reason: 'error' });
+    });
+    it('returns no_ops when ctx.plan is absent', async () => {
+        const result = await executor.execute(loadedTool(), { packageName: '@amodalai/test' }, buildCtx({ planOps: null }));
+        expect(result).toMatchObject({ ok: false, reason: 'no_ops' });
+    });
+});
+//# sourceMappingURL=load-template-plan.integration.test.js.map

package/dist/src/agent/load-template-plan.integration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-template-plan.integration.test.js","sourceRoot":"","sources":["../../../src/agent/load-template-plan.integration.test.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/local-server.js

@@ -11,7 +11,7 @@
  * for config changes (hot reload).
  */
 import express from 'express';
-import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, mkdirSync, writeFileSync, watch } from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { randomUUID } from 'node:crypto';
@@ -67,6 +67,7 @@ import { createChatStreamRouter } from '../routes/chat-stream.js';
 import { createChatRouter } from '../routes/chat.js';
 import { createTaskRouter } from './routes/task.js';
 import { createInspectRouter } from './routes/inspect.js';
+import { createPackageUpdatesRouter } from './routes/package-updates.js';
 import { createFeedbackRouter } from './routes/feedback.js';
 import { FeedbackStore } from './feedback-store.js';
 import { createStoresRouter } from './routes/stores.js';
@@ -326,6 +327,7 @@ export async function createLocalServer(config) {
             systemPrompt: components.systemPrompt,
             toolContextFactory: components.toolContextFactory,
             appId,
+            intents: components.intents,
         });
         return { session, toolContextFactory: components.toolContextFactory };
     };
@@ -510,6 +512,19 @@ export async function createLocalServer(config) {
         }
         return out;
     }
+    // ---------------------------------------------------------------------------
+    // /api/oauth/start + /api/oauth/callback — DEPRECATED
+    //
+    // OAuth start/callback moved to Studio (packages/studio/src/server/routes/oauth.ts).
+    // Studio is the boot surface — it's up before `amodal.json` exists, so the
+    // setup-time Configure flow can run before this runtime even starts. The
+    // runtime now watches `<repoPath>/.amodal/secrets.env` for changes and
+    // reloads `process.env` automatically when Studio writes a new credential.
+    //
+    // These handlers stay in for backward compat (any older Studio build or
+    // direct caller) but are no longer the canonical path. Plan: remove after
+    // one release.
+    // ---------------------------------------------------------------------------
     app.get('/api/oauth/start', (req, res) => {
         void (async () => {
             reapExpiredOauthStates();
@@ -628,13 +643,31 @@ export async function createLocalServer(config) {
             res.status(500).json({ error: msg });
         });
     });
-    // Load any previously-persisted OAuth secrets into process.env on startup.
-    // (Idempotent — overwrites any existing value with the persisted one,
-    // which is what users want after a runtime restart.)
+    // Load any previously-persisted secrets into process.env on startup,
+    // then watch the file for changes — Studio writes to this file when
+    // it completes an OAuth dance or saves a paste-field, so the runtime
+    // needs to pick up new credentials without a restart.
+    //
+    // Path resolution: the admin agent is spawned with `cwd: <admin
+    // agent dir>` but `REPO_PATH=<user's repo>` in env. We want to
+    // watch the USER's secrets.env in both cases (main runtime and
+    // admin agent), so prefer REPO_PATH when set. Falls back to
+    // config.repoPath, which is the right path for the main runtime.
     {
-        const file = path.join(config.repoPath, '.amodal', 'secrets.env');
-        if (existsSync(file)) {
-            const content = readFileSync(file, 'utf-8');
+        const secretsRepoPath = process.env['REPO_PATH'] ?? config.repoPath;
+        const dir = path.join(secretsRepoPath, '.amodal');
+        const file = path.join(dir, 'secrets.env');
+        function loadSecrets(reason) {
+            if (!existsSync(file))
+                return;
+            let content;
+            try {
+                content = readFileSync(file, 'utf-8');
+            }
+            catch (err) {
+                log.warn('secrets_read_failed', { file, error: err instanceof Error ? err.message : String(err) });
+                return;
+            }
             let count = 0;
             for (const line of content.split('\n')) {
                 const eq = line.indexOf('=');
@@ -647,8 +680,28 @@ export async function createLocalServer(config) {
                     count++;
                 }
             }
-            if (count > 0)
-                log.info('secrets_loaded_from_disk', { count, file });
+            if (count > 0) {
+                log.info(reason === 'startup' ? 'secrets_loaded_from_disk' : 'secrets_reloaded_from_disk', { count, file });
+            }
+        }
+        loadSecrets('startup');
+        // Watch the parent dir (not the file directly) so we still pick up
+        // the first write — fs.watch on a non-existent file throws, and
+        // editor-style "atomic save" replaces the inode which most
+        // file-watchers miss when scoped to the path.
+        if (existsSync(dir)) {
+            try {
+                const watcher = watch(dir, { persistent: false }, (_event, filename) => {
+                    if (filename === 'secrets.env')
+                        loadSecrets('change');
+                });
+                watcher.on('error', (err) => {
+                    log.warn('secrets_watcher_error', { file, error: err.message });
+                });
+            }
+            catch (err) {
+                log.warn('secrets_watch_failed', { dir, error: err instanceof Error ? err.message : String(err) });
+            }
         }
     }
     // ---- Secrets write + per-connection detail -----------------------------
@@ -911,6 +964,8 @@ export async function createLocalServer(config) {
     app.use(createTaskRouter({ sessionManager, createTaskSession: createTaskSessionComponents }));
     // Inspect
     app.use(createInspectRouter({ getBundle, repoPath: config.repoPath }));
+    // Package updates (npm view + cache)
+    app.use(createPackageUpdatesRouter({ repoPath: config.repoPath, logger: log }));
     // Messaging channels
     if (channelsResult) {
         app.use('/channels', channelsResult.router);