codexmate 0.1.19 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexmate",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
   "main": "cli.js",
   "bin": {

package/web-ui/modules/app.methods.navigation.mjs

@@ -732,8 +732,8 @@
             this.invalidateSessionTimelineMeasurementCache();
         },
 
-        async loadMoreSessionMessages() {
-            return loadMoreSessionMessagesHelper.call(this);
+        async loadMoreSessionMessages(stepSize) {
+            return loadMoreSessionMessagesHelper.call(this, stepSize);
         },
 
         suspendSessionTabRender() {

package/web-ui/modules/app.methods.pi-config.mjs

@@ -55,6 +55,7 @@ export function createPiConfigMethods({ api: apiClient }) {
                 : '';
             const updates = { defaultProvider: providerId };
             if (firstModel) updates.defaultModel = firstModel;
+            else updates.defaultModel = '';
             try {
                 const result = await apiClient('write-pi-settings', updates);
                 if (result && result.error) throw new Error(result.error);
@@ -126,6 +127,11 @@ export function createPiConfigMethods({ api: apiClient }) {
                     this.messageType = 'error';
                     return;
                 }
+                if (!Array.isArray(merged.models) || merged.models.length === 0) {
+                    this.message = '请至少导入或输入一个模型';
+                    this.messageType = 'error';
+                    return;
+                }
                 const providerId = isNew ? this.derivePiProviderId(baseUrl) : editor.id;
                 if (isNew) {
                     merged.id = providerId;
@@ -207,6 +213,7 @@ export function createPiConfigMethods({ api: apiClient }) {
         startPiProviderDraft(tpl) {
             const template = isPiPlainObject(tpl) ? tpl : {};
             this.resetPiEditorTransientState();
+            this.showAddPiProviderModal = false;
             this.editingPiProvider = {
                 id: '',
                 isNew: true,
@@ -350,6 +357,8 @@ export function createPiConfigMethods({ api: apiClient }) {
             const wasNew = !!editor.isNew;
             this.resetPiProviderEditing();
             if (wasNew) this.piSelectedProviderTemplate = '';
+            this.showAddPiProviderModal = false;
+            this.piProviderPickerQuery = '';
         },
         removePiProviderModel(index) {
             if (!this.editingPiProvider) return;
@@ -544,7 +553,7 @@ export function createPiConfigMethods({ api: apiClient }) {
             if (merged.baseUrl === undefined) merged.baseUrl = values.baseUrl || '';
             if (merged.api === undefined) merged.api = values.api || '';
             if (merged.apiKey === undefined) merged.apiKey = values.apiKey || '';
-            if (merged.models === undefined) merged.models = mapModels(values.models);
+            merged.models = mapModels(merged.models !== undefined ? merged.models : values.models);
             if (isPiPlainObject(orig.headers)) merged.headers = orig.headers;
             if (typeof orig.title === 'string') merged.title = orig.title;
             else if (typeof orig.name === 'string') merged.name = orig.name;

package/web-ui/modules/i18n/locales/en.mjs

@@ -1362,9 +1362,9 @@ const en = Object.freeze({
     'pi.providers.json.previewTitle': 'Preview',
     'pi.providers.json.editTitle': 'Edit JSON',
     'pi.files.title': 'File JSON',
-    'pi.files.desc': 'View and edit Pi settings.json and models.json in full; JSON validity is checked before saving and invalid content is never written.',
     'pi.files.settingsTitle': 'settings.json (active settings)',
     'pi.files.modelsTitle': 'models.json (providers and models)',
+    'pi.files.modelsHint': 'Merged automatically from the provider management above; prefer editing providers there instead.',
     'pi.history.apply': 'Apply this record',
     'pi.history.applied': 'History record applied',
     'pi.history.applyFailed': 'Failed to apply history record',

package/web-ui/modules/i18n/locales/ja.mjs

@@ -1363,9 +1363,9 @@ const ja = Object.freeze({
     'pi.providers.json.previewTitle': 'プレビュー',
     'pi.providers.json.editTitle': 'JSON を編集',
     'pi.files.title': 'ファイル JSON',
-    'pi.files.desc': 'Pi の settings.json と models.json を全文表示して直接編集します。保存前に JSON の正当性を検証し、不正な内容は書き込みません。',
     'pi.files.settingsTitle': 'settings.json（有効な設定）',
     'pi.files.modelsTitle': 'models.json（プロバイダーとモデル）',
+    'pi.files.modelsHint': '上のプロバイダー管理から自動的にマージされます。プロバイダーの変更は上の管理画面を優先してください。',
     'pi.history.apply': 'この履歴を適用',
     'pi.history.applied': '履歴を適用しました',
     'pi.history.applyFailed': '履歴の適用に失敗しました',

package/web-ui/modules/i18n/locales/vi.mjs

@@ -1331,9 +1331,9 @@ const vi = Object.freeze({
     'pi.providers.json.previewTitle': 'Xem trước',
     'pi.providers.json.editTitle': 'Chỉnh sửa JSON',
     'pi.files.title': 'JSON tập tin',
-    'pi.files.desc': 'Hiển thị đầy đủ và chỉnh sửa trực tiếp settings.json và models.json của Pi; kiểm tra tính hợp lệ của JSON trước khi lưu, nội dung không hợp lệ sẽ không được ghi.',
     'pi.files.settingsTitle': 'settings.json (cài đặt đang dùng)',
     'pi.files.modelsTitle': 'models.json (nhà cung cấp và mô hình)',
+    'pi.files.modelsHint': 'Được hợp nhất tự động từ phần quản lý nhà cung cấp phía trên; hãy ưu tiên chỉnh sửa ở đó.',
     'pi.history.apply': 'Áp dụng bản ghi này',
     'pi.history.applied': 'Đã áp dụng lịch sử',
     'pi.history.applyFailed': 'Áp dụng lịch sử thất bại',

package/web-ui/modules/i18n/locales/zh-tw.mjs

@@ -1360,9 +1360,9 @@ const zhTw = Object.freeze({
     'pi.providers.json.previewTitle': '預覽',
     'pi.providers.json.editTitle': '編輯 JSON',
     'pi.files.title': '檔案 JSON',
-    'pi.files.desc': '完整展示並直接編輯 Pi 的 settings.json 與 models.json；儲存前校驗 JSON 合法性，非法內容不會寫入。',
     'pi.files.settingsTitle': 'settings.json（生效設定）',
     'pi.files.modelsTitle': 'models.json（供應商與模型）',
+    'pi.files.modelsHint': '由上方供應商管理自動合併生成；調整供應商請優先使用上方的供應商管理。',
     'pi.history.apply': '套用此紀錄',
     'pi.history.applied': '已套用歷史紀錄',
     'pi.history.applyFailed': '套用歷史紀錄失敗',

package/web-ui/modules/i18n/locales/zh.mjs

@@ -1360,9 +1360,9 @@ const zh = Object.freeze({
     'pi.providers.json.previewTitle': '预览',
     'pi.providers.json.editTitle': '编辑 JSON',
     'pi.files.title': '文件 JSON',
-    'pi.files.desc': '完整展示并直接编辑 Pi 的 settings.json 与 models.json；保存前校验 JSON 合法性，非法内容不会写入。',
     'pi.files.settingsTitle': 'settings.json（生效设置）',
     'pi.files.modelsTitle': 'models.json（供应商与模型）',
+    'pi.files.modelsHint': '由上方供应商管理自动合并生成；调整供应商请优先使用上方的供应商管理。',
     'pi.history.apply': '应用此记录',
     'pi.history.applied': '已应用历史记录',
     'pi.history.applyFailed': '应用历史记录失败',

package/web-ui/partials/index/panel-config-pi.html

@@ -49,19 +49,24 @@
                                     </div>
                                     <div class="card-trailing">
                                         <span v-if="piActiveProvider === providerId" class="pill configured">{{ t('pi.providers.active') }}</span>
-                                        <button v-else type="button" class="btn-tool" @click.stop="switchPiActiveProvider(providerId)" :disabled="!isToolConfigWriteAllowed('pi') || piSaving">{{ t('pi.providers.setActive') }}</button>
+                                        <button v-else type="button" class="btn-tool btn-tool-compact" @click.stop="switchPiActiveProvider(providerId)" :disabled="!isToolConfigWriteAllowed('pi') || piSaving">{{ t('pi.providers.setActive') }}</button>
                                     </div>
                                 </div>
                             </div>
-                            <div v-if="!piProviderIds.length" class="config-template-hint">{{ t('pi.providers.empty') }}</div>
+                            <div v-if="!piProviderIds.length" class="empty-state">
+                                <div class="empty-state-title">{{ t('pi.providers.empty') }}</div>
+                            </div>
                         </section>
 
-                        <section class="selector-section">
+                        <section class="selector-section pi-file-section">
                             <div class="selector-header">
-                                <span class="selector-title">{{ t('pi.files.title') }}</span>
+                                <span class="selector-title">{{ t('pi.files.settingsTitle') }}</span>
+                                <div class="selector-actions">
+                                    <button type="button" class="btn-tool btn-tool-compact" @click="openPiConfigHistory('settings')" :disabled="piHistoryLoading">{{ t('common.history') }}</button>
+                                    <button type="button" class="btn-tool btn-tool-compact" @click="savePiSettingsJson" :disabled="!isToolConfigWriteAllowed('pi') || piSaving || piFileJsonSaving || !!piSettingsJsonError">{{ t('common.save') }}</button>
+                                </div>
                             </div>
-                            <div class="config-template-hint">{{ t('pi.files.desc') }}</div>
-                            <label class="form-label">{{ t('pi.files.settingsTitle') }}</label>
+                            <div class="config-template-hint">{{ t('pi.providers.targetFile', { path: '~/.pi/agent/settings.json' }) }}</div>
                             <textarea
                                 class="template-textarea config-json-editor"
                                 v-model="piSettingsJsonDraft"
@@ -71,10 +76,6 @@
                                 @input="piSettingsJsonInput"
                                 placeholder="{}"></textarea>
                             <p v-if="piSettingsJsonError" class="config-template-hint error-text">{{ piSettingsJsonError }}</p>
-                            <div class="settings-tab-actions">
-                                <button type="button" class="btn-tool" @click="savePiSettingsJson" :disabled="!isToolConfigWriteAllowed('pi') || piSaving || piFileJsonSaving || !!piSettingsJsonError">{{ t('common.save') }}</button>
-                                <button type="button" class="btn-mini" @click="openPiConfigHistory('settings')" :disabled="piHistoryLoading">{{ t('common.history') }}</button>
-                            </div>
                             <details v-if="piHistoryTarget === 'settings'" class="prompt-history-panel" open>
                                 <summary class="prompt-history-summary">
                                     <span>{{ t('common.history') }}</span>
@@ -96,7 +97,18 @@
                                     </div>
                                 </div>
                             </details>
-                            <label class="form-label">{{ t('pi.files.modelsTitle') }}</label>
+                        </section>
+
+                        <section class="selector-section pi-file-section">
+                            <div class="selector-header">
+                                <span class="selector-title">{{ t('pi.files.modelsTitle') }}</span>
+                                <div class="selector-actions">
+                                    <button type="button" class="btn-tool btn-tool-compact" @click="openPiConfigHistory('models')" :disabled="piHistoryLoading">{{ t('common.history') }}</button>
+                                    <button type="button" class="btn-tool btn-tool-compact" @click="savePiModelsJson" :disabled="!isToolConfigWriteAllowed('pi') || piSaving || piFileJsonSaving || !!piModelsJsonError">{{ t('common.save') }}</button>
+                                </div>
+                            </div>
+                            <div class="config-template-hint">{{ t('pi.files.modelsHint') }}</div>
+                            <div class="config-template-hint">{{ t('pi.providers.targetFile', { path: '~/.pi/agent/models.json' }) }}</div>
                             <textarea
                                 class="template-textarea config-json-editor"
                                 v-model="piModelsJsonDraft"
@@ -106,10 +118,6 @@
                                 @input="piModelsJsonInput"
                                 placeholder="{}"></textarea>
                             <p v-if="piModelsJsonError" class="config-template-hint error-text">{{ piModelsJsonError }}</p>
-                            <div class="settings-tab-actions">
-                                <button type="button" class="btn-tool" @click="savePiModelsJson" :disabled="!isToolConfigWriteAllowed('pi') || piSaving || piFileJsonSaving || !!piModelsJsonError">{{ t('common.save') }}</button>
-                                <button type="button" class="btn-mini" @click="openPiConfigHistory('models')" :disabled="piHistoryLoading">{{ t('common.history') }}</button>
-                            </div>
                             <details v-if="piHistoryTarget === 'models'" class="prompt-history-panel" open>
                                 <summary class="prompt-history-summary">
                                     <span>{{ t('common.history') }}</span>

package/web-ui/res/web-ui-render.precompiled.js

@@ -3268,7 +3268,7 @@ return function render(_ctx, _cache) {
                                 : (_openBlock(), _createElementBlock("button", {
                                     key: 1,
                                     type: "button",
-                                    class: "btn-tool",
+                                    class: "btn-tool btn-tool-compact",
                                     onClick: _withModifiers($event => (_ctx.switchPiActiveProvider(providerId)), ["stop"]),
                                     disabled: !_ctx.isToolConfigWriteAllowed('pi') || _ctx.piSaving
                                   }, _toDisplayString(_ctx.t('pi.providers.setActive')), 9 /* TEXT, PROPS */, ["onClick", "disabled"]))
@@ -3280,16 +3280,31 @@ return function render(_ctx, _cache) {
                   (!_ctx.piProviderIds.length)
                     ? (_openBlock(), _createElementBlock("div", {
                         key: 1,
-                        class: "config-template-hint"
-                      }, _toDisplayString(_ctx.t('pi.providers.empty')), 1 /* TEXT */))
+                        class: "empty-state"
+                      }, [
+                        _createElementVNode("div", { class: "empty-state-title" }, _toDisplayString(_ctx.t('pi.providers.empty')), 1 /* TEXT */)
+                      ]))
                     : _createCommentVNode("v-if", true)
                 ]),
-                _createElementVNode("section", { class: "selector-section" }, [
+                _createElementVNode("section", { class: "selector-section pi-file-section" }, [
                   _createElementVNode("div", { class: "selector-header" }, [
-                    _createElementVNode("span", { class: "selector-title" }, _toDisplayString(_ctx.t('pi.files.title')), 1 /* TEXT */)
+                    _createElementVNode("span", { class: "selector-title" }, _toDisplayString(_ctx.t('pi.files.settingsTitle')), 1 /* TEXT */),
+                    _createElementVNode("div", { class: "selector-actions" }, [
+                      _createElementVNode("button", {
+                        type: "button",
+                        class: "btn-tool btn-tool-compact",
+                        onClick: $event => (_ctx.openPiConfigHistory('settings')),
+                        disabled: _ctx.piHistoryLoading
+                      }, _toDisplayString(_ctx.t('common.history')), 9 /* TEXT, PROPS */, ["onClick", "disabled"]),
+                      _createElementVNode("button", {
+                        type: "button",
+                        class: "btn-tool btn-tool-compact",
+                        onClick: _ctx.savePiSettingsJson,
+                        disabled: !_ctx.isToolConfigWriteAllowed('pi') || _ctx.piSaving || _ctx.piFileJsonSaving || !!_ctx.piSettingsJsonError
+                      }, _toDisplayString(_ctx.t('common.save')), 9 /* TEXT, PROPS */, ["onClick", "disabled"])
+                    ])
                   ]),
-                  _createElementVNode("div", { class: "config-template-hint" }, _toDisplayString(_ctx.t('pi.files.desc')), 1 /* TEXT */),
-                  _createElementVNode("label", { class: "form-label" }, _toDisplayString(_ctx.t('pi.files.settingsTitle')), 1 /* TEXT */),
+                  _createElementVNode("div", { class: "config-template-hint" }, _toDisplayString(_ctx.t('pi.providers.targetFile', { path: '~/.pi/agent/settings.json' })), 1 /* TEXT */),
                   _withDirectives(_createElementVNode("textarea", {
                     class: "template-textarea config-json-editor",
                     "onUpdate:modelValue": $event => ((_ctx.piSettingsJsonDraft) = $event),
@@ -3307,20 +3322,6 @@ return function render(_ctx, _cache) {
                         class: "config-template-hint error-text"
                       }, _toDisplayString(_ctx.piSettingsJsonError), 1 /* TEXT */))
                     : _createCommentVNode("v-if", true),
-                  _createElementVNode("div", { class: "settings-tab-actions" }, [
-                    _createElementVNode("button", {
-                      type: "button",
-                      class: "btn-tool",
-                      onClick: _ctx.savePiSettingsJson,
-                      disabled: !_ctx.isToolConfigWriteAllowed('pi') || _ctx.piSaving || _ctx.piFileJsonSaving || !!_ctx.piSettingsJsonError
-                    }, _toDisplayString(_ctx.t('common.save')), 9 /* TEXT, PROPS */, ["onClick", "disabled"]),
-                    _createElementVNode("button", {
-                      type: "button",
-                      class: "btn-mini",
-                      onClick: $event => (_ctx.openPiConfigHistory('settings')),
-                      disabled: _ctx.piHistoryLoading
-                    }, _toDisplayString(_ctx.t('common.history')), 9 /* TEXT, PROPS */, ["onClick", "disabled"])
-                  ]),
                   (_ctx.piHistoryTarget === 'settings')
                     ? (_openBlock(), _createElementBlock("details", {
                         key: 1,
@@ -3386,8 +3387,28 @@ return function render(_ctx, _cache) {
                             : _createCommentVNode("v-if", true)
                         ])
                       ]))
-                    : _createCommentVNode("v-if", true),
-                  _createElementVNode("label", { class: "form-label" }, _toDisplayString(_ctx.t('pi.files.modelsTitle')), 1 /* TEXT */),
+                    : _createCommentVNode("v-if", true)
+                ]),
+                _createElementVNode("section", { class: "selector-section pi-file-section" }, [
+                  _createElementVNode("div", { class: "selector-header" }, [
+                    _createElementVNode("span", { class: "selector-title" }, _toDisplayString(_ctx.t('pi.files.modelsTitle')), 1 /* TEXT */),
+                    _createElementVNode("div", { class: "selector-actions" }, [
+                      _createElementVNode("button", {
+                        type: "button",
+                        class: "btn-tool btn-tool-compact",
+                        onClick: $event => (_ctx.openPiConfigHistory('models')),
+                        disabled: _ctx.piHistoryLoading
+                      }, _toDisplayString(_ctx.t('common.history')), 9 /* TEXT, PROPS */, ["onClick", "disabled"]),
+                      _createElementVNode("button", {
+                        type: "button",
+                        class: "btn-tool btn-tool-compact",
+                        onClick: _ctx.savePiModelsJson,
+                        disabled: !_ctx.isToolConfigWriteAllowed('pi') || _ctx.piSaving || _ctx.piFileJsonSaving || !!_ctx.piModelsJsonError
+                      }, _toDisplayString(_ctx.t('common.save')), 9 /* TEXT, PROPS */, ["onClick", "disabled"])
+                    ])
+                  ]),
+                  _createElementVNode("div", { class: "config-template-hint" }, _toDisplayString(_ctx.t('pi.files.modelsHint')), 1 /* TEXT */),
+                  _createElementVNode("div", { class: "config-template-hint" }, _toDisplayString(_ctx.t('pi.providers.targetFile', { path: '~/.pi/agent/models.json' })), 1 /* TEXT */),
                   _withDirectives(_createElementVNode("textarea", {
                     class: "template-textarea config-json-editor",
                     "onUpdate:modelValue": $event => ((_ctx.piModelsJsonDraft) = $event),
@@ -3401,27 +3422,13 @@ return function render(_ctx, _cache) {
                   ]),
                   (_ctx.piModelsJsonError)
                     ? (_openBlock(), _createElementBlock("p", {
-                        key: 2,
+                        key: 0,
                         class: "config-template-hint error-text"
                       }, _toDisplayString(_ctx.piModelsJsonError), 1 /* TEXT */))
                     : _createCommentVNode("v-if", true),
-                  _createElementVNode("div", { class: "settings-tab-actions" }, [
-                    _createElementVNode("button", {
-                      type: "button",
-                      class: "btn-tool",
-                      onClick: _ctx.savePiModelsJson,
-                      disabled: !_ctx.isToolConfigWriteAllowed('pi') || _ctx.piSaving || _ctx.piFileJsonSaving || !!_ctx.piModelsJsonError
-                    }, _toDisplayString(_ctx.t('common.save')), 9 /* TEXT, PROPS */, ["onClick", "disabled"]),
-                    _createElementVNode("button", {
-                      type: "button",
-                      class: "btn-mini",
-                      onClick: $event => (_ctx.openPiConfigHistory('models')),
-                      disabled: _ctx.piHistoryLoading
-                    }, _toDisplayString(_ctx.t('common.history')), 9 /* TEXT, PROPS */, ["onClick", "disabled"])
-                  ]),
                   (_ctx.piHistoryTarget === 'models')
                     ? (_openBlock(), _createElementBlock("details", {
-                        key: 3,
+                        key: 1,
                         class: "prompt-history-panel",
                         open: ""
                       }, [

package/web-ui/session-helpers.mjs

@@ -530,7 +530,7 @@ export async function loadActiveSessionDetail(api, options = {}) {
     }
 }
 
-export async function loadMoreSessionMessages() {
+export async function loadMoreSessionMessages(stepSize) {
     if (this.mainTab !== 'sessions' || !this.sessionPreviewRenderEnabled) {
         return;
     }
@@ -541,6 +541,19 @@ export async function loadMoreSessionMessages() {
         this.sessionPreviewVisibleCount = 0;
         return;
     }
+    const step = Number.isFinite(stepSize)
+        ? Math.max(1, Math.floor(stepSize))
+        : (Number.isFinite(this.sessionPreviewLoadStep)
+            ? Math.max(1, Math.floor(this.sessionPreviewLoadStep))
+            : 40);
+    const current = Number.isFinite(this.sessionPreviewVisibleCount)
+        ? Math.max(0, Math.floor(this.sessionPreviewVisibleCount))
+        : 0;
+    const targetVisible = current + step;
+    if (targetVisible <= total) {
+        this.sessionPreviewVisibleCount = Math.min(total, targetVisible);
+        return;
+    }
 
     this.sessionPreviewVisibleCount = total;
     if (this.sessionDetailLoading) {
@@ -560,19 +573,24 @@ export async function loadMoreSessionMessages() {
     const currentLimit = Number.isFinite(currentLimitRaw)
         ? Math.max(1, Math.floor(currentLimitRaw))
         : Math.max(1, total);
+    const fetchStep = Number.isFinite(this.sessionDetailFetchStep)
+        ? Math.max(1, Math.floor(this.sessionDetailFetchStep))
+        : 80;
     const limitCapRaw = Number(this.sessionDetailMessageLimitCap);
     const limitCap = Number.isFinite(limitCapRaw)
         ? Math.max(1, Math.floor(limitCapRaw))
         : 1000;
 
-    const nextLimit = totalKnown > 0
-        ? Math.min(totalKnown, limitCap)
-        : limitCap;
+    let nextLimit = Math.max(currentLimit + fetchStep, targetVisible);
+    if (totalKnown > total) {
+        nextLimit = Math.min(nextLimit, totalKnown);
+    }
+    nextLimit = Math.min(nextLimit, limitCap);
     if (nextLimit <= currentLimit) {
         return;
     }
 
-    this.sessionPreviewPendingVisibleCount = nextLimit;
+    this.sessionPreviewPendingVisibleCount = targetVisible;
     this.sessionDetailMessageLimit = nextLimit;
     this.sessionPreviewLoadingMore = true;
     try {
@@ -580,11 +598,4 @@ export async function loadMoreSessionMessages() {
     } finally {
         this.sessionPreviewLoadingMore = false;
     }
-
-    const loadedTotal = Array.isArray(this.activeSessionMessages)
-        ? this.activeSessionMessages.length
-        : 0;
-    if (loadedTotal > this.sessionPreviewVisibleCount) {
-        this.sessionPreviewVisibleCount = loadedTotal;
-    }
 }

package/web-ui/styles/controls-forms.css

@@ -104,6 +104,13 @@
     flex: 0 0 auto;
 }
 
+.selector-header .selector-actions > .btn-tool + .btn-tool,
+.selector-header .selector-actions > .btn-tool-compact + .btn-tool,
+.selector-header .selector-actions > .btn-tool + .btn-tool-compact,
+.selector-header .selector-actions > .btn-tool-compact + .btn-tool-compact {
+    margin-top: 0;
+}
+
 .selector-actions.opencode-provider-actions {
     display: inline-flex;
     align-items: stretch;