mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-16 11:19:33 +01:00
Merge pull request #714: feat(git): a Fetch button in the Git status header, and an interval for it app-wide and per case
Conflict in CLAUDE.md (Adding Features, App setting) resolved by keeping both sides: #714's sentence that a setting the server acts on must be synced, after the `.strict()` clause, and #719's mutateSettingsFile() rule at the end of the bullet. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
6612a89ebc
36 files changed
+3662
-44
No files matched your search
@@ -100,6 +100,7 @@ import { getLifecycleLog } from '../session-lifecycle-log.js';
|
||||
import {
|
||||
applyWorkspaceHooks,
|
||||
pruneAgentSessionPreambles,
|
||||
readGitFetchSettings,
|
||||
readKeepWarmSettingsOrThrow,
|
||||
readPlanUsageTelemetryEnabled,
|
||||
removeAgentSessionPreamble,
|
||||
@@ -123,6 +124,10 @@ import { AI_CHECK_MODEL } from '../config/ai-defaults.js';
|
||||
import { approvalInbox } from './approval-inbox.js';
|
||||
import { SCREEN_BLOCKED_SOURCE } from './screen-blocked.js';
|
||||
import { PromptCacheKeepWarmService } from '../prompt-cache-keepwarm.js';
|
||||
import { fetchWorkspaceOnce } from '../git-fetch.js';
|
||||
import { GitFetchScheduler } from '../git-fetch-scheduler.js';
|
||||
import { probePathKind } from '../utils/bounded-path-probe.js';
|
||||
import { defaultDockerWorkspaces } from './routes/git-status-routes.js';
|
||||
import { composerIsEmpty, plainFrame } from '../session-submit-verifier.js';
|
||||
import { detectUsageLimitPause } from '../usage-limit-patterns.js';
|
||||
import { stopDeepSeekWeb } from '../deepseek-web-server.js';
|
||||
@@ -294,6 +299,7 @@ import {
|
||||
STATS_COLLECTION_INTERVAL_MS,
|
||||
INACTIVITY_TIMEOUT_MS,
|
||||
CRON_TICK_INTERVAL,
|
||||
GIT_FETCH_TICK_INTERVAL_MS,
|
||||
} from '../config/server-timing.js';
|
||||
|
||||
/**
|
||||
@@ -390,6 +396,36 @@ export class WebServer extends EventEmitter {
|
||||
},
|
||||
log: (message) => console.log(message),
|
||||
});
|
||||
// Git fetch on an interval (git-fetch-scheduler.ts): the due-tracking lives in the service; the server
|
||||
// lends it the facts a decision needs and stores what it reports on the session. A field initializer for
|
||||
// the same reason as the keep-warm one above, and the scheduler reads the app setting FRESH on every tick
|
||||
// — that is what makes a live toggle take effect on the next tick, and what makes turning it off actually
|
||||
// stop the fetching. Default OFF, so an install that never enabled it spawns nothing at all.
|
||||
private readonly gitFetchScheduler = new GitFetchScheduler({
|
||||
sessionIds: () => this.sessions.keys(),
|
||||
getSession: (id) => this.sessions.get(id),
|
||||
readSettings: readGitFetchSettings,
|
||||
// The same Docker list the panel's routes use: the rule has to be one rule.
|
||||
dockerWorkspaces: defaultDockerWorkspaces,
|
||||
// Bounded probe, DEFAULT options (rule #516): a tick is a bulk scan, so it keeps the stall cap and must
|
||||
// never be handed `pastCap`. A folder on a mount that stopped answering is skipped, not fetched.
|
||||
probePath: (path) => probePathKind(path),
|
||||
// Through the join, so the tick and the panel's Fetch button are the same run: a click on a folder the
|
||||
// tick is already fetching joins it rather than starting a second `git fetch` in the same clone — and the
|
||||
// run that gets published is the one that ran, with its own trigger.
|
||||
fetch: (cwd, opts, trigger) => fetchWorkspaceOnce(cwd, opts, trigger),
|
||||
publish: (id, status) => {
|
||||
const session = this.sessions.get(id);
|
||||
if (!session?.setGitFetchStatus(status)) return;
|
||||
// No new SSE event: the status rides the session state the page already listens for, and the Git
|
||||
// panel polls on its own clock. It is written to disk with the rest of the record, but the restore
|
||||
// copies only the fields its own config lists and this is not one of them (src/types/session.ts), so
|
||||
// what a run found is the panel's truth for the life of the session, not across a restart.
|
||||
this.persistSessionState(session);
|
||||
this.broadcast(SseEvent.SessionUpdated, this.getSessionStateWithRespawn(session));
|
||||
},
|
||||
log: (message) => console.log(message),
|
||||
});
|
||||
/**
|
||||
* Wake-on-LAN registry, returned by `registerSessionRoutes`. Held for its LIFETIME
|
||||
* only — `drop()` on session cleanup, `stop()` on shutdown. Waking from here would
|
||||
@@ -1248,6 +1284,21 @@ export class WebServer extends EventEmitter {
|
||||
registerRebootRestoreRoutes(this.app, ctx);
|
||||
registerReadMyMindRoutes(this.app, ctx);
|
||||
registerGitStatusRoutes(this.app, ctx);
|
||||
// Git fetch on an interval: this is only the wake-up, the scheduler itself decides what is due. Off in
|
||||
// tests for the same reason as the polls below — a test drives `tick()` directly instead of waiting on
|
||||
// a timer the harness would have to keep alive. The setting is read FRESH inside `tick()`, so turning
|
||||
// it on takes effect on the next tick and turning it off actually stops the fetching.
|
||||
if (!this.testMode) {
|
||||
this.cleanup.setInterval(
|
||||
() => {
|
||||
this.gitFetchScheduler.tick().catch((err) => {
|
||||
console.error('[git fetch] interval tick failed:', getErrorMessage(err));
|
||||
});
|
||||
},
|
||||
GIT_FETCH_TICK_INTERVAL_MS,
|
||||
{ description: 'git fetch interval checker' }
|
||||
);
|
||||
}
|
||||
registerStatusTelemetryRoutes(this.app, ctx);
|
||||
registerSystemRoutes(this.app, ctx);
|
||||
registerCaseRoutes(this.app, ctx);
|
||||
@@ -1505,6 +1556,9 @@ export class WebServer extends EventEmitter {
|
||||
): Promise<void> {
|
||||
const session = this.sessions.get(sessionId);
|
||||
this.keepWarmService.remove(sessionId);
|
||||
// A closed session takes its place in the fetch schedule with it: otherwise a detached-and-forgotten id
|
||||
// would still count as tracked, and its next run would land on a session that no longer exists.
|
||||
this.gitFetchScheduler.remove(sessionId);
|
||||
const pinned = session?.pinned === true || this.store.getSession(sessionId)?.pinned === true;
|
||||
if (coordinateLayout && session && killMux && !pinned) {
|
||||
return this.tabLayouts.runSessionDeletion([{ id: sessionId, owner: session.owner }], () =>
|
||||
@@ -3542,6 +3596,9 @@ export class WebServer extends EventEmitter {
|
||||
if (saved.autoClearEnabled !== undefined || saved.autoClearThreshold !== undefined) {
|
||||
session.setAutoClear(saved.autoClearEnabled ?? false, saved.autoClearThreshold);
|
||||
}
|
||||
if (saved.gitFetchEnabled !== undefined || saved.gitFetchIntervalSeconds !== undefined) {
|
||||
session.setGitFetchSettings(saved.gitFetchEnabled, saved.gitFetchIntervalSeconds);
|
||||
}
|
||||
if (saved.autoResumeEnabled) {
|
||||
// The stamp is re-armed by default, because a Codeman restart leaves the
|
||||
// limit footer un-reprinted and dropping it there would strand the pause.
|
||||
@@ -3764,6 +3821,11 @@ export class WebServer extends EventEmitter {
|
||||
// below, a future `expiresAt` re-arms the timer once the pane is attached.
|
||||
lastRealPromptAt: savedState?.lastRealPromptAt,
|
||||
keepWarmEnabled: savedState?.keepWarmEnabled,
|
||||
// The session's own fetch switch and interval, carried over rather than reset to the app default:
|
||||
// the choice is the user's and outlives the run that made it. The scheduler reads them fresh
|
||||
// on its next tick, so a restored session is back on its own schedule without a restart.
|
||||
gitFetchEnabled: savedState?.gitFetchEnabled,
|
||||
gitFetchIntervalSeconds: savedState?.gitFetchIntervalSeconds,
|
||||
// Conversations this pane provably owned, oldest first. Its tail is
|
||||
// the conversation the CLI was on when the server stopped, which is
|
||||
// what a re-attach must point the viewer at instead of the launch id.
|
||||
@@ -4235,6 +4297,9 @@ export class WebServer extends EventEmitter {
|
||||
sessionWaits.cancelEverything();
|
||||
approvalInbox.stop();
|
||||
this.keepWarmService.stop();
|
||||
// Stops the fetch sweep from starting another run while the server is closing; a git process already
|
||||
// running is left to finish, which is what a fetch does to a repository nothing else is touching.
|
||||
this.gitFetchScheduler.stop();
|
||||
// A post within the debounce window before shutdown would otherwise not reach disk.
|
||||
// Flushed again after `app.close()` below, for a post that lands in between.
|
||||
agentInboxPersistence.flush();
|
||||
|
||||
Reference in new issue
Block a user