@agent-spaces/server 0.3.65 → 0.4.0

package/dist/adapters/agent-runtime.js

@@ -3,11 +3,15 @@
  */
 import { ClaudeCodeRuntime } from './claude-code-runtime/index.js';
 import { CodexRuntime } from './codex-runtime.js';
+import { HermesRuntime } from './hermes-runtime.js';
 import { LangChainRuntime } from './langchain-runtime.js';
+import { OhMyPiRuntime } from './oh-my-pi-runtime.js';
 import { OpenAgentSdkRuntime } from './open-agent-sdk-runtime.js';
 export { ClaudeCodeRuntime } from './claude-code-runtime/index.js';
 export { CodexRuntime } from './codex-runtime.js';
+export { HermesRuntime } from './hermes-runtime.js';
 export { LangChainRuntime } from './langchain-runtime.js';
+export { OhMyPiRuntime } from './oh-my-pi-runtime.js';
 export { OpenAgentSdkRuntime } from './open-agent-sdk-runtime.js';
 export function createAgentRuntime(configOrProvider = {}, model) {
     const config = typeof configOrProvider === 'string'
@@ -22,6 +26,10 @@ export function createAgentRuntime(configOrProvider = {}, model) {
             return new CodexRuntime(config);
         case 'langchain':
             return new LangChainRuntime(config);
+        case 'hermes':
+            return new HermesRuntime(config);
+        case 'oh-my-pi':
+            return new OhMyPiRuntime(config);
     }
 }
 //# sourceMappingURL=agent-runtime.js.map

package/dist/adapters/codex-function-tool-bridge.js

@@ -0,0 +1,152 @@
+import { randomUUID } from 'node:crypto';
+import { createServer } from 'node:http';
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError, } from '@modelcontextprotocol/sdk/types.js';
+const AGENT_SPACES_MCP_SERVER_NAME = 'agent-spaces';
+export async function startCodexFunctionToolBridge(functionTools, log) {
+    if (!functionTools?.length)
+        return undefined;
+    const toolsByName = new Map(functionTools.map((functionTool) => [functionTool.name, functionTool]));
+    const mcpServer = new Server({ name: AGENT_SPACES_MCP_SERVER_NAME, version: '0.1.0' }, {
+        capabilities: {
+            tools: { listChanged: false },
+        },
+        instructions: 'Agent Spaces built-in runtime tools for workspace data.',
+    });
+    const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: randomUUID,
+        enableJsonResponse: true,
+    });
+    mcpServer.setRequestHandler(ListToolsRequestSchema, () => ({
+        tools: functionTools.map(toMcpTool),
+    }));
+    mcpServer.setRequestHandler(CallToolRequestSchema, async (request) => {
+        const functionTool = toolsByName.get(normalizeFunctionToolCallName(request.params.name));
+        if (!functionTool) {
+            throw new McpError(ErrorCode.InvalidParams, `Tool ${request.params.name} not found`);
+        }
+        const result = await functionTool.execute(request.params.arguments ?? {});
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: stringifyToolResult(result),
+                },
+            ],
+            ...(isRecord(result) ? { structuredContent: result } : {}),
+        };
+    });
+    await mcpServer.connect(transport);
+    const httpServer = createServer(async (req, res) => {
+        try {
+            const url = new URL(req.url ?? '/', 'http://127.0.0.1');
+            if (url.pathname !== '/mcp') {
+                res.writeHead(404).end('Not found');
+                return;
+            }
+            log?.(`function tool bridge request | method=${req.method ?? '-'} path=${url.pathname}`);
+            await transport.handleRequest(req, res);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            log?.(`function tool bridge request failed | ${message}`);
+            if (!res.headersSent)
+                res.writeHead(500, { 'content-type': 'text/plain; charset=utf-8' });
+            if (!res.writableEnded)
+                res.end(message);
+        }
+    });
+    await listen(httpServer);
+    const address = httpServer.address();
+    if (!address || typeof address === 'string') {
+        await closeHttpServer(httpServer);
+        await mcpServer.close();
+        throw new Error('Failed to start Codex function tool bridge');
+    }
+    const url = `http://127.0.0.1:${address.port}/mcp`;
+    log?.(`function tool bridge started | url=${url} tools=${functionTools.map((tool) => tool.name).join(',')}`);
+    return {
+        name: AGENT_SPACES_MCP_SERVER_NAME,
+        url,
+        close: async () => {
+            await mcpServer.close();
+            await closeHttpServer(httpServer);
+            log?.('function tool bridge stopped');
+        },
+    };
+}
+function toMcpTool(functionTool) {
+    return {
+        name: functionTool.name,
+        description: functionTool.description,
+        inputSchema: normalizeToolInputSchema(functionTool.inputSchema),
+        annotations: toMcpToolAnnotations(functionTool),
+    };
+}
+function normalizeFunctionToolCallName(name) {
+    const prefixedName = agentSpacesMcpToolNamePrefix();
+    return name.startsWith(prefixedName) ? name.slice(prefixedName.length) : name;
+}
+function agentSpacesMcpToolNamePrefix() {
+    return `mcp__${AGENT_SPACES_MCP_SERVER_NAME}__`;
+}
+function normalizeToolInputSchema(schema) {
+    if (schema.type === 'object')
+        return schema;
+    return {
+        type: 'object',
+        properties: normalizeSchemaProperties(schema.properties),
+        required: Array.isArray(schema.required) ? schema.required.map(String) : [],
+    };
+}
+function toMcpToolAnnotations(functionTool) {
+    if (!functionTool.annotations)
+        return undefined;
+    return {
+        readOnlyHint: functionTool.annotations.readOnly,
+        destructiveHint: functionTool.annotations.destructive,
+        openWorldHint: functionTool.annotations.openWorld,
+    };
+}
+function stringifyToolResult(result) {
+    if (result === undefined)
+        return 'null';
+    return JSON.stringify(result, null, 2) ?? String(result);
+}
+function normalizeSchemaProperties(properties) {
+    if (!isRecord(properties))
+        return {};
+    return Object.fromEntries(Object.entries(properties).filter((entry) => isRecord(entry[1])));
+}
+function listen(server) {
+    return new Promise((resolve, reject) => {
+        const onError = (err) => {
+            server.off('listening', onListening);
+            reject(err);
+        };
+        const onListening = () => {
+            server.off('error', onError);
+            resolve();
+        };
+        server.once('error', onError);
+        server.once('listening', onListening);
+        server.listen(0, '127.0.0.1');
+    });
+}
+function closeHttpServer(server) {
+    if (!server.listening)
+        return Promise.resolve();
+    return new Promise((resolve, reject) => {
+        server.close((err) => {
+            if (err)
+                reject(err);
+            else
+                resolve();
+        });
+    });
+}
+function isRecord(value) {
+    return Boolean(value && typeof value === 'object' && !Array.isArray(value));
+}
+//# sourceMappingURL=codex-function-tool-bridge.js.map

