mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-21 21:39:33 +01:00
fix: apply the review items for #714 at merge
- Session update no longer resets "How often" while typing: updateGitFetchStatus (session-ui.js) leaves a control alone while it is document.activeElement, and autoSaveGitFetch writes the clamped interval back itself (Enter saves with the field still focused). - Partial override shows the app values: enabled = session ?? app switch, interval = session ?? app interval ?? 300 (session-ui.js updateGitFetchStatus). - runFetch (git-fetch.ts) arms the spawn with what the core.sshCommand read left of timeoutMs, and answers ETIMEDOUT without spawning when nothing is left, so a git that never answers costs one timeout, not two. - fetchEnvFor keeps a GIT_SSH from the server's environment (repoSshCommand || base.GIT_SSH), fileoverview and CLAUDE.md line updated to say so. - i18n.js: the zh-CN "Git fetch on an interval" description scopes the only writing git command to the Git window. - styles.css: the disabled/busy rules are scoped to .git-status-actions .btn-icon-sm (moved beside .git-status-actions), and the busy pulse stops under prefers-reduced-motion. - Comments that called the override per case now say per session: session.ts (field, restore and getter docs, setGitFetchSettings), git-fetch-scheduler.ts:2, server-timing.ts:78, server.ts (cleanup and restore), app.js _onSessionUpdated, session-ui.js (openSessionOptions and updateGitFetchStatus). - Tests: test/git-fetch-session-options-ui.test.ts (new, JSDOM: typing survives an SSE update, the Enter write-back, both partial cases); test/git-fetch.test.ts (GIT_SSH kept; one bound for the read and the fetch, stub git on PATH). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
3411d7f35a
commit
6539bc6c82
12 files changed
+299
-68
No files matched your search
@@ -2685,7 +2685,7 @@ Object.assign(CodemanApp.prototype, {
|
||||
document.getElementById('modalKeepWarmEnabled').checked =
|
||||
session.keepWarm?.enabled ?? session.keepWarmEnabled ?? false;
|
||||
this.updateKeepWarmStatus(sessionId);
|
||||
// Git: the case's own choice if it has one, otherwise the app setting. updateGitFetchStatus is also
|
||||
// Git: the session's own choice if it has one, otherwise the app setting. updateGitFetchStatus is also
|
||||
// what SSE calls when a scheduled run lands, so the rows stay current while the modal is open.
|
||||
this.updateGitFetchStatus(sessionId);
|
||||
document.getElementById('modalImageWatcherEnabled').checked = session.imageWatcherEnabled ?? true;
|
||||
@@ -3032,11 +3032,15 @@ Object.assign(CodemanApp.prototype, {
|
||||
},
|
||||
|
||||
/**
|
||||
* The Git tab: the case's last scheduled run, and which values its rows show. A case with no choice of its
|
||||
* own follows the app setting, so its switch and interval display the app's numbers and go inert — the same
|
||||
* inert-row pattern as updateKeepWarmStatus above — because changing them here is what makes the case stop
|
||||
* following. The app numbers come from the settings cache, so what this shows can be one settings load
|
||||
* The Git tab: the session's last scheduled run, and which values its rows show. A session with no choice of
|
||||
* its own follows the app setting, so its switch and interval display the app's numbers and go inert (the
|
||||
* same inert-row pattern as updateKeepWarmStatus above), because changing them here is what makes the session
|
||||
* stop following. The app numbers come from the settings cache, so what this shows can be one settings load
|
||||
* behind; the server decides from a fresh read, not from what the page displays.
|
||||
*
|
||||
* SSE calls this on every `session:updated` for the open session (app.js `_onSessionUpdated`), and a working
|
||||
* session sends one on each working/idle change, so a control the user is in (`document.activeElement`) is
|
||||
* left as it is: rewriting it put a half-typed interval back to the stored one before `onchange` could save it.
|
||||
*/
|
||||
updateGitFetchStatus(sessionId) {
|
||||
const statusEl = document.getElementById('gitFetchStatus');
|
||||
@@ -3048,15 +3052,17 @@ Object.assign(CodemanApp.prototype, {
|
||||
if (!session) return;
|
||||
|
||||
const app = this.loadAppSettingsFromStorage() || {};
|
||||
// No choice of its own on either field means the session follows the app. A partial one — its own switch,
|
||||
// the app's interval — means it does not, and the row that still follows shows the app's value.
|
||||
// No choice of its own on either field means the session follows the app. A partial one (its own switch,
|
||||
// the app's interval) means it does not, and the row that still follows shows the app's value, which is
|
||||
// also the value the scheduler runs it with (a default here would show one number and fetch at another).
|
||||
const follows = session.gitFetchEnabled === undefined && session.gitFetchIntervalSeconds === undefined;
|
||||
const enabled = follows ? app.gitFetchEnabled === true : session.gitFetchEnabled ?? false;
|
||||
const interval = follows ? app.gitFetchIntervalSeconds ?? 300 : session.gitFetchIntervalSeconds ?? 300;
|
||||
const enabled = session.gitFetchEnabled ?? (app.gitFetchEnabled === true);
|
||||
const interval = session.gitFetchIntervalSeconds ?? app.gitFetchIntervalSeconds ?? 300;
|
||||
|
||||
followBox.checked = follows;
|
||||
box.checked = enabled;
|
||||
num.value = interval;
|
||||
const focused = document.activeElement;
|
||||
if (followBox !== focused) followBox.checked = follows;
|
||||
if (box !== focused) box.checked = enabled;
|
||||
if (num !== focused) num.value = interval;
|
||||
for (const el of [box, num]) {
|
||||
el.closest('.set-row')?.classList.toggle('set-row-disabled', follows);
|
||||
el.disabled = follows;
|
||||
@@ -3085,16 +3091,17 @@ Object.assign(CodemanApp.prototype, {
|
||||
async autoSaveGitFetch() {
|
||||
if (!this.editingSessionId) return;
|
||||
const follow = document.getElementById('modalGitFetchFollow').checked;
|
||||
const num = document.getElementById('modalGitFetchInterval');
|
||||
// `null` on the route means "no choice of your own", which is what following the app setting is.
|
||||
const body = follow
|
||||
? { enabled: null, intervalSeconds: null }
|
||||
: {
|
||||
enabled: document.getElementById('modalGitFetchEnabled').checked,
|
||||
intervalSeconds: Math.min(
|
||||
3600,
|
||||
Math.max(30, parseInt(document.getElementById('modalGitFetchInterval').value, 10) || 300)
|
||||
),
|
||||
intervalSeconds: Math.min(3600, Math.max(30, parseInt(num.value, 10) || 300)),
|
||||
};
|
||||
// Enter fires `onchange` with the field still focused, and updateGitFetchStatus leaves a focused field
|
||||
// alone, so the clamped number is written back here or the field would keep showing what was typed.
|
||||
if (!follow) num.value = body.intervalSeconds;
|
||||
try {
|
||||
// `_apiPost` hands back the Response without checking it, so a refused body (a 400) still read as a
|
||||
// save. `_apiJson` is the one that says whether the call went through, and null here means it did not.
|
||||
|
||||
Reference in new issue
Block a user