@adhdev/daemon-core 0.9.82-rc.64 → 0.9.82-rc.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +4 -2
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
- package/src/commands/router.ts +3 -1
package/package.json
CHANGED
package/src/commands/router.ts
CHANGED
|
@@ -166,6 +166,7 @@ function summarizeRepoMeshStatusDebug(status: any): Record<string, unknown> {
|
|
|
166
166
|
meshId: readStringValue(status?.meshId, status?.mesh_id) ?? null,
|
|
167
167
|
refreshedAt: readStringValue(status?.refreshedAt, status?.refreshed_at) ?? null,
|
|
168
168
|
sourceOfTruth: status?.sourceOfTruth ?? null,
|
|
169
|
+
branchConvergenceSummary: status?.branchConvergenceSummary ?? status?.branch_convergence_summary ?? null,
|
|
169
170
|
nodeCount: nodes.length,
|
|
170
171
|
nodes: nodes.map((node: any) => ({
|
|
171
172
|
nodeId: readStringValue(node?.nodeId, node?.id) ?? null,
|
|
@@ -182,6 +183,7 @@ function summarizeRepoMeshStatusDebug(status: any): Record<string, unknown> {
|
|
|
182
183
|
gitProbePending: node?.gitProbePending === true,
|
|
183
184
|
launchReady: node?.launchReady === true,
|
|
184
185
|
git: summarizeRepoMeshDebugGit(node?.git),
|
|
186
|
+
branchConvergence: node?.branchConvergence ?? node?.branch_convergence ?? null,
|
|
185
187
|
})),
|
|
186
188
|
};
|
|
187
189
|
}
|
|
@@ -793,7 +795,7 @@ async function probeRemoteMeshGitStatus(args: {
|
|
|
793
795
|
}): Promise<Record<string, unknown> | null> {
|
|
794
796
|
if (!args.dispatchMeshCommand) return null;
|
|
795
797
|
const remoteResult = await Promise.race([
|
|
796
|
-
args.dispatchMeshCommand(args.daemonId, 'git_status', { workspace: args.workspace }),
|
|
798
|
+
args.dispatchMeshCommand(args.daemonId, 'git_status', { workspace: args.workspace, refreshUpstream: true }),
|
|
797
799
|
new Promise<never>((_, reject) => setTimeout(() => reject(new Error('timeout')), args.timeoutMs)),
|
|
798
800
|
]) as any;
|
|
799
801
|
const remoteGit = remoteResult?.status ?? remoteResult?.git ?? remoteResult;
|