package/dist/adapters/codex-runtime.js

@@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, wri
 import { basename, extname, join } from 'node:path';
 import { Codex } from '@openai/codex-sdk';
 import { appendOutputStyleToPrompt, summarizeResult } from './agent-runtime-types.js';
+import { startCodexFunctionToolBridge } from './codex-function-tool-bridge.js';
 /**
  * Runtime backed by OpenAI's Codex SDK.
  * Spawns the bundled Codex CLI and consumes its structured JSONL event stream.
@@ -23,12 +24,15 @@ export class CodexRuntime {
         if (codexHome)
             prepareCodexHome(codexHome, agentDir);
         const skillNames = normalizeSkillNames(options?.skills, codexHome);
-        const configOverrides = buildCodexConfig(this.config, options, skillNames);
         const sandboxMode = normalizeSandboxMode(this.config.permissionMode);
         const approvalPolicy = normalizeApprovalPolicy(this.config.permissionMode);
-        d(`starting | cwd=${cwd} model=${this.config.model ?? 'default'} sandboxMode=${sandboxMode} approvalPolicy=${approvalPolicy} maxTurns=${options?.maxTurns ?? '∞'} mcpServers=${Object.keys(options?.mcpServers ?? {}).join(',') || '-'} skills=${skillNames.join(',') || '-'} codexHome=${codexHome ?? 'default'} sandboxDirs=${options?.sandboxDirs?.join(',') ?? '-'}`);
+        let functionToolBridge;
+        d(`starting | cwd=${cwd} model=${this.config.model ?? 'default'} sandboxMode=${sandboxMode} approvalPolicy=${approvalPolicy} maxTurns=${options?.maxTurns ?? '∞'} mcpServers=${Object.keys(options?.mcpServers ?? {}).join(',') || '-'} functionTools=${options?.functionTools?.map((tool) => tool.name).join(',') || '-'} skills=${skillNames.join(',') || '-'} codexHome=${codexHome ?? 'default'} sandboxDirs=${options?.sandboxDirs?.join(',') ?? '-'}`);
         d(`prompt: ${prompt.slice(0, 300)}${prompt.length > 300 ? '...' : ''}`);
         try {
+            functionToolBridge = await startCodexFunctionToolBridge(options?.functionTools, d);
+            const mcpServers = withFunctionToolBridge(options?.mcpServers, functionToolBridge);
+            const configOverrides = buildCodexConfig(this.config, mcpServers, skillNames);
             const codex = new Codex({
                 apiKey: this.config.apiKey,
                 baseUrl: shouldUseCodexOpenAIBaseUrl(this.config) ? this.config.baseURL : undefined,
@@ -127,6 +131,13 @@ export class CodexRuntime {
             return { success: false, summary: 'Codex execution failed', artifacts: [], error: message, output, sessionId: options?.resumeSessionId };
         }
         finally {
+            try {
+                await functionToolBridge?.close();
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : String(err);
+                d(`function tool bridge close failed | ${message}`);
+            }
             this.abortController = null;
         }
     }
@@ -143,13 +154,13 @@ function buildEnv(config, codexHome) {
         CODEX_INTERNAL_ORIGINATOR_OVERRIDE: process.env.CODEX_INTERNAL_ORIGINATOR_OVERRIDE || 'agent-spaces/server',
     });
 }
-function buildCodexConfig(runtimeConfig, options, skillNames) {
+function buildCodexConfig(runtimeConfig, rawMcpServers, skillNames) {
     const config = {};
     Object.assign(config, buildCodexProviderConfig(runtimeConfig));
     if (runtimeConfig.thinkingEnabled !== false) {
         config.model_reasoning_effort = runtimeConfig.thinkingEffort ?? 'medium';
     }
-    const mcpServers = normalizeMcpServers(options?.mcpServers);
+    const mcpServers = normalizeMcpServers(rawMcpServers);
     if (mcpServers)
         config.mcp_servers = mcpServers;
     if (skillNames.length > 0) {
@@ -157,6 +168,14 @@ function buildCodexConfig(runtimeConfig, options, skillNames) {
     }
     return removeUndefined(config);
 }
+function withFunctionToolBridge(mcpServers, bridge) {
+    if (!bridge)
+        return mcpServers;
+    return {
+        ...(mcpServers ?? {}),
+        [bridge.name]: { url: bridge.url },
+    };
+}
 function buildCodexProviderConfig(runtimeConfig) {
     if (!runtimeConfig.baseURL || shouldUseCodexOpenAIBaseUrl(runtimeConfig))
         return {};

package/dist/adapters/git.js

@@ -170,6 +170,12 @@ export async function gitStatus(workspaceId) {
     try {
         const upstream = await getUpstreamRef(git, result.branch);
         if (upstream) {
+            const counts = await git.raw(['rev-list', '--left-right', '--count', `HEAD...${upstream}`]);
+            const [ahead, behind] = counts.trim().split(/\s+/).map((value) => Number(value));
+            if (Number.isFinite(ahead))
+                result.ahead = ahead;
+            if (Number.isFinite(behind))
+                result.behind = behind;
             const remoteHeadHash = await git.revparse(['--short', upstream]);
             result.remoteHeadHash = remoteHeadHash.trim();
         }
@@ -267,7 +273,7 @@ export async function gitLog(workspaceId, maxCount = 50) {
     const status = await git.status();
     const upstream = await getUpstreamRef(git, status.current || 'HEAD');
     const refs = upstream ? ['HEAD', upstream] : ['HEAD'];
-    const pretty = '%H%x1f%s%x1f%an%x1f%aI%x1e';
+    const pretty = '%H%x1f%P%x1f%s%x1f%an%x1f%aI%x1f%D%x1e';
     const logArgs = ['log', `--max-count=${maxCount}`, `--pretty=format:${pretty}`];
     const raw = await git.raw([...logArgs, ...refs]).catch((err) => {
         if (!upstream)
@@ -278,12 +284,16 @@ export async function gitLog(workspaceId, maxCount = 50) {
         .map(record => record.trim())
         .filter(Boolean)
         .map(record => {
-        const [hash = '', message = '', author = '', date = ''] = record.split('\x1f');
+        const [hash = '', parentHashes = '', message = '', author = '', date = '', refsRaw = ''] = record.split('\x1f');
+        const parents = parentHashes ? parentHashes.split(' ').map(p => p.substring(0, 7)) : [];
+        const refs = refsRaw ? refsRaw.split(', ').map(r => r.trim()).filter(Boolean) : [];
         return {
             hash: hash.substring(0, 7),
+            parents,
             message,
             author,
             date,
+            refs,
         };
     });
 }
@@ -376,7 +386,7 @@ export async function gitPush(workspaceId) {
     const remotes = await git.getRemotes(true);
     if (!remotes.length)
         throw new Error('No remote repository configured. Please add a remote first.');
-    await git.push('origin', branch);
+    await git.push('origin', branch, ['--set-upstream']);
 }
 export async function gitFetch(workspaceId) {
     const ws = getWorkspace(workspaceId);
@@ -392,6 +402,11 @@ export async function gitPull(workspaceId) {
     const git = getGit(ws);
     const status = await git.status();
     const branch = status.current || 'HEAD';
+    const upstream = await getUpstreamRef(git, branch);
+    if (upstream?.startsWith('origin/')) {
+        await git.pull('origin', upstream.slice('origin/'.length));
+        return;
+    }
     await git.pull('origin', branch);
 }
 export async function gitGetRemotes(workspaceId) {
@@ -486,6 +501,13 @@ export async function gitMergeBase(workspaceId) {
     const result = await git.raw(['merge-base', 'HEAD', 'origin/HEAD']).catch(() => '');
     return result.trim();
 }
+export async function gitReset(workspaceId, commitHash, mode = 'mixed') {
+    const ws = getWorkspace(workspaceId);
+    if (!ws)
+        throw new Error('Workspace not found');
+    const git = getGit(ws);
+    await git.reset([`--${mode}`, commitHash]);
+}
 export async function gitGetConfig(scope, workspaceId) {
     const scopeFlag = scope === 'global' ? '--global' : '--local';
     const git = workspaceId ? getGit(getWorkspace(workspaceId)) : simpleGit();