@adhdev/daemon-core 0.9.77-rc.59 → 0.9.77-rc.60
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.d.ts +0 -2
- package/dist/index.js +63 -227
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +63 -226
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
- package/src/commands/router.ts +68 -0
- package/src/index.ts +5 -2
package/dist/index.d.ts
CHANGED
|
@@ -37,8 +37,6 @@ export { buildMeshLedgerReconciliationEvidence, buildMeshLedgerReplicaEvidence }
|
|
|
37
37
|
export type { MeshLedgerReconciliationEvidence, MeshLedgerReplicaEvidence, MeshLedgerReplicaStatus } from './mesh/mesh-ledger-reconciliation.js';
|
|
38
38
|
export { enqueueTask, getQueue, claimNextTask, updateTaskStatus, updateSessionTaskStatus, cancelTask, requeueTask, getMeshQueueStats } from './mesh/mesh-work-queue.js';
|
|
39
39
|
export type { MeshWorkQueueEntry, MeshTaskStatus, MeshWorkQueueStats } from './mesh/mesh-work-queue.js';
|
|
40
|
-
export { buildMeshGraph } from './mesh/mesh-visualization.js';
|
|
41
|
-
export type { MeshGraph, MeshGraphNode, MeshGraphEdge, MeshGraphNodeType, MeshGraphEdgeType } from './mesh/mesh-visualization.js';
|
|
42
40
|
export { triggerMeshQueue, drainPendingMeshCoordinatorEvents, getPendingMeshCoordinatorEvents, clearPendingMeshCoordinatorEvents } from './mesh/mesh-events.js';
|
|
43
41
|
export type { PendingMeshCoordinatorEvent } from './mesh/mesh-events.js';
|
|
44
42
|
export { P2pRelayFailureError, buildP2pRelayFailurePayload, classifyP2pRelayFailure, isP2pRelayTransportFailure, } from './mesh/p2p-relay-failure.js';
|
package/dist/index.js
CHANGED
|
@@ -5530,7 +5530,6 @@ __export(index_exports, {
|
|
|
5530
5530
|
buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
|
|
5531
5531
|
buildCoordinatorSystemPrompt: () => buildCoordinatorSystemPrompt,
|
|
5532
5532
|
buildMachineInfo: () => buildMachineInfo,
|
|
5533
|
-
buildMeshGraph: () => buildMeshGraph,
|
|
5534
5533
|
buildMeshLedgerReconciliationEvidence: () => buildMeshLedgerReconciliationEvidence,
|
|
5535
5534
|
buildMeshLedgerReplicaEvidence: () => buildMeshLedgerReplicaEvidence,
|
|
5536
5535
|
buildP2pRelayFailurePayload: () => buildP2pRelayFailurePayload,
|
|
@@ -7626,231 +7625,6 @@ function buildMeshLedgerReconciliationEvidence(meshId, replicas) {
|
|
|
7626
7625
|
|
|
7627
7626
|
// src/index.ts
|
|
7628
7627
|
init_mesh_work_queue();
|
|
7629
|
-
|
|
7630
|
-
// src/mesh/mesh-visualization.ts
|
|
7631
|
-
function isDirty(git) {
|
|
7632
|
-
if (!git) return false;
|
|
7633
|
-
return git.staged + git.modified + git.untracked + git.deleted + git.renamed > 0;
|
|
7634
|
-
}
|
|
7635
|
-
function dirtyFileCount(git) {
|
|
7636
|
-
if (!git) return 0;
|
|
7637
|
-
return git.staged + git.modified + git.untracked + git.deleted + git.renamed;
|
|
7638
|
-
}
|
|
7639
|
-
function detectOrphanReasons(node, defaultBranch) {
|
|
7640
|
-
const reasons = [];
|
|
7641
|
-
const git = node.git;
|
|
7642
|
-
if (!git) {
|
|
7643
|
-
reasons.push("No git status available");
|
|
7644
|
-
return reasons;
|
|
7645
|
-
}
|
|
7646
|
-
if (!git.isGitRepo) {
|
|
7647
|
-
reasons.push("Not a git repository");
|
|
7648
|
-
return reasons;
|
|
7649
|
-
}
|
|
7650
|
-
if (git.branch === null && git.headCommit) {
|
|
7651
|
-
reasons.push("Detached HEAD");
|
|
7652
|
-
}
|
|
7653
|
-
if (git.branch && !git.upstream) {
|
|
7654
|
-
if (defaultBranch && git.branch !== defaultBranch) {
|
|
7655
|
-
reasons.push(`No upstream: ${git.branch}`);
|
|
7656
|
-
}
|
|
7657
|
-
}
|
|
7658
|
-
if (git.branch && git.upstream === null && defaultBranch && git.branch !== defaultBranch) {
|
|
7659
|
-
if (!reasons.includes(`No upstream: ${git.branch}`)) {
|
|
7660
|
-
reasons.push(`No upstream: ${git.branch}`);
|
|
7661
|
-
}
|
|
7662
|
-
}
|
|
7663
|
-
if (node.error) {
|
|
7664
|
-
reasons.push(`Error: ${node.error}`);
|
|
7665
|
-
}
|
|
7666
|
-
return reasons;
|
|
7667
|
-
}
|
|
7668
|
-
function nodeHealthPriority(health) {
|
|
7669
|
-
switch (health) {
|
|
7670
|
-
case "online":
|
|
7671
|
-
return 0;
|
|
7672
|
-
case "dirty":
|
|
7673
|
-
return 1;
|
|
7674
|
-
case "degraded":
|
|
7675
|
-
return 2;
|
|
7676
|
-
case "wrong_branch":
|
|
7677
|
-
return 3;
|
|
7678
|
-
case "offline":
|
|
7679
|
-
return 4;
|
|
7680
|
-
case "unknown":
|
|
7681
|
-
return 5;
|
|
7682
|
-
default:
|
|
7683
|
-
return 5;
|
|
7684
|
-
}
|
|
7685
|
-
}
|
|
7686
|
-
function pickDominantHealth(healths) {
|
|
7687
|
-
if (healths.length === 0) return "unknown";
|
|
7688
|
-
return healths.reduce(
|
|
7689
|
-
(best, h) => nodeHealthPriority(h) > nodeHealthPriority(best) ? h : best
|
|
7690
|
-
);
|
|
7691
|
-
}
|
|
7692
|
-
function buildMeshGraph(status) {
|
|
7693
|
-
const nodes = [];
|
|
7694
|
-
const edges = [];
|
|
7695
|
-
const warnings = [];
|
|
7696
|
-
const branchToNodeIds = /* @__PURE__ */ new Map();
|
|
7697
|
-
for (const nodeStatus of status.nodes) {
|
|
7698
|
-
const git = nodeStatus.git;
|
|
7699
|
-
const branch = git?.branch || null;
|
|
7700
|
-
const orphanReasons = detectOrphanReasons(nodeStatus, null);
|
|
7701
|
-
const dirty = isDirty(git);
|
|
7702
|
-
const dfc = dirtyFileCount(git);
|
|
7703
|
-
let type = "worktreeNode";
|
|
7704
|
-
if (orphanReasons.length > 0) {
|
|
7705
|
-
type = "orphanNode";
|
|
7706
|
-
}
|
|
7707
|
-
const graphNode = {
|
|
7708
|
-
id: nodeStatus.nodeId,
|
|
7709
|
-
type,
|
|
7710
|
-
label: nodeStatus.machineLabel || nodeStatus.nodeId.slice(0, 8),
|
|
7711
|
-
workspace: nodeStatus.workspace,
|
|
7712
|
-
branch,
|
|
7713
|
-
health: nodeStatus.health,
|
|
7714
|
-
ahead: git?.ahead ?? 0,
|
|
7715
|
-
behind: git?.behind ?? 0,
|
|
7716
|
-
dirty,
|
|
7717
|
-
dirtyFiles: dfc,
|
|
7718
|
-
hasConflicts: git?.hasConflicts ?? false,
|
|
7719
|
-
activeSessionCount: nodeStatus.activeSessions?.length ?? 0,
|
|
7720
|
-
activeSessions: nodeStatus.activeSessions ?? [],
|
|
7721
|
-
providers: nodeStatus.providers ?? [],
|
|
7722
|
-
isOrphan: orphanReasons.length > 0,
|
|
7723
|
-
orphanReasons,
|
|
7724
|
-
source: nodeStatus
|
|
7725
|
-
};
|
|
7726
|
-
nodes.push(graphNode);
|
|
7727
|
-
if (branch) {
|
|
7728
|
-
const list = branchToNodeIds.get(branch) ?? [];
|
|
7729
|
-
list.push(graphNode.id);
|
|
7730
|
-
branchToNodeIds.set(branch, list);
|
|
7731
|
-
}
|
|
7732
|
-
}
|
|
7733
|
-
const branchUpstreamCounts = /* @__PURE__ */ new Map();
|
|
7734
|
-
for (const n of status.nodes) {
|
|
7735
|
-
const b = n.git?.branch;
|
|
7736
|
-
const upstream = n.git?.upstream;
|
|
7737
|
-
if (b && upstream) {
|
|
7738
|
-
branchUpstreamCounts.set(b, (branchUpstreamCounts.get(b) ?? 0) + 1);
|
|
7739
|
-
}
|
|
7740
|
-
}
|
|
7741
|
-
let inferredDefaultBranch = null;
|
|
7742
|
-
let bestCount = 0;
|
|
7743
|
-
for (const [b, count] of branchUpstreamCounts) {
|
|
7744
|
-
if (count > bestCount) {
|
|
7745
|
-
bestCount = count;
|
|
7746
|
-
inferredDefaultBranch = b;
|
|
7747
|
-
}
|
|
7748
|
-
}
|
|
7749
|
-
const defaultBranchNodeId = inferredDefaultBranch ? `__branch_${inferredDefaultBranch}` : null;
|
|
7750
|
-
if (defaultBranchNodeId && inferredDefaultBranch) {
|
|
7751
|
-
const branchNodes = branchToNodeIds.get(inferredDefaultBranch) ?? [];
|
|
7752
|
-
const branchHealths = branchNodes.map(
|
|
7753
|
-
(id) => nodes.find((n) => n.id === id).health
|
|
7754
|
-
);
|
|
7755
|
-
const defaultNode = {
|
|
7756
|
-
id: defaultBranchNodeId,
|
|
7757
|
-
type: "defaultBranchNode",
|
|
7758
|
-
label: inferredDefaultBranch,
|
|
7759
|
-
workspace: "",
|
|
7760
|
-
branch: inferredDefaultBranch,
|
|
7761
|
-
health: pickDominantHealth(branchHealths),
|
|
7762
|
-
ahead: 0,
|
|
7763
|
-
behind: 0,
|
|
7764
|
-
dirty: false,
|
|
7765
|
-
dirtyFiles: 0,
|
|
7766
|
-
hasConflicts: false,
|
|
7767
|
-
activeSessionCount: 0,
|
|
7768
|
-
activeSessions: [],
|
|
7769
|
-
providers: [],
|
|
7770
|
-
isOrphan: false,
|
|
7771
|
-
orphanReasons: [],
|
|
7772
|
-
nextStepHint: branchNodes.length > 0 ? `${branchNodes.length} node(s) on default branch` : void 0,
|
|
7773
|
-
source: {
|
|
7774
|
-
nodeId: defaultBranchNodeId,
|
|
7775
|
-
machineLabel: inferredDefaultBranch,
|
|
7776
|
-
workspace: "",
|
|
7777
|
-
health: "online",
|
|
7778
|
-
providers: [],
|
|
7779
|
-
activeSessions: []
|
|
7780
|
-
}
|
|
7781
|
-
};
|
|
7782
|
-
nodes.push(defaultNode);
|
|
7783
|
-
const seenBranches = /* @__PURE__ */ new Set();
|
|
7784
|
-
for (const n of nodes) {
|
|
7785
|
-
if (n.type === "defaultBranchNode") continue;
|
|
7786
|
-
if (!n.branch) continue;
|
|
7787
|
-
if (n.branch === inferredDefaultBranch) {
|
|
7788
|
-
edges.push({
|
|
7789
|
-
id: `${defaultBranchNodeId}--${n.id}`,
|
|
7790
|
-
source: defaultBranchNodeId,
|
|
7791
|
-
target: n.id,
|
|
7792
|
-
type: "parentBranch",
|
|
7793
|
-
label: "default"
|
|
7794
|
-
});
|
|
7795
|
-
continue;
|
|
7796
|
-
}
|
|
7797
|
-
if (seenBranches.has(n.branch)) continue;
|
|
7798
|
-
seenBranches.add(n.branch);
|
|
7799
|
-
edges.push({
|
|
7800
|
-
id: `${defaultBranchNodeId}--branch_${n.branch}`,
|
|
7801
|
-
source: defaultBranchNodeId,
|
|
7802
|
-
target: n.branch,
|
|
7803
|
-
type: "parentBranch",
|
|
7804
|
-
label: n.branch
|
|
7805
|
-
});
|
|
7806
|
-
}
|
|
7807
|
-
}
|
|
7808
|
-
for (const [branch, ids] of branchToNodeIds) {
|
|
7809
|
-
if (ids.length < 2) continue;
|
|
7810
|
-
for (let i = 1; i < ids.length; i++) {
|
|
7811
|
-
edges.push({
|
|
7812
|
-
id: `wt_${ids[0]}--${ids[i]}`,
|
|
7813
|
-
source: ids[0],
|
|
7814
|
-
target: ids[i],
|
|
7815
|
-
type: "worktreeLink",
|
|
7816
|
-
label: branch
|
|
7817
|
-
});
|
|
7818
|
-
}
|
|
7819
|
-
}
|
|
7820
|
-
const orphanCount = nodes.filter((n) => n.isOrphan).length;
|
|
7821
|
-
if (orphanCount > 0) {
|
|
7822
|
-
warnings.push(`${orphanCount} orphan node(s) detected`);
|
|
7823
|
-
}
|
|
7824
|
-
const conflictCount = nodes.filter((n) => n.hasConflicts).length;
|
|
7825
|
-
if (conflictCount > 0) {
|
|
7826
|
-
warnings.push(`${conflictCount} node(s) with merge conflicts`);
|
|
7827
|
-
}
|
|
7828
|
-
const offlineCount = nodes.filter((n) => n.health === "offline").length;
|
|
7829
|
-
if (offlineCount > 0) {
|
|
7830
|
-
warnings.push(`${offlineCount} node(s) offline`);
|
|
7831
|
-
}
|
|
7832
|
-
const stats = {
|
|
7833
|
-
totalNodes: status.nodes.length,
|
|
7834
|
-
onlineNodes: status.nodes.filter((n) => n.health === "online").length,
|
|
7835
|
-
dirtyNodes: nodes.filter((n) => n.dirty).length,
|
|
7836
|
-
orphanNodes: orphanCount,
|
|
7837
|
-
errorNodes: status.nodes.filter((n) => !!n.error).length,
|
|
7838
|
-
offlineNodes: offlineCount,
|
|
7839
|
-
totalActiveSessions: status.nodes.reduce((sum, n) => sum + (n.activeSessions?.length ?? 0), 0)
|
|
7840
|
-
};
|
|
7841
|
-
return {
|
|
7842
|
-
meshId: status.meshId,
|
|
7843
|
-
meshName: status.meshName,
|
|
7844
|
-
repoIdentity: status.repoIdentity,
|
|
7845
|
-
refreshedAt: status.refreshedAt,
|
|
7846
|
-
nodes,
|
|
7847
|
-
edges,
|
|
7848
|
-
stats,
|
|
7849
|
-
warnings
|
|
7850
|
-
};
|
|
7851
|
-
}
|
|
7852
|
-
|
|
7853
|
-
// src/index.ts
|
|
7854
7628
|
init_mesh_events();
|
|
7855
7629
|
|
|
7856
7630
|
// src/mesh/p2p-relay-failure.ts
|
|
@@ -26190,6 +25964,69 @@ ${block}`);
|
|
|
26190
25964
|
return { success: false, error: e.message };
|
|
26191
25965
|
}
|
|
26192
25966
|
}
|
|
25967
|
+
case "mesh_status": {
|
|
25968
|
+
const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
|
|
25969
|
+
if (!meshId) return { success: false, error: "meshId required" };
|
|
25970
|
+
try {
|
|
25971
|
+
const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
|
|
25972
|
+
const mesh = meshRecord?.mesh;
|
|
25973
|
+
if (!mesh) return { success: false, error: "Mesh not found" };
|
|
25974
|
+
const { getMeshQueueStats: getMeshQueueStats2, getQueue: getQueue2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
|
|
25975
|
+
const queue = getQueue2(meshId);
|
|
25976
|
+
const queueSummary = getMeshQueueStats2(meshId);
|
|
25977
|
+
const { readLedgerEntries: readLedgerEntries2, getLedgerSummary: getLedgerSummary2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
|
|
25978
|
+
const ledgerEntries = readLedgerEntries2(meshId, { tail: 20 });
|
|
25979
|
+
const ledgerSummary = getLedgerSummary2(meshId);
|
|
25980
|
+
const nodeStatuses = [];
|
|
25981
|
+
for (const node of mesh.nodes || []) {
|
|
25982
|
+
const status = {
|
|
25983
|
+
nodeId: node.id || node.nodeId,
|
|
25984
|
+
workspace: node.workspace,
|
|
25985
|
+
repoRoot: node.repoRoot,
|
|
25986
|
+
isLocalWorktree: node.isLocalWorktree,
|
|
25987
|
+
worktreeBranch: node.worktreeBranch,
|
|
25988
|
+
daemonId: node.daemonId,
|
|
25989
|
+
machineId: node.machineId,
|
|
25990
|
+
health: "unknown"
|
|
25991
|
+
};
|
|
25992
|
+
if (node.workspace && typeof node.workspace === "string") {
|
|
25993
|
+
try {
|
|
25994
|
+
const { execFile: execFile3 } = await import("child_process");
|
|
25995
|
+
const { promisify: promisify3 } = await import("util");
|
|
25996
|
+
const execFileAsync3 = promisify3(execFile3);
|
|
25997
|
+
const branch = await execFileAsync3("git", ["-C", node.workspace, "branch", "--show-current"], {
|
|
25998
|
+
encoding: "utf8",
|
|
25999
|
+
timeout: 1e4
|
|
26000
|
+
}).then((r) => r.stdout.trim()).catch(() => "");
|
|
26001
|
+
const porc = await execFileAsync3("git", ["-C", node.workspace, "status", "--porcelain"], {
|
|
26002
|
+
encoding: "utf8",
|
|
26003
|
+
timeout: 1e4
|
|
26004
|
+
}).then((r) => r.stdout.trim()).catch(() => "");
|
|
26005
|
+
const dirty = porc.length > 0;
|
|
26006
|
+
status.branch = branch;
|
|
26007
|
+
status.isDirty = dirty;
|
|
26008
|
+
status.uncommittedChanges = porc ? porc.split("\n").filter(Boolean).length : 0;
|
|
26009
|
+
status.health = branch ? dirty ? "dirty" : "online" : "degraded";
|
|
26010
|
+
} catch {
|
|
26011
|
+
status.health = "degraded";
|
|
26012
|
+
}
|
|
26013
|
+
}
|
|
26014
|
+
nodeStatuses.push(status);
|
|
26015
|
+
}
|
|
26016
|
+
return {
|
|
26017
|
+
success: true,
|
|
26018
|
+
meshId: mesh.id,
|
|
26019
|
+
meshName: mesh.name,
|
|
26020
|
+
repoIdentity: mesh.repoIdentity,
|
|
26021
|
+
defaultBranch: mesh.defaultBranch,
|
|
26022
|
+
nodes: nodeStatuses,
|
|
26023
|
+
queue: { tasks: queue, summary: queueSummary },
|
|
26024
|
+
ledger: { entries: ledgerEntries, summary: ledgerSummary }
|
|
26025
|
+
};
|
|
26026
|
+
} catch (e) {
|
|
26027
|
+
return { success: false, error: e.message };
|
|
26028
|
+
}
|
|
26029
|
+
}
|
|
26193
26030
|
default:
|
|
26194
26031
|
break;
|
|
26195
26032
|
}
|
|
@@ -34261,7 +34098,6 @@ async function shutdownDaemonComponents(components) {
|
|
|
34261
34098
|
buildChatTailDeliverySignature,
|
|
34262
34099
|
buildCoordinatorSystemPrompt,
|
|
34263
34100
|
buildMachineInfo,
|
|
34264
|
-
buildMeshGraph,
|
|
34265
34101
|
buildMeshLedgerReconciliationEvidence,
|
|
34266
34102
|
buildMeshLedgerReplicaEvidence,
|
|
34267
34103
|
buildP2pRelayFailurePayload,
|