@xcanwin/manyoyo 8.4.0 → 8.5.0

package/lib/web/server.js

@@ -13,11 +13,15 @@ const { buildContainerRunArgs, hasNetworkArg } = require('../container-run');
 const { buildContainerIntegration, mergeIntegration } = require('../plugin');
 const { applyAptMirror } = require('../mirrors');
 const containerState = require('../container-state');
-const { buildExecArgs } = require('../container-exec');
+const { buildExecArgs, resolveContainerId } = require('../container-exec');
 const { createNetworkManager, NETWORK_NAME } = require('../container-network');
 const { normalizePolicy } = require('../network-policy');
 const { withEnvEndpoints } = require('../network-endpoints');
-const { createEgressProxy, REALM: EGRESS_REALM } = require('../egress-proxy');
+const { egressPaths, isSidecarName } = require('../egress-sidecar');
+const { read: readDenied } = require('../egress-denied');
+const { isBrowserBackground } = require('../browser-background');
+const { createDeniedNotifier } = require('./denied-notify');
+const { domainAllowed } = require('../network-policy');
 const { createPortForwarder } = require('../port-forward');
 const { createContainerManageRoutes, pendingRisks } = require('./container-manage');
 const { resolveManageOptions } = require('../container-manage-options');
@@ -3156,7 +3160,7 @@ function listWebManyoyoContainers(ctx) {
     const candidates = [];
     output.trim().split('\n').forEach(line => {
         const [name, status, image] = line.split('\t');
-        if (!ctx.isValidContainerName(name)) {
+        if (!ctx.isValidContainerName(name) || isSidecarName(name)) {
             return;
         }
         const imageName = image || '';
@@ -3324,55 +3328,23 @@ async function cleanupStaleSetupTestContainers(ctx) {
     }
 }
 
-// 过滤代理固定端口：容器里的代理地址写在各自的 managed.env 里，serve 重启后端口不能变
-const EGRESS_PROXY_PORT = 8936;
-
-function probeEgressProxy(port) {
-    return new Promise(resolve => {
-        const req = http.request({ host: '127.0.0.1', port, method: 'GET', path: 'http://manyoyo.invalid/', timeout: 3000 }, res => {
-            res.resume();
-            resolve(res.statusCode === 407 && String(res.headers['proxy-authenticate'] || '').includes(EGRESS_REALM));
-        });
-        req.on('error', () => resolve(false));
-        req.on('timeout', () => { req.destroy(); resolve(false); });
-        req.end();
-    });
-}
-
-// 过滤代理（域名白名单的强制点）：有 allowlist 容器时才启动；同机另一个 serve 已经提供就复用它
-function ensureWebEgressProxy(ctx, state) {
-    if (!state.egressProxyPromise) {
+// Agent 一轮对话里，容器被过滤代理拦下的新域名（浏览器后台请求不算）：只在 allowlist 容器上轮询
+function createWebDeniedNotifier(ctx, sessionRef, emit) {
+    try {
         const homeDir = ctx.homeDir || os.homedir();
-        // 每个 CONNECT 都读策略 / token：加 2 秒缓存，保存策略后最多 2 秒生效
-        const cache = new Map();
-        const cached = (key, load) => {
-            const hit = cache.get(key);
-            if (hit && Date.now() - hit.at < 2000) return hit.value;
-            const value = load();
-            cache.set(key, { at: Date.now(), value });
-            return value;
-        };
-        const proxy = createEgressProxy({
-            upstream: process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy || '',
-            getToken: id => cached(`t:${id}`, () => containerState.readEgressToken(homeDir, id)),
-            getPolicy: id => cached(`p:${id}`, () => {
-                try {
-                    const policy = normalizePolicy(containerState.readNetworkRaw(homeDir, id) || undefined);
-                    return { preset: policy.preset, domains: policy.egress.domains, rules: policy.egress.rules };
-                } catch (e) {
-                    return null;
-                }
-            })
+        const id = resolveContainerId(ctx.dockerExecArgs, sessionRef.containerName);
+        if (!id || !containerState.stateExists(homeDir, id)) return null;
+        const deniedDir = egressPaths(homeDir).denied;
+        const policyOf = () => normalizePolicy(containerState.readNetworkRaw(homeDir, id) || undefined);
+        if (policyOf().preset !== 'allowlist') return null;
+        return createDeniedNotifier({
+            read: () => readDenied(deniedDir, id),
+            isIgnored: host => isBrowserBackground(host) || domainAllowed(policyOf().egress.domains, host),
+            emit
         });
-        state.egressProxyPromise = proxy.start({ host: '0.0.0.0', port: EGRESS_PROXY_PORT })
-            .then(port => { state.egressProxy = proxy; return { port }; })
-            .catch(async error => {
-                if (error.code === 'EADDRINUSE' && await probeEgressProxy(EGRESS_PROXY_PORT)) return { port: EGRESS_PROXY_PORT };
-                state.egressProxyPromise = null;
-                throw new Error(error.code === 'EADDRINUSE' ? `过滤代理端口 ${EGRESS_PROXY_PORT} 被其他程序占用` : error.message);
-            });
+    } catch (e) {
+        return null;
     }
-    return state.egressProxyPromise;
 }
 
 function getWebPortForwarder(ctx, state) {
@@ -3396,7 +3368,14 @@ async function startContainerServices(ctx, state) {
     const manager = getWebNetworkManager(ctx, state);
     const homeDir = ctx.homeDir || os.homedir();
     sweepStaleExecEnvFiles(homeDir);
-    state.networkWatch = manager.watchStarts();
+    const reconcile = () => reconcileContainerServices(ctx, state, manager);
+    state.networkWatch = manager.watchStarts({ onReconnect: reconcile });
+    await reconcile();
+}
+
+// 拉起 autostartOnServe 的容器并恢复端口暴露：serve 启动时做一次，运行时重启后（事件流重连）再做一次，幂等
+async function reconcileContainerServices(ctx, state, manager) {
+    const homeDir = ctx.homeDir || os.homedir();
     const forwarder = getWebPortForwarder(ctx, state);
     // 以运行时里真实存在的容器为准（按 id 对应名字）；状态目录里有、容器却没有的是孤儿，既不拉起也不转发
     state.containerNames = new Map((await manager.listManaged()).map(item => [item.id, item.name]));
@@ -3501,7 +3480,6 @@ function getWebNetworkManager(ctx, state) {
             homeDir: ctx.homeDir || os.homedir(),
             imageRef: () => `${ctx.imageName}:${ctx.imageVersion}`,
             getMirrorUrls: () => Object.values(readWebMirrors(state)).filter(Boolean),
-            getFilterProxy: () => ensureWebEgressProxy(ctx, state),
             warn: message => ctx.logger.warn(message)
         });
     }
@@ -4806,6 +4784,9 @@ function spawnWebTerminalProcess(ctx, containerName, cols, rows) {
         'if [ -f ~/.bashrc ]; then',
         '    . ~/.bashrc',
         'fi',
+        'if [ -f /run/manyoyo-sys/env.sh ]; then',
+        '    . /run/manyoyo-sys/env.sh',
+        'fi',
         'if [ -n "${MANYOYO_TERM_COLS:-}" ] && [ -n "${MANYOYO_TERM_ROWS:-}" ]; then',
         '    COLUMNS="$MANYOYO_TERM_COLS"',
         '    LINES="$MANYOYO_TERM_ROWS"',
@@ -6294,69 +6275,79 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
 
                 let lastPartialPersistAt = 0;
-                try {
-                    const result = await execAgentInWebContainerStream(ctx, state, sessionRef, command, {
-                        agentProgram: agentMeta.agentProgram,
-                        // 复用路由入口占好的那把锁，而不是另起一份运行登记
-                        runState,
-                        onEvent: event => {
-                            // token 级增量：只走网线，不进事件日志，历史落盘按
-                            // AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS 节流
-                            const isPartialDelta = event && event.type === 'content_delta' && event.partial === true;
-                            if (event && event.type === 'trace' && event.text) {
-                                traceLines.push(String(event.text));
-                                if (event.traceEvent && typeof event.traceEvent === 'object') {
-                                    traceEvents.push(event.traceEvent);
-                                }
-                                patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
-                                    content: traceLines.join('\n'),
-                                    traceEvents: traceEvents.slice(),
+                const handleStreamEvent = event => {
+                    // token 级增量：只走网线，不进事件日志，历史落盘按
+                    // AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS 节流
+                    const isPartialDelta = event && event.type === 'content_delta' && event.partial === true;
+                    if (event && event.type === 'trace' && event.text) {
+                        traceLines.push(String(event.text));
+                        if (event.traceEvent && typeof event.traceEvent === 'object') {
+                            traceEvents.push(event.traceEvent);
+                        }
+                        patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
+                            content: traceLines.join('\n'),
+                            traceEvents: traceEvents.slice(),
+                            pending: true
+                        });
+                    }
+                    if (event && event.type === 'content_delta' && typeof event.content === 'string') {
+                        const now = Date.now();
+                        const shouldPersist = !isPartialDelta
+                            || now - lastPartialPersistAt >= AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS;
+                        if (!streamingReplyMessageId) {
+                            const streamingReplyMessage = appendWebSessionMessage(
+                                state.webHistoryDir,
+                                sessionRef,
+                                'assistant',
+                                event.content,
+                                {
+                                    mode: 'agent',
+                                    streamingReply: true,
                                     pending: true
-                                });
-                            }
-                            if (event && event.type === 'content_delta' && typeof event.content === 'string') {
-                                const now = Date.now();
-                                const shouldPersist = !isPartialDelta
-                                    || now - lastPartialPersistAt >= AGENT_STREAM_PARTIAL_PERSIST_INTERVAL_MS;
-                                if (!streamingReplyMessageId) {
-                                    const streamingReplyMessage = appendWebSessionMessage(
-                                        state.webHistoryDir,
-                                        sessionRef,
-                                        'assistant',
-                                        event.content,
-                                        {
-                                            mode: 'agent',
-                                            streamingReply: true,
-                                            pending: true
-                                        }
-                                    );
-                                    streamingReplyMessageId = streamingReplyMessage && streamingReplyMessage.id
-                                        ? streamingReplyMessage.id
-                                        : '';
-                                    lastPartialPersistAt = now;
-                                } else if (shouldPersist) {
-                                    patchWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId, {
-                                        content: event.content,
-                                        pending: true
-                                    });
-                                    lastPartialPersistAt = now;
                                 }
-                            }
-                            if (isPartialDelta) {
-                                lastStreamWriteAt = Date.now();
-                                // 只发增量片段：前端在 content_chunk 上做追加，
-                                // reset 表示换了一条 assistant 消息、从空白重新开始
-                                sendNdjson(res, event.chunkReset === true
-                                    ? { type: 'content_chunk', text: '', reset: true }
-                                    : { type: 'content_chunk', text: event.chunk });
-                                return;
-                            }
-                            emitStreamEvent(event, resolveWebStreamControlEventType(event), {
-                                transportType: event && event.type ? event.type : '',
-                                text: event && (event.text || event.content) ? String(event.text || event.content) : ''
+                            );
+                            streamingReplyMessageId = streamingReplyMessage && streamingReplyMessage.id
+                                ? streamingReplyMessage.id
+                                : '';
+                            lastPartialPersistAt = now;
+                        } else if (shouldPersist) {
+                            patchWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId, {
+                                content: event.content,
+                                pending: true
                             });
+                            lastPartialPersistAt = now;
                         }
+                    }
+                    if (isPartialDelta) {
+                        lastStreamWriteAt = Date.now();
+                        // 只发增量片段：前端在 content_chunk 上做追加，
+                        // reset 表示换了一条 assistant 消息、从空白重新开始
+                        sendNdjson(res, event.chunkReset === true
+                            ? { type: 'content_chunk', text: '', reset: true }
+                            : { type: 'content_chunk', text: event.chunk });
+                        return;
+                    }
+                    emitStreamEvent(event, resolveWebStreamControlEventType(event), {
+                        transportType: event && event.type ? event.type : '',
+                        text: event && (event.text || event.content) ? String(event.text || event.content) : ''
                     });
+
+                };
+                // 域名白名单下被过滤代理拦下的新域名：对话进行中立即提示一次
+                const deniedNotifier = createWebDeniedNotifier(ctx, sessionRef, text => handleStreamEvent({ type: 'trace', stream: 'stdout', text }));
+                try {
+                    if (deniedNotifier) deniedNotifier.start();
+                    let result;
+                    try {
+                        result = await execAgentInWebContainerStream(ctx, state, sessionRef, command, {
+                            agentProgram: agentMeta.agentProgram,
+                            // 复用路由入口占好的那把锁，而不是另起一份运行登记
+                            runState,
+                            onEvent: handleStreamEvent
+                        });
+                    } finally {
+                        if (deniedNotifier) deniedNotifier.stop();
+                    }
                     ctx.logger.info('agent turn finished', {
                         session: turnSessionKey,
                         durationMs: Date.now() - turnStartedAt,
@@ -6854,7 +6845,6 @@ async function startWebServer(options) {
                 state.networkWatch = null;
             }
             if (state.portForwarder) state.portForwarder.closeAll();
-            if (state.egressProxy) state.egressProxy.stop();
             for (const session of state.terminalSessions.values()) {
                 const ptyProcess = session && session.ptyProcess;
                 if (ptyProcess && !ptyProcess.killed) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "8.4.0",
+    "version": "8.5.0",
     "imageVersion": "2.2.0-common",
     "playwrightCliVersion": "0.1.19",
     "patchrightCoreVersion": "1.63.0",