Compare commits

..

1 Commits

Author SHA1 Message Date
john 6b586e0951 feat(billing): record subscription-covered token usage in usage records
Memind CI / Test, build, and release guards (pull_request) Successful in 4m8s
Write h5_usage_records when plan quota fully covers a session bill so
WeChat and H5 consumption stays visible in admin usage history.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-06 18:51:11 +08:00
13 changed files with 31 additions and 125 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="theme-color" content="#0f1419" />
<title>Memind</title>
<title>TKMind</title>
</head>
<body>
<div id="root"></div>
+4 -1
View File
@@ -86,6 +86,9 @@ export function extensionsNeedingRefresh(currentExtensions, desiredExtensions) {
if (!name) continue;
const exists = current.some((ext) => extensionName(ext) === name);
if (!exists) {
// goosed may omit active stdio MCP extensions from the session listing
// even though /agent/start already loaded them; do not hot-add stdio.
if (String(config?.type ?? '') === 'stdio') continue;
toAdd.push(config);
}
}
@@ -95,7 +98,7 @@ export function extensionsNeedingRefresh(currentExtensions, desiredExtensions) {
function stdioListingOmissionAllowed(currentExt, desiredConfig) {
if (String(desiredConfig?.type ?? '') !== 'stdio') return false;
if (!currentExt) return false;
if (!currentExt) return true;
const currentExec = extensionExecutionConfig(currentExt);
const desiredExec = extensionExecutionConfig(desiredConfig);
return currentExec.type === 'stdio'
+11 -79
View File
@@ -122,24 +122,22 @@ test('extensionsNeedingRefresh adds missing extensions', () => {
assert.equal(toAdd[0].name, 'summon');
});
test('extensionsNeedingRefresh re-adds missing stdio extensions after quiesce', () => {
const desiredSandbox = {
type: 'stdio',
name: 'sandbox-fs',
cmd: '/usr/local/bin/node',
args: ['/opt/portal/mindspace-sandbox-mcp.mjs', '/tmp/user-1'],
available_tools: ['read_file', 'generate_image'],
};
test('extensionsNeedingRefresh does not hot-add missing stdio extensions', () => {
const { toRemove, toAdd } = extensionsNeedingRefresh(
[{ name: 'developer', available_tools: ['read_image'] }],
[
{ name: 'developer', available_tools: ['read_image'] },
desiredSandbox,
{
type: 'stdio',
name: 'sandbox-fs',
cmd: '/usr/local/bin/node',
args: ['/opt/portal/mindspace-sandbox-mcp.mjs', '/tmp/user-1'],
available_tools: ['read_file'],
},
],
);
assert.deepEqual(toRemove, []);
assert.equal(toAdd.length, 1);
assert.equal(toAdd[0].name, 'sandbox-fs');
assert.deepEqual(toAdd, []);
});
test('extensionPolicyViolations reports unexpected, duplicate, and mismatched extensions', () => {
@@ -163,7 +161,7 @@ test('extensionPolicyViolations reports unexpected, duplicate, and mismatched ex
);
});
test('extensionPolicyViolations flags stdio extensions missing from goosed listing', () => {
test('extensionPolicyViolations ignores stdio extensions omitted from goosed listing', () => {
assert.deepEqual(
extensionPolicyViolations(
[{ name: 'developer', available_tools: ['read_image'] }],
@@ -188,7 +186,7 @@ test('extensionPolicyViolations flags stdio extensions missing from goosed listi
{
unexpected: [],
duplicate: [],
missingOrMismatched: ['sandbox-fs', 'tkmind-search'],
missingOrMismatched: [],
},
);
});
@@ -336,72 +334,6 @@ test('reconcileAgentSession restarts after adding missing extensions', async ()
]);
});
test('reconcileAgentSession restarts after re-adding quiesced stdio extensions', async () => {
const calls = [];
let extensionReads = 0;
const desiredSandbox = {
type: 'stdio',
name: 'sandbox-fs',
cmd: '/usr/local/bin/node',
args: ['/opt/portal/mindspace-sandbox-mcp.mjs', '/tmp/user-1'],
available_tools: ['write_file', 'generate_image'],
};
const apiFetch = async (pathname) => {
calls.push(pathname);
if (pathname === '/sessions/session-1') {
return {
ok: true,
text: async () => JSON.stringify({ working_dir: '/valid/workspace' }),
};
}
if (pathname === '/sessions/session-1/extensions') {
extensionReads += 1;
return {
ok: true,
text: async () =>
JSON.stringify({
extensions:
extensionReads === 1
? [{ name: 'developer', available_tools: ['read_image'] }]
: [desiredSandbox, { name: 'developer', available_tools: ['read_image'] }],
}),
};
}
if (
pathname === '/agent/add_extension'
|| pathname === '/agent/restart'
) {
return {
ok: true,
text: async () => JSON.stringify({ ok: true }),
};
}
const harness = harnessMemoryResponse(pathname);
if (harness) return harness;
throw new Error(`unexpected path: ${pathname}`);
};
await reconcileAgentSession(apiFetch, 'session-1', {
workingDir: '/valid/workspace',
sessionPolicy: {
extensionOverrides: [
{ name: 'developer', available_tools: ['read_image'] },
desiredSandbox,
],
},
});
assert.deepEqual(calls, [
'/sessions/session-1',
'/sessions/session-1/extensions',
'/agent/add_extension',
'/agent/restart',
'/sessions/session-1/extensions',
'/agent/harness_remember',
'/agent/harness_bootstrap',
]);
});
test('reconcileAgentSession fails closed when restart does not apply the requested policy', async () => {
const apiFetch = async (pathname) => {
if (pathname === '/sessions/session-1') {
+1 -7
View File
@@ -2,9 +2,6 @@ function extensionName(config) {
return String(config?.name ?? '').trim();
}
/** Stdio MCP extensions that must survive agent-run quiesce (page write + image gen). */
export const PRESERVED_STDIO_EXTENSIONS = new Set(['sandbox-fs']);
async function readJson(response) {
const text = await response.text();
if (!response.ok) {
@@ -55,7 +52,6 @@ export async function cancelSessionActiveRequest(apiFetch, sessionId, requestId)
/**
* Stop per-session stdio MCP children while preserving the Goose conversation.
* Session reconciliation restores the required extensions before the next turn.
* Critical page tools (sandbox-fs) stay attached so the next turn is not tool-less.
*/
export async function quiesceSessionStdioExtensions(apiFetch, sessionId) {
const normalizedSessionId = String(sessionId ?? '').trim();
@@ -64,9 +60,7 @@ export async function quiesceSessionStdioExtensions(apiFetch, sessionId) {
const payload = await readJson(
await apiFetch(`/sessions/${encodeURIComponent(normalizedSessionId)}/extensions`),
);
const names = sessionStdioExtensionNames(payload?.extensions).filter(
(name) => !PRESERVED_STDIO_EXTENSIONS.has(name),
);
const names = sessionStdioExtensionNames(payload?.extensions);
const removed = [];
for (const name of names) {
await readJson(
+4 -9
View File
@@ -2,7 +2,6 @@ import assert from 'node:assert/strict';
import test from 'node:test';
import {
cancelSessionActiveRequest,
PRESERVED_STDIO_EXTENSIONS,
quiesceSessionStdioExtensions,
sessionStdioExtensionNames,
} from './session-runtime-lifecycle.mjs';
@@ -83,7 +82,7 @@ test('quiesceSessionStdioExtensions removes stdio children without deleting sess
const result = await quiesceSessionStdioExtensions(apiFetch, 'session-1');
assert.deepEqual(result, {
removed: ['tkmind-search'],
removed: ['sandbox-fs', 'tkmind-search'],
skipped: false,
});
assert.deepEqual(
@@ -91,27 +90,23 @@ test('quiesceSessionStdioExtensions removes stdio children without deleting sess
[
'/sessions/session-1/extensions',
'/agent/remove_extension',
'/agent/remove_extension',
],
);
assert.deepEqual(
calls.slice(1).map(({ init }) => JSON.parse(init.body)),
[
{ session_id: 'session-1', name: 'sandbox-fs' },
{ session_id: 'session-1', name: 'tkmind-search' },
],
);
assert.equal(PRESERVED_STDIO_EXTENSIONS.has('sandbox-fs'), true);
assert.equal(calls.some(({ pathname }) => pathname.includes('delete')), false);
});
test('quiesceSessionStdioExtensions fails when upstream removal is not acknowledged', async () => {
const apiFetch = async (pathname) => {
if (pathname.endsWith('/extensions')) {
return jsonResponse({
extensions: [
{ name: 'sandbox-fs', type: 'stdio' },
{ name: 'tkmind-search', type: 'stdio' },
],
});
return jsonResponse({ extensions: [{ name: 'sandbox-fs', type: 'stdio' }] });
}
return jsonResponse({ message: 'remove failed' }, { ok: false, status: 500 });
};
+2 -3
View File
@@ -16,7 +16,6 @@ import {
readWechatAuthError,
readWechatPendingToken,
} from '../utils/wechat';
import { APP_DISPLAY_NAME } from '../utils/appBrand';
import { TKMindAvatar } from './TKMindAvatar';
import { resolvePlazaHomeUrl } from '../utils/publicUrl';
import { WechatBindGate } from './WechatBindGate';
@@ -27,7 +26,7 @@ import { WechatOpenGuide } from './WechatOpenGuide';
type Mode = 'login' | 'register' | 'reset';
const MODE_META: Record<Mode, { title: string; desc: string }> = {
login: { title: APP_DISPLAY_NAME, desc: '登录你的账号' },
login: { title: 'TKMind', desc: '登录你的账号' },
register: { title: '创建账号', desc: '填写信息完成注册' },
reset: { title: '重置密码', desc: '验证注册邮箱后设置新密码' },
};
@@ -240,7 +239,7 @@ export function AuthView({
}
const meta = legacyMode
? { title: APP_DISPLAY_NAME, desc: '内部访问入口' }
? { title: 'TKMind', desc: '内部访问入口' }
: fromPlaza
? {
...MODE_META[mode],
+1 -9
View File
@@ -8,7 +8,6 @@ import { getSessionDisplayName } from '../utils/sessions';
import { isH5OrWechatClient } from '../utils/wechat';
import { BalanceRing } from './BalanceRing';
import { HistorySidebar } from './HistorySidebar';
import { APP_DISPLAY_NAME } from '../utils/appBrand';
import { TKMindAvatar } from './TKMindAvatar';
import { ChatPanel } from './ChatPanel';
import { ChatLoadingSpinner } from './ChatLoadingSpinner';
@@ -164,7 +163,6 @@ export function ChatView({
user,
capabilities,
grantedSkills,
onGrantedSkillsUpdate,
onLogout,
onOpenSpace,
onOpenPage,
@@ -175,7 +173,6 @@ export function ChatView({
capabilities?: CapabilityMap;
grantedSkills?: string[];
onUserUpdate?: (user: PortalUser) => void;
onGrantedSkillsUpdate?: (skills: string[]) => void;
onLogout?: () => void;
onOpenSpace?: (target?: { categoryCode?: MindSpaceSaveCategory; pageId?: string }) => void;
onOpenPage?: (pageId: string) => void;
@@ -216,7 +213,6 @@ export function ChatView({
subscription,
openRecharge,
openSubscribe,
completeRecharge,
uploadChatImage,
uploadChatAttachment,
followAgentRun,
@@ -361,7 +357,7 @@ export function ChatView({
</button>
<TKMindAvatar size="sm" className="header-brand-avatar" />
<div>
<div className="header-title">{user?.displayName ?? APP_DISPLAY_NAME}</div>
<div className="header-title">{user?.displayName ?? 'TKMind'}</div>
<div className="header-sub">
{isConnectingTitle ? <ChatLoadingSpinner /> : null}
<span>{sessionTitle}</span>
@@ -573,10 +569,6 @@ export function ChatView({
session={session}
capabilities={capabilities}
grantedSkills={grantedSkills}
balanceCents={balanceCents ?? 0}
onBalanceUpdate={(nextBalance) => completeRecharge(nextBalance)}
onGrantedSkillsUpdate={onGrantedSkillsUpdate}
onOpenRecharge={() => openRecharge(false)}
onSubmit={(text, imageUrls, previewImageUrls, options) =>
void submit(
text,
+3 -4
View File
@@ -6,7 +6,6 @@ import {
FileText,
Bot,
} from 'lucide-react';
import { APP_DISPLAY_NAME, APP_DISPLAY_TAGLINE } from '../utils/appBrand';
import { TKMindAvatar } from './TKMindAvatar';
const features = [
@@ -22,7 +21,7 @@ export function ChatWelcomePanel({ compact }: { compact?: boolean }) {
return (
<div className="empty-state empty-state-compact">
<TKMindAvatar />
<h2>{APP_DISPLAY_NAME}</h2>
<h2>TKMind</h2>
<p> Agent </p>
</div>
);
@@ -46,7 +45,7 @@ export function ChatWelcomePanel({ compact }: { compact?: boolean }) {
transition={{ delay: 0.15 }}
className="welcome-panel-brand"
>
{APP_DISPLAY_TAGLINE}
MeMind
</motion.h2>
<motion.h1
@@ -74,7 +73,7 @@ export function ChatWelcomePanel({ compact }: { compact?: boolean }) {
transition={{ delay: 0.55 }}
className="welcome-panel-description"
>
{APP_DISPLAY_NAME}
MeMind
</motion.p>
<motion.div
+1 -1
View File
@@ -277,7 +277,7 @@ export function FeedbackSubmitView({
>
<div className="feedback-board-toolbar">
<div className="feedback-board-toolbar-copy">
<p className="feedback-submit-eyebrow"> Memind</p>
<p className="feedback-submit-eyebrow"> TKMind</p>
<h1> Bug </h1>
<p className="feedback-submit-desc feedback-board-desc">
便
+1 -2
View File
@@ -7,7 +7,6 @@ import type { MindSpaceChatContext, MindSpaceSaveCategory, PortalUser, Message }
import { formatContextChip } from '../utils/mindspaceChatContext';
import { shouldShowChatMessage } from '../utils/message';
import { ChatPanel } from './ChatPanel';
import { APP_DISPLAY_NAME } from '../utils/appBrand';
import { TKMindAvatar } from './TKMindAvatar';
import { GoalRunAwaitingBanner } from './GoalRunAwaitingBanner';
@@ -20,7 +19,7 @@ export function SpaceChatPanel({
onPageSaved,
chatBridge,
hideOpenFullChat = false,
title = APP_DISPLAY_NAME,
title = 'TKMind',
prefillMessages = [],
}: {
open: boolean;
+1 -2
View File
@@ -1,4 +1,3 @@
import { APP_DISPLAY_NAME } from '../utils/appBrand';
import tkmindAvatar from '../assets/tkmind-avatar.png';
type TKMindAvatarProps = {
@@ -14,7 +13,7 @@ export function TKMindAvatar({ className = '', size = 'sm' }: TKMindAvatarProps)
className={`tkmind-avatar ${sizeClass} msg-avatar msg-avatar-assistant ${className}`.trim()}
aria-hidden="true"
>
<img src={tkmindAvatar} alt={APP_DISPLAY_NAME} className="tkmind-avatar-img" />
<img src={tkmindAvatar} alt="TKMind" className="tkmind-avatar-img" />
</div>
);
}
-5
View File
@@ -1,5 +0,0 @@
/** User-facing product name shown in nav, login, and page chrome. */
export const APP_DISPLAY_NAME = 'Memind';
/** Branded tagline suffix used on welcome and marketing surfaces. */
export const APP_DISPLAY_TAGLINE = `${APP_DISPLAY_NAME} 智趣`;
+1 -2
View File
@@ -2658,8 +2658,7 @@ test('wechat mp service reconciles existing dedicated session before reply', asy
assert.equal(result.status, 200);
await result.task;
assert.equal(calls.some(([pathname]) => pathname === '/agent/update_working_dir'), true);
assert.equal(calls.some(([pathname]) => pathname === '/agent/add_extension'), true);
assert.equal(calls.some(([pathname]) => pathname === '/agent/restart'), true);
assert.equal(calls.some(([pathname]) => pathname === '/agent/add_extension'), false);
assert.equal(calls.some(([pathname]) => pathname === '/sessions/session-1/reply'), true);
} finally {
crypto.randomUUID = originalRandomUuid;