@sleep2agi/commhub-server 0.9.0-preview.22 → 0.9.0-preview.220
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/README.md +129 -9
- package/bin/commhub.ts +93 -9
- package/package.json +7 -7
- package/src/ack-create-request-transport.test.ts +182 -0
- package/src/ack-create-request.test.ts +50 -7
- package/src/admin-delete-network-http.test.ts +228 -0
- package/src/admin-networks-http.test.ts +88 -0
- package/src/adoption-candidates-http.test.ts +137 -0
- package/src/adoption-candidates.ts +158 -0
- package/src/agent-access-batch.test.ts +210 -0
- package/src/agent-access.ts +487 -0
- package/src/agent-acl-groups-http.test.ts +247 -0
- package/src/agent-acl-http.test.ts +659 -0
- package/src/agent-acl-slice3-http.test.ts +654 -0
- package/src/agent-department-http.test.ts +215 -0
- package/src/agent-groups-perf.test.ts +223 -0
- package/src/agent-notice.ts +48 -0
- package/src/agent-team-whoami-http.test.ts +98 -0
- package/src/agent-teams-http.test.ts +330 -0
- package/src/agent-teams.ts +244 -0
- package/src/alias-baseline-2571.test.ts +162 -0
- package/src/alias-baseline.ts +113 -0
- package/src/alias-filter.test.ts +72 -0
- package/src/alias-filter.ts +42 -0
- package/src/api-host-supervisors-can-create-nodes.test.ts +350 -0
- package/src/api-host-supervisors-fallback.test.ts +6 -7
- package/src/api-host-supervisors-runtime-readiness.test.ts +195 -0
- package/src/api-nodes-shape.test.ts +120 -13
- package/src/auth-password-change-cli-tokens-http.test.ts +423 -0
- package/src/auth-sessions-http.test.ts +250 -0
- package/src/auth-validate.test.ts +5 -1
- package/src/auth-weak-password-login.test.ts +176 -0
- package/src/auth.ts +609 -51
- package/src/avatar-validate.test.ts +52 -2
- package/src/avatar-validate.ts +35 -1
- package/src/backfill-node-ids-2664.test.ts +128 -0
- package/src/binding-generation-http.test.ts +121 -0
- package/src/blocked-exit-on-reply.test.ts +122 -0
- package/src/broadcast-fanout-2721.test.ts +149 -0
- package/src/broadcast-fanout.ts +117 -0
- package/src/chain-attempt-dedup.test.ts +447 -0
- package/src/clone-node.test.ts +248 -0
- package/src/clone-node.ts +289 -0
- package/src/codex-config-flags.ts +77 -0
- package/src/codex-fork-contract.ts +23 -0
- package/src/codex-fork-migration.test.ts +38 -0
- package/src/commhub-bin-args.test.ts +85 -0
- package/src/config-apply-validate.test.ts +188 -1
- package/src/config-apply-validate.ts +222 -3
- package/src/cors-origins.test.ts +40 -0
- package/src/create-node-blocked-gate.test.ts +356 -0
- package/src/create-node-network-id.test.ts +91 -0
- package/src/create-node-tool-schema.test.ts +49 -0
- package/src/create-node-unicode-name.test.ts +120 -0
- package/src/create-node-validate.test.ts +199 -7
- package/src/create-node-validate.ts +232 -15
- package/src/create-node-workdir.test.ts +289 -0
- package/src/create-node.ts +88 -23
- package/src/daemon-provider-snapshots.test.ts +421 -0
- package/src/daemon-provider-snapshots.ts +327 -0
- package/src/daemon-token-owner-http.test.ts +236 -0
- package/src/dashboard-slash-routing-http.test.ts +109 -0
- package/src/db-adapter-guard.test.ts +148 -0
- package/src/db-adapter-translate.test.ts +128 -0
- package/src/db-adapter.ts +377 -91
- package/src/db-timestamp.test.ts +38 -0
- package/src/db-timestamp.ts +15 -0
- package/src/db.ts +1296 -153
- package/src/delivered-without-push.test.ts +140 -0
- package/src/department-groups-http.test.ts +209 -0
- package/src/department-groups-sync-http.test.ts +328 -0
- package/src/department-groups.ts +434 -0
- package/src/department-heads-http.test.ts +350 -0
- package/src/department-heads.ts +226 -0
- package/src/departments-agent-count.test.ts +132 -0
- package/src/departments-http.test.ts +185 -0
- package/src/departments-mcp.test.ts +128 -0
- package/src/departments.ts +318 -0
- package/src/desktop-message-seam.test.ts +150 -0
- package/src/desktop-message.test.ts +368 -0
- package/src/dm-file-scope-http.test.ts +178 -0
- package/src/empty-node-sweeper.test.ts +104 -0
- package/src/empty-node-sweeper.ts +88 -0
- package/src/env-transport-gate-http.test.ts +240 -0
- package/src/env-transport-gate.ts +80 -0
- package/src/env-transport-policy.ts +56 -0
- package/src/etag-of.test.ts +57 -0
- package/src/event-loop-lag.test.ts +180 -0
- package/src/event-loop-lag.ts +201 -0
- package/src/ext-token-shared.test.ts +60 -0
- package/src/ext-validation-regression.test.ts +131 -0
- package/src/external-schedule-edits-http.test.ts +321 -0
- package/src/external-schedule-edits-timestamps.test.ts +64 -0
- package/src/external-schedule-edits.ts +327 -0
- package/src/file-download-authz-dev-open.test.ts +135 -0
- package/src/file-download-authz.test.ts +404 -0
- package/src/file-download-date-bucket.test.ts +436 -0
- package/src/file-network-scope-dev-open.test.ts +97 -0
- package/src/file-network-scope.test.ts +732 -0
- package/src/group-membership-events-http.test.ts +264 -0
- package/src/group-messages-http.test.ts +482 -0
- package/src/group-messages.ts +297 -0
- package/src/health-anon-readers.ts +59 -0
- package/src/health-host-disk-2756.test.ts +71 -0
- package/src/health-redaction.test.ts +1574 -2
- package/src/host-supervisor-identity-http.test.ts +152 -0
- package/src/host-supervisor-identity.ts +92 -0
- package/src/host-supervisors-daemon-version.test.ts +137 -0
- package/src/http-gzip.test.ts +94 -0
- package/src/http-gzip.ts +112 -0
- package/src/hub-catalog-read-http.test.ts +266 -0
- package/src/hub-provider-config.test.ts +156 -0
- package/src/hub-provider-config.ts +124 -0
- package/src/hub-timestamp.test.ts +38 -0
- package/src/hub-timestamp.ts +27 -0
- package/src/human-dm.ts +215 -0
- package/src/human-inbox.ts +42 -0
- package/src/inbox-caller.ts +49 -0
- package/src/inbox-count-sse.test.ts +310 -0
- package/src/inbox-count.ts +29 -0
- package/src/index.ts +6 -2
- package/src/license-state.test.ts +56 -0
- package/src/license-state.ts +48 -0
- package/src/list-host-supervisors.test.ts +15 -4
- package/src/mcp-context-cost-http.test.ts +127 -0
- package/src/mcp-inflight.test.ts +92 -0
- package/src/mcp-inflight.ts +38 -0
- package/src/mcp-projects-events-http.test.ts +165 -0
- package/src/mcp-route-label-http.test.ts +120 -0
- package/src/mcp-write-network-resolution.test.ts +435 -0
- package/src/member-audit-network-id-http.test.ts +93 -0
- package/src/member-presence-http.test.ts +210 -0
- package/src/messages-ack-by-agent-http.test.ts +142 -0
- package/src/migrate-sqlite-to-pg.test.ts +47 -0
- package/src/migrate-sqlite-to-pg.ts +263 -0
- package/src/model-auth-notify-http.test.ts +181 -0
- package/src/model-auth-notify.ts +116 -0
- package/src/network-name-http.test.ts +75 -0
- package/src/network-rules-http.test.ts +169 -0
- package/src/network-rules.ts +129 -0
- package/src/network-scope.ts +276 -0
- package/src/network-token-membership-http.test.ts +139 -0
- package/src/node-alias-control.ts +12 -0
- package/src/node-attrs-validate.ts +88 -0
- package/src/node-attrs.test.ts +258 -0
- package/src/node-caller-identity-http.test.ts +1091 -0
- package/src/node-create-request-status-http.test.ts +105 -0
- package/src/node-daemon-bindings.test.ts +132 -0
- package/src/node-daemon-bindings.ts +135 -0
- package/src/node-failure-alert.test.ts +150 -0
- package/src/node-failure-alert.ts +177 -0
- package/src/node-files-transport.test.ts +344 -0
- package/src/node-health-codex-login.test.ts +120 -0
- package/src/node-health-dispatch-http.test.ts +335 -0
- package/src/node-health-guard.ts +121 -0
- package/src/node-health-passthrough.test.ts +115 -0
- package/src/node-health-store.ts +101 -0
- package/src/node-id-alias.test.ts +190 -0
- package/src/node-identity-conflict-http.test.ts +269 -0
- package/src/node-identity-conflict.ts +142 -0
- package/src/node-identity-mismatch.test.ts +74 -0
- package/src/node-in-flight-tasks.ts +31 -0
- package/src/node-lifecycle-controllable.test.ts +64 -0
- package/src/node-lifecycle-controllable.ts +53 -0
- package/src/node-lifecycle-read-http.test.ts +250 -0
- package/src/node-lifecycle-read.ts +124 -0
- package/src/node-logs-transport.test.ts +263 -0
- package/src/node-peer-allowlist.test.ts +114 -0
- package/src/node-permissions-http.test.ts +728 -0
- package/src/node-permissions.ts +494 -0
- package/src/node-request-retention.test.ts +281 -0
- package/src/node-request-retention.ts +120 -0
- package/src/node-secret-rest-http.test.ts +190 -0
- package/src/node-serviceability.test.ts +86 -0
- package/src/node-serviceability.ts +124 -0
- package/src/node-session-control-http.test.ts +310 -0
- package/src/node-session-control.ts +258 -0
- package/src/node-skills-transport.test.ts +212 -0
- package/src/node-token-identity.ts +35 -0
- package/src/node-token-ownership.ts +51 -0
- package/src/node-token-privilege-http.test.ts +158 -0
- package/src/not-found-api-http.test.ts +67 -0
- package/src/observer-avatar-http.test.ts +102 -9
- package/src/observer-push.test.ts +76 -0
- package/src/opencode-catalog-report-http.test.ts +139 -0
- package/src/opencode-v2-catalog.test.ts +268 -0
- package/src/opencode-v2-catalog.ts +356 -0
- package/src/package-version-consistency.test.ts +25 -0
- package/src/parent-source-marker.test.ts +50 -0
- package/src/password-network-tokens.ts +25 -0
- package/src/peer-reply-atomic.test.ts +457 -0
- package/src/peer-reply-capability.test.ts +70 -0
- package/src/pg-worker.ts +87 -0
- package/src/poll-pacing.test.ts +74 -0
- package/src/poll-pacing.ts +123 -0
- package/src/project-dir-warn-clear-http.test.ts +132 -0
- package/src/project-viewer-can-http.test.ts +116 -0
- package/src/push.test.ts +20 -10
- package/src/push.ts +382 -9
- package/src/redact-tokens.test.ts +86 -0
- package/src/redact-tokens.ts +43 -0
- package/src/rejection-counters.test.ts +72 -0
- package/src/rejection-counters.ts +173 -0
- package/src/rename.ts +38 -10
- package/src/reply-target-derivation.test.ts +96 -0
- package/src/report-status-handover-capabilities-http.test.ts +124 -0
- package/src/report-status-host-schema.test.ts +235 -0
- package/src/report-status-resume-id-handover.test.ts +184 -0
- package/src/report-status-secret-keys.test.ts +140 -0
- package/src/require-explicit-test-db.ts +9 -0
- package/src/requirement-due-reminders-http.test.ts +620 -0
- package/src/requirement-due-reminders.ts +416 -0
- package/src/requirement-events-http.test.ts +295 -0
- package/src/requirement-events.test.ts +45 -0
- package/src/requirement-events.ts +144 -0
- package/src/requirement-notify.ts +165 -0
- package/src/requirement-participant-notify-http.test.ts +309 -0
- package/src/requirement-tag-ops-http.test.ts +425 -0
- package/src/requirement-tag-tree-http.test.ts +275 -0
- package/src/requirement-tag-tree.ts +127 -0
- package/src/requirement-tags.ts +102 -0
- package/src/requirements-abandoned-http.test.ts +236 -0
- package/src/requirements-comment-http.test.ts +167 -0
- package/src/requirements-completed-at-migration.test.ts +70 -0
- package/src/requirements-errors-mcp-http.test.ts +164 -0
- package/src/requirements-errors.ts +158 -0
- package/src/requirements-etag-http.test.ts +91 -0
- package/src/requirements-http.test.ts +709 -0
- package/src/requirements-last-event-http.test.ts +349 -0
- package/src/requirements-list-mcp-slim-http.test.ts +155 -0
- package/src/requirements-list-slim-http.test.ts +324 -0
- package/src/requirements-mcp.test.ts +163 -0
- package/src/requirements-migrate.ts +283 -0
- package/src/requirements-owner-strict-mcp-http.test.ts +145 -0
- package/src/requirements-people-http.test.ts +114 -0
- package/src/requirements-people-mcp-http.test.ts +231 -0
- package/src/requirements-people.ts +196 -0
- package/src/requirements-priority-lowest.test.ts +114 -0
- package/src/requirements-projects-network-echo.test.ts +57 -0
- package/src/requirements-projects-parent-http.test.ts +123 -0
- package/src/requirements-search-http.test.ts +182 -0
- package/src/requirements-search.test.ts +32 -0
- package/src/requirements-search.ts +145 -0
- package/src/requirements-seq-http.test.ts +193 -0
- package/src/requirements-seq-migration.test.ts +63 -0
- package/src/requirements-start-date.test.ts +125 -0
- package/src/requirements-stats-http.test.ts +357 -0
- package/src/requirements-stats.ts +195 -0
- package/src/requirements-status-participants-http.test.ts +222 -0
- package/src/requirements-upgrade-e2e.test.ts +126 -0
- package/src/requirements-upgrade-migration.test.ts +98 -0
- package/src/requirements.ts +2042 -0
- package/src/resolve-port.test.ts +57 -0
- package/src/resolve-port.ts +44 -0
- package/src/rest-alias-network-fallback-http.test.ts +123 -0
- package/src/rest-alias-network-fallback.test.ts +60 -0
- package/src/rest-alias-network-fallback.ts +65 -0
- package/src/rest-explicit-columns-http.test.ts +266 -0
- package/src/rest-identity.test.ts +130 -0
- package/src/rest-identity.ts +141 -0
- package/src/rest-projections.ts +72 -0
- package/src/rest-read-network-real-chain.test.ts +97 -0
- package/src/rest-write-network-resolution.test.ts +133 -0
- package/src/restart-readiness-http.test.ts +121 -0
- package/src/restricted-files.ts +76 -0
- package/src/retention-first-sweep-quiet.test.ts +31 -0
- package/src/retention.test.ts +100 -40
- package/src/retention.ts +423 -104
- package/src/route-callers-http.test.ts +120 -0
- package/src/route-timing.test.ts +218 -0
- package/src/route-timing.ts +262 -0
- package/src/rules-file-duplicate-alias.test.ts +234 -0
- package/src/rules-file-session-target.test.ts +207 -0
- package/src/rules-file-transport.test.ts +237 -0
- package/src/runtime-label.test.ts +22 -0
- package/src/runtime-label.ts +21 -0
- package/src/runtime-readiness.ts +90 -0
- package/src/schedule-agent-mcp-http.test.ts +432 -0
- package/src/schedule-agent.ts +252 -0
- package/src/schedule-starved.test.ts +92 -0
- package/src/schedule-starved.ts +114 -0
- package/src/scheduled-backoff-http.test.ts +193 -0
- package/src/scheduled-backoff.ts +64 -0
- package/src/scheduled-doorbell-nodeless-session.test.ts +134 -0
- package/src/scheduled-failure-backoff-2622.test.ts +145 -0
- package/src/scheduled-failure-code.test.ts +73 -0
- package/src/scheduled-failure-code.ts +105 -0
- package/src/scheduled-failures-http.test.ts +279 -0
- package/src/scheduled-failures.ts +425 -0
- package/src/scheduled-noprogress-backoff-2622.test.ts +163 -0
- package/src/scheduled-offline-backoff-probe.test.ts +56 -0
- package/src/scheduled-offline.test.ts +131 -0
- package/src/scheduled-offline.ts +66 -0
- package/src/scheduled-outcome-guidance-http.test.ts +139 -0
- package/src/scheduled-outcome-guidance.ts +9 -0
- package/src/scheduled-reply-unread-http.test.ts +212 -0
- package/src/scheduled-requirement-wake-http.test.ts +279 -0
- package/src/scheduled-requirement-wake.ts +125 -0
- package/src/scheduled-run-terminal.test.ts +268 -0
- package/src/scheduled-skip-blocking-task.test.ts +120 -0
- package/src/scheduled-skip-path-backoff-2622.test.ts +98 -0
- package/src/scheduled-stuck-http.test.ts +316 -0
- package/src/scheduled-stuck-notice-cap.test.ts +80 -0
- package/src/scheduled-stuck.ts +219 -0
- package/src/scheduled-tasks-http.test.ts +679 -0
- package/src/scheduled-tasks.ts +959 -0
- package/src/scheduled-work-outcome-http.test.ts +154 -0
- package/src/scheduled-work-outcome.ts +50 -0
- package/src/scoped-secrets.ts +141 -0
- package/src/send-dedup-request-id.test.ts +229 -0
- package/src/send-reply-agent-warning.test.ts +202 -0
- package/src/send-reply-alias-optional.test.ts +131 -0
- package/src/send-reply-attachments.test.ts +458 -0
- package/src/send_dedup.test.ts +54 -0
- package/src/send_dedup.ts +52 -6
- package/src/serve-error.test.ts +73 -0
- package/src/serve-error.ts +56 -0
- package/src/server.ts +4921 -344
- package/src/session-task-on-dispatch.ts +14 -0
- package/src/session-token-ownership-http.test.ts +122 -0
- package/src/shared/codex-inventory.ts +41 -0
- package/src/shared/daemon-provider-login.ts +31 -0
- package/src/shared/daemon-provider-snapshot.ts +52 -0
- package/src/shared/external-schedule-contract.ts +60 -0
- package/src/shared/node-name.test.ts +62 -0
- package/src/shared/node-name.ts +161 -0
- package/src/shared/probe-host-allowlist-drift.test.ts +45 -0
- package/src/shared/provider-application.ts +29 -0
- package/src/shared/provider-collection.ts +14 -0
- package/src/shared/provider-initialization.ts +8 -0
- package/src/shared/reserved-env-drift.test.ts +10 -0
- package/src/shared/scoped-secret-contract.ts +5 -0
- package/src/shared/task-content-limit-drift.test.ts +28 -0
- package/src/shared/task-content-limit.ts +25 -0
- package/src/side-thread-command-transport.test.ts +312 -0
- package/src/side-thread-command-transport.ts +318 -0
- package/src/side-thread-http-integration.test.ts +233 -0
- package/src/side-thread-http.ts +504 -0
- package/src/side-thread-production.test.ts +72 -0
- package/src/side-thread-production.ts +118 -0
- package/src/side-thread.test.ts +1067 -0
- package/src/side-thread.ts +2499 -0
- package/src/skillhub-http.test.ts +142 -0
- package/src/sqlite-close-checkpoint.test.ts +78 -0
- package/src/start-node.test.ts +264 -0
- package/src/status-alias-filter-http.test.ts +106 -0
- package/src/status-alias-resolver-http.test.ts +163 -0
- package/src/status-alias-resolver.ts +19 -0
- package/src/status-node-id-filter-http.test.ts +161 -0
- package/src/status-read-cache-http.test.ts +229 -0
- package/src/status-read-cache.ts +129 -0
- package/src/stop-delete-node.test.ts +567 -1
- package/src/task-access-http.test.ts +402 -0
- package/src/task-access.ts +420 -0
- package/src/task-activity.ts +60 -0
- package/src/task-auth-origin-http.test.ts +93 -0
- package/src/task-auth-origin.test.ts +24 -0
- package/src/task-auth-origin.ts +7 -0
- package/src/task-consumption.test.ts +490 -0
- package/src/task-diagnostic-http.test.ts +149 -0
- package/src/task-diagnostic.test.ts +115 -0
- package/src/task-diagnostic.ts +118 -0
- package/src/task-expiry-notice-http.test.ts +287 -0
- package/src/task-expiry-notice.ts +315 -0
- package/src/task-idempotency-mcp.test.ts +142 -0
- package/src/task-idempotency.test.ts +76 -0
- package/src/task-idempotency.ts +81 -0
- package/src/task-late-replies.ts +54 -0
- package/src/task-late-reply-http.test.ts +227 -0
- package/src/task-lifecycle-watcher-busy.test.ts +114 -0
- package/src/task-lifecycle-watcher.test.ts +204 -0
- package/src/task-lifecycle-watcher.ts +109 -0
- package/src/task-network-resolution-http.test.ts +140 -0
- package/src/task-offline-delivery-2668.test.ts +119 -0
- package/src/task-offline-delivery.ts +81 -0
- package/src/task-orphan-http.test.ts +287 -0
- package/src/task-orphan.ts +119 -0
- package/src/task-queue-ahead-http.test.ts +309 -0
- package/src/task-queue-ahead-scale.test.ts +236 -0
- package/src/task-queue-ahead.ts +186 -0
- package/src/task-rejection-log-http.test.ts +160 -0
- package/src/task-rejection-log.ts +58 -0
- package/src/task-sender-http.test.ts +143 -0
- package/src/task-stale-open-http.test.ts +292 -0
- package/src/task-stale-open.ts +103 -0
- package/src/tasks-pagination-http.test.ts +141 -0
- package/src/team-rules-status-http.test.ts +90 -0
- package/src/team-rules-status.test.ts +59 -0
- package/src/team-rules-status.ts +72 -0
- package/src/tmux-allowlist.test.ts +48 -0
- package/src/tool-audience-http.test.ts +230 -0
- package/src/tool-audience.ts +127 -0
- package/src/tools-list-json-schema.test.ts +94 -0
- package/src/tools.ts +4320 -413
- package/src/upload-early-reject-guard.test.ts +155 -0
- package/src/uploads-http.test.ts +86 -7
- package/src/uploads.ts +103 -6
- package/src/user-avatar-http.test.ts +74 -0
- package/src/user-avatar-image.ts +160 -0
- package/src/user-avatar-migration.test.ts +25 -0
- package/src/user-avatar-upload-http.test.ts +348 -0
- package/src/user-inbox-by-agent-http.test.ts +161 -0
- package/src/user-inbox-netid-notnull.test.ts +122 -0
- package/src/user-inbox-read-http.test.ts +223 -0
- package/src/user-inbox-schema.test.ts +54 -0
- package/src/version-stats.test.ts +66 -0
- package/src/version-stats.ts +109 -0
|
@@ -0,0 +1,258 @@
|
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
|
+
import { db } from "./db.js";
|
|
3
|
+
import { getUserNetworkRole, resolveToken, sessionIdleDays } from "./auth.js";
|
|
4
|
+
import { isAgentRestricted } from "./agent-access.js";
|
|
5
|
+
import { resolveNodeCaller } from "./create-node.js";
|
|
6
|
+
import { pushEvent } from "./push.js";
|
|
7
|
+
|
|
8
|
+
type Identity = { session_id: string; binding_id: string };
|
|
9
|
+
type Credential = { token_id: string; user_id: string; network_id: string | null;
|
|
10
|
+
bound_node_id: string | null; scope: string; role: string };
|
|
11
|
+
type Node = { node_id: string; network_id: string; owner_user_id: string | null; alias: string };
|
|
12
|
+
type Bridge = Identity & { tokenId: string; expires: number; retired: Set<string> };
|
|
13
|
+
type Entry = Identity & { request_id: string; operation: "state" | "background";
|
|
14
|
+
networkId: string; nodeId: string; tokenId: string; requester: string; expires_at: number;
|
|
15
|
+
status: "pending" | "in_progress" | "done" | "failed" | "unknown" | "expired";
|
|
16
|
+
result?: unknown; error?: string };
|
|
17
|
+
const TTL = 15_000, LEASE = 75_000, CAP = 1024, HISTORY = 64;
|
|
18
|
+
const ROOT = "/api/node-session-control";
|
|
19
|
+
const ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,199}$/;
|
|
20
|
+
const ERRORS = new Set(["unavailable", "changed", "unsupported", "invalid_response", "request_invalid",
|
|
21
|
+
"request_expired", "request_limit"].map(s => `session_control_${s}`).concat("session_background_outcome_unknown"));
|
|
22
|
+
const keys = (o: Record<string, unknown>, allowed: string[]) => Object.keys(o).every(k => allowed.includes(k));
|
|
23
|
+
const object = (v: unknown): v is Record<string, unknown> => !!v && typeof v === "object" && !Array.isArray(v);
|
|
24
|
+
const id = (v: unknown): v is string => typeof v === "string" && ID.test(v);
|
|
25
|
+
const identity = (v: unknown): v is Identity => object(v) && keys(v, ["session_id", "binding_id"])
|
|
26
|
+
&& id(v.session_id) && id(v.binding_id);
|
|
27
|
+
const same = (a: Identity, b: Identity) => a.session_id === b.session_id && a.binding_id === b.binding_id;
|
|
28
|
+
const generation = (token: string, v: Identity) => JSON.stringify([token, v.session_id, v.binding_id]);
|
|
29
|
+
const fail = (error: string, status = 409) => Response.json({ ok: false, error }, { status });
|
|
30
|
+
const ok = (value: object) => Response.json({ ok: true, ...value });
|
|
31
|
+
|
|
32
|
+
// Recheck stored identities without storing plaintext bearer tokens. The SQL
|
|
33
|
+
// mirrors resolveToken's expiry/revoke/idle rules; membership is checked below.
|
|
34
|
+
function credential(tokenId: string): Credential | null {
|
|
35
|
+
const days = sessionIdleDays();
|
|
36
|
+
return db.get<Credential>(`SELECT t.token_id,t.user_id,t.network_id,t.bound_node_id,t.scope,u.role
|
|
37
|
+
FROM api_tokens t JOIN users u ON u.user_id=t.user_id WHERE t.token_id=?1
|
|
38
|
+
AND t.revoked_at IS NULL AND (t.expires_at IS NULL OR t.expires_at>datetime('now'))
|
|
39
|
+
AND NOT (t.scope='user' AND t.network_id IS NULL AND ?2>0
|
|
40
|
+
AND COALESCE(t.last_used_at,t.created_at)<datetime('now',?3))`,
|
|
41
|
+
tokenId, days, `-${Math.round(days * 86400)} seconds`) ?? null;
|
|
42
|
+
}
|
|
43
|
+
function node(nodeId: string): Node | null {
|
|
44
|
+
return db.get<Node>("SELECT node_id,network_id,owner_user_id,alias FROM nodes WHERE node_id=?1", nodeId) ?? null;
|
|
45
|
+
}
|
|
46
|
+
function isHumanCredential(c: Credential | null): c is Credential {
|
|
47
|
+
return !!c && c.network_id === null && c.bound_node_id === null
|
|
48
|
+
&& (c.scope === "user" || c.scope === "full");
|
|
49
|
+
}
|
|
50
|
+
function human(tokenId: string, n: Node): boolean {
|
|
51
|
+
const c = credential(tokenId);
|
|
52
|
+
if (!isHumanCredential(c) || !n.network_id) return false;
|
|
53
|
+
const role = getUserNetworkRole(c.user_id, n.network_id);
|
|
54
|
+
return !!role && role !== "viewer" && !isAgentRestricted(c.user_id, n.network_id)
|
|
55
|
+
&& (c.user_id === n.owner_user_id || role === "owner" || role === "admin" || c.role === "admin");
|
|
56
|
+
}
|
|
57
|
+
function bound(tokenId: string, n?: Node | null): Node | null {
|
|
58
|
+
const c = credential(tokenId);
|
|
59
|
+
if (!c?.bound_node_id || !c.network_id || c.scope !== "network") return null;
|
|
60
|
+
const target = n ?? node(c.bound_node_id);
|
|
61
|
+
if (!target || c.bound_node_id !== target.node_id || c.network_id !== target.network_id
|
|
62
|
+
|| !getUserNetworkRole(c.user_id, c.network_id) || isAgentRestricted(c.user_id, c.network_id)) return null;
|
|
63
|
+
const caller = resolveNodeCaller(tokenId);
|
|
64
|
+
return caller.ok && caller.kind === "node" && caller.nodeId === target.node_id
|
|
65
|
+
&& caller.networkId === target.network_id ? target : null;
|
|
66
|
+
}
|
|
67
|
+
async function body(req: Request): Promise<Record<string, unknown> | null> {
|
|
68
|
+
const reader = req.body?.getReader();
|
|
69
|
+
if (!reader) return null;
|
|
70
|
+
const chunks: Uint8Array[] = []; let size = 0;
|
|
71
|
+
try {
|
|
72
|
+
for (;;) {
|
|
73
|
+
const part = await reader.read(); if (part.done) break;
|
|
74
|
+
size += part.value.byteLength;
|
|
75
|
+
if (size > 8192) { await reader.cancel(); return null; }
|
|
76
|
+
chunks.push(part.value);
|
|
77
|
+
}
|
|
78
|
+
const v: unknown = JSON.parse(Buffer.concat(chunks).toString("utf8"));
|
|
79
|
+
return object(v) ? v : null;
|
|
80
|
+
} catch { return null; }
|
|
81
|
+
}
|
|
82
|
+
function state(value: unknown, e: Entry): boolean {
|
|
83
|
+
return object(value) && keys(value, ["session_id", "binding_id", "supported", "active", "can_request_background", "observed_at"])
|
|
84
|
+
&& same(value as Identity, e) && typeof value.supported === "boolean" && typeof value.active === "boolean"
|
|
85
|
+
&& typeof value.can_request_background === "boolean" && typeof value.observed_at === "number"
|
|
86
|
+
&& Number.isFinite(value.observed_at) && value.observed_at > 0
|
|
87
|
+
&& (!value.can_request_background || (value.supported && value.active));
|
|
88
|
+
}
|
|
89
|
+
function validResult(v: unknown, e: Entry): boolean {
|
|
90
|
+
if (e.operation === "state") return state(v, e);
|
|
91
|
+
return object(v) && keys(v, ["outcome", "state"])
|
|
92
|
+
&& (v.outcome === "request_processed" || v.outcome === "already_idle") && state(v.state, e)
|
|
93
|
+
&& (v.outcome !== "already_idle" || (object(v.state)
|
|
94
|
+
&& v.state.active === false && v.state.can_request_background === false));
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/** One finite, process-local relay per Hub boot. Restart loses requests (404),
|
|
98
|
+
* never replays them. Multi-worker deployments require process affinity.
|
|
99
|
+
* A claim authorizes one delivery, not proof that any tool moved to background.
|
|
100
|
+
*/
|
|
101
|
+
export function createNodeSessionControlRelay() {
|
|
102
|
+
const bridges = new Map<string, Bridge>();
|
|
103
|
+
const entries = new Map<string, Entry>();
|
|
104
|
+
const key = (n: Node) => JSON.stringify([n.network_id, n.node_id]);
|
|
105
|
+
function close(e: Entry, error: string) {
|
|
106
|
+
e.status = e.status === "in_progress" ? "unknown" : "failed";
|
|
107
|
+
e.error = e.status === "unknown" ? "session_background_outcome_unknown" : error;
|
|
108
|
+
}
|
|
109
|
+
function refresh(e: Entry, now: number) {
|
|
110
|
+
if (e.status !== "pending" && e.status !== "in_progress") return;
|
|
111
|
+
if (now >= e.expires_at) {
|
|
112
|
+
e.status = e.status === "in_progress" ? "unknown" : "expired";
|
|
113
|
+
e.error = e.status === "unknown" ? "session_background_outcome_unknown" : "session_control_request_expired";
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
const n = node(e.nodeId), b = n && bridges.get(key(n));
|
|
117
|
+
if (!n || n.network_id !== e.networkId || !human(e.requester, n) || !bound(e.tokenId, n)) {
|
|
118
|
+
close(e, "session_control_unavailable");
|
|
119
|
+
} else if (!b || b.expires <= now || b.tokenId !== e.tokenId || !same(b, e)) {
|
|
120
|
+
close(e, "session_control_changed");
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
function sweep(now: number) {
|
|
124
|
+
for (const [k, e] of entries) {
|
|
125
|
+
refresh(e, now);
|
|
126
|
+
if (now > e.expires_at + 60_000) entries.delete(k);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
return async function handle(req: Request, url: URL): Promise<Response | null> {
|
|
130
|
+
if (url.pathname !== ROOT && !url.pathname.startsWith(`${ROOT}/`)) return null;
|
|
131
|
+
try {
|
|
132
|
+
// Header-only, persisted credential authority; no master/dev-open fallback.
|
|
133
|
+
const raw = req.headers.get("authorization")?.match(/^Bearer (\S+)$/)?.[1] ?? "";
|
|
134
|
+
const auth = resolveToken(raw);
|
|
135
|
+
if (!auth?.tokenId) return fail("session_control_unavailable", 401);
|
|
136
|
+
const tokenId = auth.tokenId;
|
|
137
|
+
const c = credential(tokenId);
|
|
138
|
+
if (!c) return fail("session_control_unavailable", 401);
|
|
139
|
+
const isHuman = isHumanCredential(c);
|
|
140
|
+
const isNode = c.scope === "network" && !!c.network_id;
|
|
141
|
+
const suffix = url.pathname.slice(ROOT.length);
|
|
142
|
+
if (req.method === "GET" && /^\/(bg|sc)_\d{13}_[A-Za-z0-9_-]{8,64}$/.test(suffix)) {
|
|
143
|
+
const e = entries.get(suffix.slice(1));
|
|
144
|
+
// Unknown/restarted Hub and unauthorized reads reveal no request data.
|
|
145
|
+
if (!isHuman) return fail("session_control_unavailable", 403);
|
|
146
|
+
if (!e) return fail("session_control_unavailable", 404);
|
|
147
|
+
const n = node(e.nodeId);
|
|
148
|
+
if (!n || url.searchParams.get("network_id") !== e.networkId || n.network_id !== e.networkId || !human(tokenId, n)) {
|
|
149
|
+
return fail("session_control_unavailable", 403);
|
|
150
|
+
}
|
|
151
|
+
refresh(e, Date.now());
|
|
152
|
+
return ok({ request_id: e.request_id, status: e.status,
|
|
153
|
+
...(e.result === undefined ? {} : { result: e.result }), ...(e.error ? { error: e.error } : {}) });
|
|
154
|
+
}
|
|
155
|
+
if (req.method !== "POST") return fail("session_control_request_invalid", 405);
|
|
156
|
+
const v = await body(req);
|
|
157
|
+
if (!v) return fail("session_control_request_invalid", 400);
|
|
158
|
+
const now = Date.now();
|
|
159
|
+
if (suffix === "/bridge") {
|
|
160
|
+
if (!isNode) return fail("session_control_unavailable", 403);
|
|
161
|
+
if (!keys(v, ["session_id", "binding_id", "expected"]) || !id(v.session_id) || !id(v.binding_id)
|
|
162
|
+
|| !object(v.expected) || !keys(v.expected, ["node_id", "network_id"])
|
|
163
|
+
|| !id(v.expected.node_id) || !id(v.expected.network_id)) return fail("session_control_request_invalid", 400);
|
|
164
|
+
// Body reading is complete. This synchronous section rechecks authority
|
|
165
|
+
// and expected identity BEFORE sweep, retirement, or registration writes.
|
|
166
|
+
// expected is an assertion, never a source for binding or proof fields.
|
|
167
|
+
const c = credential(tokenId), n = bound(tokenId);
|
|
168
|
+
if (!c || !n) return fail("session_control_unavailable", 403);
|
|
169
|
+
if (c.bound_node_id !== n.node_id || c.network_id !== n.network_id
|
|
170
|
+
|| v.expected.node_id !== c.bound_node_id || v.expected.network_id !== c.network_id) {
|
|
171
|
+
return fail("session_control_changed");
|
|
172
|
+
}
|
|
173
|
+
const registration = { session_id: v.session_id, binding_id: v.binding_id };
|
|
174
|
+
const k = key(n), b = bridges.get(k), g = generation(tokenId, registration);
|
|
175
|
+
if (b?.retired.has(g)) return fail("session_control_changed");
|
|
176
|
+
const replacing = b && (b.tokenId !== tokenId || !same(b, registration));
|
|
177
|
+
if ((replacing && b.retired.size >= HISTORY) || (!b && bridges.size >= CAP)) {
|
|
178
|
+
return fail("session_control_request_limit", 429);
|
|
179
|
+
}
|
|
180
|
+
sweep(now);
|
|
181
|
+
if (replacing) {
|
|
182
|
+
b.retired.add(generation(b.tokenId, b));
|
|
183
|
+
for (const e of entries.values()) if (e.nodeId === n.node_id && e.networkId === n.network_id
|
|
184
|
+
&& (e.status === "pending" || e.status === "in_progress")) close(e, "session_control_changed");
|
|
185
|
+
}
|
|
186
|
+
bridges.set(k, { ...registration, tokenId, expires: now + LEASE, retired: b?.retired ?? new Set() });
|
|
187
|
+
return ok({ expires_at: now + LEASE,
|
|
188
|
+
identity: { node_id: c.bound_node_id, network_id: c.network_id, token_id: c.token_id } });
|
|
189
|
+
}
|
|
190
|
+
sweep(now);
|
|
191
|
+
if (!suffix) {
|
|
192
|
+
if (!isHuman) return fail("session_control_unavailable", 403);
|
|
193
|
+
if (!keys(v, ["network_id", "node_id", "operation", "expected"]) || !id(v.network_id) || !id(v.node_id)
|
|
194
|
+
|| (v.operation !== "state" && v.operation !== "background")
|
|
195
|
+
|| (v.expected !== undefined && !identity(v.expected)) || (v.operation === "background" && !identity(v.expected))) {
|
|
196
|
+
return fail("session_control_request_invalid", 400);
|
|
197
|
+
}
|
|
198
|
+
const n = node(v.node_id);
|
|
199
|
+
if (!n || n.network_id !== v.network_id || !human(tokenId, n)) return fail("session_control_unavailable", 403);
|
|
200
|
+
const b = bridges.get(key(n));
|
|
201
|
+
// A distinct code for "this node has no live bridge" (never registered, or
|
|
202
|
+
// its 75 s lease expired). #2014 needs it: the client can then say "upgrade
|
|
203
|
+
// the node / start it" instead of the generic "refresh later" it shows for
|
|
204
|
+
// `session_control_unavailable` (which also covers permission refusals).
|
|
205
|
+
if (!b || b.expires <= now || !bound(b.tokenId, n)) return fail("session_control_bridge_missing");
|
|
206
|
+
if (v.expected && !same(v.expected as Identity, b)) return fail("session_control_changed");
|
|
207
|
+
if (entries.size >= CAP || [...entries.values()].some(e => e.nodeId === n.node_id
|
|
208
|
+
&& e.networkId === n.network_id && (e.status === "pending" || e.status === "in_progress"))) {
|
|
209
|
+
return fail("session_control_request_limit", 429);
|
|
210
|
+
}
|
|
211
|
+
const request_id = `${v.operation === "background" ? "bg" : "sc"}_${now}_${randomBytes(18).toString("base64url")}`;
|
|
212
|
+
entries.set(request_id, { session_id: b.session_id, binding_id: b.binding_id, request_id,
|
|
213
|
+
operation: v.operation, networkId: n.network_id, nodeId: n.node_id, tokenId: b.tokenId,
|
|
214
|
+
requester: tokenId, expires_at: now + TTL, status: "pending" });
|
|
215
|
+
pushEvent(n.alias, { type: "session_control", request_id }, n.network_id);
|
|
216
|
+
return ok({ request_id, status: "pending", expires_at: now + TTL });
|
|
217
|
+
}
|
|
218
|
+
if (!isNode) return fail("session_control_unavailable", 403);
|
|
219
|
+
const n = bound(tokenId);
|
|
220
|
+
if (!n) return fail("session_control_unavailable", 403);
|
|
221
|
+
const k = key(n), b = bridges.get(k);
|
|
222
|
+
if (!b || b.expires <= now || b.tokenId !== tokenId) return fail("session_control_changed");
|
|
223
|
+
if (suffix === "/pull") {
|
|
224
|
+
if (!identity(v)) return fail("session_control_request_invalid", 400);
|
|
225
|
+
if (!same(b, v)) return fail("session_control_changed");
|
|
226
|
+
const e = [...entries.values()].find(e => e.nodeId === n.node_id && e.networkId === n.network_id && e.status === "pending");
|
|
227
|
+
if (!e) return ok({ request: null });
|
|
228
|
+
refresh(e, now);
|
|
229
|
+
if (e.status !== "pending") return ok({ request: null });
|
|
230
|
+
// No await between authority recheck, claim, and response. Never requeue.
|
|
231
|
+
e.status = "in_progress";
|
|
232
|
+
return ok({ request: { request_id: e.request_id, operation: e.operation,
|
|
233
|
+
session_id: e.session_id, binding_id: e.binding_id, expires_at: e.expires_at } });
|
|
234
|
+
}
|
|
235
|
+
if (/^\/(bg|sc)_\d{13}_[A-Za-z0-9_-]{8,64}\/ack$/.test(suffix)) {
|
|
236
|
+
if (!keys(v, ["session_id", "binding_id", "status", "result", "error"]) || !id(v.session_id) || !id(v.binding_id)
|
|
237
|
+
|| (v.status !== "done" && v.status !== "failed")) return fail("session_control_request_invalid", 400);
|
|
238
|
+
const e = entries.get(suffix.split("/")[1]);
|
|
239
|
+
if (!e) return fail("session_control_unavailable", 404);
|
|
240
|
+
if (e.nodeId !== n.node_id || e.networkId !== n.network_id || e.tokenId !== tokenId || !same(e, v as Identity)
|
|
241
|
+
|| !same(b, e)) return fail("session_control_changed");
|
|
242
|
+
refresh(e, now);
|
|
243
|
+
if (e.status !== "in_progress") return fail("session_control_request_expired");
|
|
244
|
+
if (v.status === "done" && validResult(v.result, e) && v.error === undefined) {
|
|
245
|
+
e.status = "done"; e.result = v.result;
|
|
246
|
+
} else if (v.status === "failed" && typeof v.error === "string" && ERRORS.has(v.error) && v.result === undefined) {
|
|
247
|
+
e.status = "failed"; e.error = v.error;
|
|
248
|
+
} else {
|
|
249
|
+
// Invalid/untrusted runtime replies never become success or leak raw errors.
|
|
250
|
+
e.status = "unknown"; e.error = "session_control_invalid_response";
|
|
251
|
+
return fail(e.error, 400);
|
|
252
|
+
}
|
|
253
|
+
return ok({ request_id: e.request_id, status: e.status });
|
|
254
|
+
}
|
|
255
|
+
return fail("session_control_request_invalid", 404);
|
|
256
|
+
} catch { return fail("session_control_unavailable", 503); }
|
|
257
|
+
};
|
|
258
|
+
}
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
// Node skills view — list_node_skills / read_node_skill ride the rules-file
|
|
2
|
+
// queue + doorbell (ops skills_list / skill_read).
|
|
3
|
+
//
|
|
4
|
+
// Hub-side contract verified here:
|
|
5
|
+
// 1. report_status { skills_capable: true } is sticky and set only by the
|
|
6
|
+
// session's own bound node token.
|
|
7
|
+
// 2. list_node_skills / read_node_skill reach a session with no nodes row by
|
|
8
|
+
// alias; the node pulls with its own token; read carries the skill NAME
|
|
9
|
+
// (never a path) in the pulled request; results come back through
|
|
10
|
+
// get_rules_file_result for both ops.
|
|
11
|
+
// 3. Bad skill names are refused before any request row exists.
|
|
12
|
+
// 4. A session that can serve rules files but did not report skills_capable is
|
|
13
|
+
// refused up front for skills ops (skills_target_not_found).
|
|
14
|
+
// 5. Separate single-flight lanes: a pending rules read does not block a skills
|
|
15
|
+
// list and vice versa; a second skills request while one is pending is refused.
|
|
16
|
+
// 6. Network isolation and foreign acks are ignored.
|
|
17
|
+
//
|
|
18
|
+
// 跑法:cd server && COMMHUB_DB=/tmp/skills-session.db bun test src/node-skills-transport.test.ts
|
|
19
|
+
import { afterAll, beforeEach, describe, expect, test } from "bun:test";
|
|
20
|
+
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
21
|
+
import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
|
|
22
|
+
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
23
|
+
import { db } from "./db.js";
|
|
24
|
+
import { registerTools } from "./tools.js";
|
|
25
|
+
|
|
26
|
+
const NET = "net_skills_session";
|
|
27
|
+
const OTHER_NET = "net_skills_session_other";
|
|
28
|
+
const USER = "u_skills_session_owner";
|
|
29
|
+
const SESSION_ALIAS = "skills-session-cc";
|
|
30
|
+
const SESSION_RESUME = "cc-skills-session-1";
|
|
31
|
+
const OTHER_ALIAS = "skills-session-peer";
|
|
32
|
+
const NODE_ROW_ALIAS = "skills-session-noderow";
|
|
33
|
+
const NODE_ROW_ID = "node_skills_session_noderow";
|
|
34
|
+
const T_SESSION = "tok_skills_session_cc";
|
|
35
|
+
const T_PEER = "tok_skills_session_peer";
|
|
36
|
+
const T_OTHER_NET_SAME_ALIAS = "tok_skills_session_other_net";
|
|
37
|
+
const T_NODE_ROW = "tok_skills_session_noderow";
|
|
38
|
+
|
|
39
|
+
function cleanup() {
|
|
40
|
+
for (const net of [NET, OTHER_NET]) {
|
|
41
|
+
try { db.run("DELETE FROM node_rules_requests WHERE network_id = ?1", [net]); } catch {}
|
|
42
|
+
try { db.run("DELETE FROM sessions WHERE network_id = ?1", [net]); } catch {}
|
|
43
|
+
try { db.run("DELETE FROM nodes WHERE network_id = ?1", [net]); } catch {}
|
|
44
|
+
try { db.run("DELETE FROM api_tokens WHERE network_id = ?1", [net]); } catch {}
|
|
45
|
+
try { db.run("DELETE FROM network_members WHERE network_id = ?1", [net]); } catch {}
|
|
46
|
+
try { db.run("DELETE FROM networks WHERE network_id = ?1", [net]); } catch {}
|
|
47
|
+
}
|
|
48
|
+
try { db.run("DELETE FROM users WHERE user_id = ?1", [USER]); } catch {}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
function seedWorld() {
|
|
52
|
+
db.run(`INSERT INTO users (user_id, username, password_hash, role, created_at) VALUES (?1, ?2, 'x', 'user', datetime('now'))`, [USER, USER]);
|
|
53
|
+
for (const net of [NET, OTHER_NET]) {
|
|
54
|
+
db.run(`INSERT INTO networks (network_id, network_name, owner_id, created_at) VALUES (?1, ?2, ?3, datetime('now'))`, [net, net, USER]);
|
|
55
|
+
db.run(`INSERT INTO network_members (user_id, network_id, role, joined_at) VALUES (?1, ?2, 'owner', datetime('now'))`, [USER, net]);
|
|
56
|
+
}
|
|
57
|
+
const tok = (id: string, net: string, alias: string) => db.run(
|
|
58
|
+
`INSERT INTO api_tokens (token_id, user_id, network_id, scope, name, token_hash, expires_at, revoked_at) VALUES (?1, ?2, ?3, 'network', ?4, ?5, NULL, NULL)`,
|
|
59
|
+
[id, USER, net, `node:${alias}`, `hash_${id}`],
|
|
60
|
+
);
|
|
61
|
+
tok(T_SESSION, NET, SESSION_ALIAS);
|
|
62
|
+
tok(T_PEER, NET, OTHER_ALIAS);
|
|
63
|
+
tok(T_OTHER_NET_SAME_ALIAS, OTHER_NET, SESSION_ALIAS);
|
|
64
|
+
tok(T_NODE_ROW, NET, NODE_ROW_ALIAS);
|
|
65
|
+
db.run(
|
|
66
|
+
`INSERT INTO nodes (node_id, node_name, alias, network_id, created_at, updated_at) VALUES (?1, ?2, ?3, ?4, datetime('now'), datetime('now'))`,
|
|
67
|
+
[NODE_ROW_ID, NODE_ROW_ALIAS, NODE_ROW_ALIAS, NET],
|
|
68
|
+
);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
type Identity = { net: string; alias: string; isNetworkToken: boolean; tokenId: string };
|
|
72
|
+
const asUser: Identity = { net: NET, alias: USER, isNetworkToken: false, tokenId: "tok_skills_session_user" };
|
|
73
|
+
const asOtherNetUser: Identity = { net: OTHER_NET, alias: USER, isNetworkToken: false, tokenId: "tok_skills_session_user2" };
|
|
74
|
+
const asSession: Identity = { net: NET, alias: SESSION_ALIAS, isNetworkToken: true, tokenId: T_SESSION };
|
|
75
|
+
const asPeer: Identity = { net: NET, alias: OTHER_ALIAS, isNetworkToken: true, tokenId: T_PEER };
|
|
76
|
+
const asOtherNetSameAlias: Identity = { net: OTHER_NET, alias: SESSION_ALIAS, isNetworkToken: true, tokenId: T_OTHER_NET_SAME_ALIAS };
|
|
77
|
+
const asNodeRow: Identity = { net: NET, alias: NODE_ROW_ALIAS, isNetworkToken: true, tokenId: T_NODE_ROW };
|
|
78
|
+
|
|
79
|
+
async function connect(id: Identity) {
|
|
80
|
+
const server = new McpServer({ name: "skills-session-test", version: "1" });
|
|
81
|
+
registerTools(server, undefined, id.net, USER, id.alias, id.isNetworkToken, id.tokenId);
|
|
82
|
+
const client = new Client({ name: "skills-session-client", version: "1" });
|
|
83
|
+
const [ct, st] = InMemoryTransport.createLinkedPair();
|
|
84
|
+
await server.connect(st);
|
|
85
|
+
await client.connect(ct);
|
|
86
|
+
const call = async (name: string, args: Record<string, unknown>) => {
|
|
87
|
+
const r: any = await client.callTool({ name, arguments: args });
|
|
88
|
+
const first = r.content?.[0];
|
|
89
|
+
if (!first || first.type !== "text") throw new Error(`no text result from ${name}: ${JSON.stringify(r).slice(0, 300)}`);
|
|
90
|
+
return JSON.parse(first.text);
|
|
91
|
+
};
|
|
92
|
+
const close = async () => { await client.close(); await server.close(); };
|
|
93
|
+
return { call, close };
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
const capable = (alias: string, net = NET) =>
|
|
97
|
+
db.get<{ c: number }>("SELECT skills_capable AS c FROM sessions WHERE alias = ?1 AND network_id = ?2", alias, net)?.c;
|
|
98
|
+
const rowCount = () => db.get<{ n: number }>("SELECT COUNT(*) AS n FROM node_rules_requests WHERE network_id = ?1", NET)!.n;
|
|
99
|
+
|
|
100
|
+
async function registerSession(id: Identity, alias: string, resume: string, flag: boolean) {
|
|
101
|
+
const c = await connect(id);
|
|
102
|
+
try {
|
|
103
|
+
return await c.call("report_status", { resume_id: resume, alias, status: "idle", agent: "claude-code", ...(flag ? { rules_file_capable: true, skills_capable: true } : {}) });
|
|
104
|
+
} finally { await c.close(); }
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
beforeEach(() => { cleanup(); seedWorld(); });
|
|
108
|
+
afterAll(cleanup);
|
|
109
|
+
|
|
110
|
+
async function reportRulesOnly(id: Identity, alias: string, resume: string) {
|
|
111
|
+
const c = await connect(id);
|
|
112
|
+
try { return await c.call("report_status", { resume_id: resume, alias, status: "idle", agent: "claude-code", rules_file_capable: true }); }
|
|
113
|
+
finally { await c.close(); }
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
describe("skills_capable is set only by the session's own node token", () => {
|
|
117
|
+
test("bound token sets it; a report without it does not clear it; a peer cannot set it", async () => {
|
|
118
|
+
await registerSession(asSession, SESSION_ALIAS, SESSION_RESUME, true);
|
|
119
|
+
expect(capable(SESSION_ALIAS)).toBe(1);
|
|
120
|
+
await registerSession(asSession, SESSION_ALIAS, SESSION_RESUME, false);
|
|
121
|
+
expect(capable(SESSION_ALIAS)).toBe(1);
|
|
122
|
+
const r = await registerSession(asPeer, SESSION_ALIAS, SESSION_RESUME, true);
|
|
123
|
+
expect(r).toMatchObject({ ok: false });
|
|
124
|
+
}, 20_000);
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
describe("list / read by alias reach a session with no nodes row", () => {
|
|
128
|
+
test("list round trip: enqueue → pull (no content) → ack JSON → result carries it", async () => {
|
|
129
|
+
await registerSession(asSession, SESSION_ALIAS, SESSION_RESUME, true);
|
|
130
|
+
const u = await connect(asUser);
|
|
131
|
+
const s = await connect(asSession);
|
|
132
|
+
try {
|
|
133
|
+
const enq = await u.call("list_node_skills", { alias: SESSION_ALIAS });
|
|
134
|
+
expect(enq).toMatchObject({ ok: true, op: "skills_list" });
|
|
135
|
+
const pulled = await s.call("get_rules_file_request", {});
|
|
136
|
+
expect(pulled.request).toEqual({ request_id: enq.request_id, op: "skills_list" });
|
|
137
|
+
const payload = JSON.stringify({ skills: [{ name: "ship", scope: "project", path_rel: ".claude/skills/ship/SKILL.md", description: "d" }] });
|
|
138
|
+
expect(await s.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", file_name: "skills", exists: true, content: payload })).toMatchObject({ ok: true, status: "done" });
|
|
139
|
+
const res = await u.call("get_rules_file_result", { request_id: enq.request_id });
|
|
140
|
+
expect(res).toMatchObject({ ok: true, op: "skills_list", status: "done", content: payload });
|
|
141
|
+
} finally { await u.close(); await s.close(); }
|
|
142
|
+
}, 20_000);
|
|
143
|
+
|
|
144
|
+
test("read round trip: the pulled request carries the skill name only", async () => {
|
|
145
|
+
await registerSession(asSession, SESSION_ALIAS, SESSION_RESUME, true);
|
|
146
|
+
const u = await connect(asUser);
|
|
147
|
+
const s = await connect(asSession);
|
|
148
|
+
try {
|
|
149
|
+
const enq = await u.call("read_node_skill", { alias: SESSION_ALIAS, name: "ship" });
|
|
150
|
+
expect(enq).toMatchObject({ ok: true, op: "skill_read" });
|
|
151
|
+
// 2026-10-31 —— **精确键集**(#3171):此前只 matchObject 了两个字段。
|
|
152
|
+
// 这条响应是「入队回执」,多一个键就意味着回执开始夹带请求内容(那是另一条通道)。
|
|
153
|
+
expect(Object.keys(enq).sort()).toEqual(["ok", "op", "request_id"]);
|
|
154
|
+
const pulled = await s.call("get_rules_file_request", {});
|
|
155
|
+
expect(pulled.request).toEqual({ request_id: enq.request_id, op: "skill_read", content: "ship" });
|
|
156
|
+
const payload = JSON.stringify({ name: "ship", scope: "project", path_rel: ".claude/skills/ship/SKILL.md", description: "d", content: "# ship" });
|
|
157
|
+
await s.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", file_name: "ship", exists: true, content: payload });
|
|
158
|
+
expect(await u.call("get_rules_file_result", { request_id: enq.request_id })).toMatchObject({ status: "done", content: payload });
|
|
159
|
+
} finally { await u.close(); await s.close(); }
|
|
160
|
+
}, 20_000);
|
|
161
|
+
|
|
162
|
+
test("bad names are refused before any row is written", async () => {
|
|
163
|
+
await registerSession(asSession, SESSION_ALIAS, SESSION_RESUME, true);
|
|
164
|
+
const u = await connect(asUser);
|
|
165
|
+
try {
|
|
166
|
+
for (const name of ["..", ".", "../CLAUDE.md", "a/b", "a b"]) {
|
|
167
|
+
expect(await u.call("read_node_skill", { alias: SESSION_ALIAS, name })).toMatchObject({ ok: false, error: "invalid_skill_name" });
|
|
168
|
+
}
|
|
169
|
+
expect(rowCount()).toBe(0);
|
|
170
|
+
} finally { await u.close(); }
|
|
171
|
+
}, 20_000);
|
|
172
|
+
|
|
173
|
+
test("rules-capable but not skills-capable → skills_target_not_found, no row", async () => {
|
|
174
|
+
await reportRulesOnly(asSession, SESSION_ALIAS, SESSION_RESUME);
|
|
175
|
+
const u = await connect(asUser);
|
|
176
|
+
try {
|
|
177
|
+
expect(await u.call("list_node_skills", { alias: SESSION_ALIAS })).toMatchObject({ ok: false, error: "skills_target_not_found" });
|
|
178
|
+
expect(rowCount()).toBe(0);
|
|
179
|
+
expect(await u.call("read_node_rules_file", { alias: SESSION_ALIAS })).toMatchObject({ ok: true });
|
|
180
|
+
} finally { await u.close(); }
|
|
181
|
+
}, 20_000);
|
|
182
|
+
});
|
|
183
|
+
|
|
184
|
+
describe("single-flight lanes", () => {
|
|
185
|
+
test("a pending rules read does not block a skills list; a second skills request is refused", async () => {
|
|
186
|
+
await registerSession(asSession, SESSION_ALIAS, SESSION_RESUME, true);
|
|
187
|
+
const u = await connect(asUser);
|
|
188
|
+
try {
|
|
189
|
+
expect(await u.call("read_node_rules_file", { alias: SESSION_ALIAS })).toMatchObject({ ok: true });
|
|
190
|
+
const list = await u.call("list_node_skills", { alias: SESSION_ALIAS });
|
|
191
|
+
expect(list).toMatchObject({ ok: true });
|
|
192
|
+
expect(await u.call("read_node_skill", { alias: SESSION_ALIAS, name: "ship" })).toMatchObject({ ok: false, error: "request_in_flight", existing_request_id: list.request_id });
|
|
193
|
+
expect(await u.call("read_node_rules_file", { alias: SESSION_ALIAS })).toMatchObject({ ok: false, error: "request_in_flight" });
|
|
194
|
+
} finally { await u.close(); }
|
|
195
|
+
}, 20_000);
|
|
196
|
+
});
|
|
197
|
+
|
|
198
|
+
describe("isolation", () => {
|
|
199
|
+
test("same alias in another network neither pulls nor acks; a peer's ack is ignored", async () => {
|
|
200
|
+
await registerSession(asSession, SESSION_ALIAS, SESSION_RESUME, true);
|
|
201
|
+
const u = await connect(asUser);
|
|
202
|
+
const other = await connect(asOtherNetSameAlias);
|
|
203
|
+
const peer = await connect(asPeer);
|
|
204
|
+
try {
|
|
205
|
+
const enq = await u.call("list_node_skills", { alias: SESSION_ALIAS });
|
|
206
|
+
expect((await other.call("get_rules_file_request", {})).request).toBeNull();
|
|
207
|
+
expect(await other.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", content: "{}" })).toMatchObject({ ok: true, ignored: "unknown_or_foreign_request" });
|
|
208
|
+
expect(await peer.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", content: "{}" })).toMatchObject({ ok: true, ignored: "unknown_or_foreign_request" });
|
|
209
|
+
expect(await u.call("get_rules_file_result", { request_id: enq.request_id })).toMatchObject({ status: "pending" });
|
|
210
|
+
} finally { await u.close(); await other.close(); await peer.close(); }
|
|
211
|
+
}, 20_000);
|
|
212
|
+
});
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { db } from "./db.js";
|
|
2
|
+
import { resolveNodeCaller } from "./create-node.js";
|
|
3
|
+
|
|
4
|
+
/** Active credentials belonging to an immutable node, including verified legacy unbound tokens. */
|
|
5
|
+
export function activeNodeTokenIds(nodeId: string, networkId: string): string[] {
|
|
6
|
+
const node = db.get<{ alias: string }>("SELECT alias FROM nodes WHERE node_id=?1 AND network_id=?2", nodeId, networkId);
|
|
7
|
+
if (!node) return [];
|
|
8
|
+
const tokens = db.all<{ token_id: string }>(
|
|
9
|
+
`SELECT token_id FROM api_tokens WHERE network_id=?1 AND scope='network' AND revoked_at IS NULL
|
|
10
|
+
AND (bound_node_id=?2 OR (bound_node_id IS NULL AND name=?3)) ORDER BY token_id`,
|
|
11
|
+
networkId, nodeId, `node:${node.alias}`,
|
|
12
|
+
);
|
|
13
|
+
return tokens.filter(token => {
|
|
14
|
+
const caller = resolveNodeCaller(token.token_id);
|
|
15
|
+
return caller.ok && caller.kind === "node" && caller.nodeId === nodeId && caller.networkId === networkId;
|
|
16
|
+
}).map(token => token.token_id);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/** Preserve the dispatch-time freeze; old requests without it use verified node identity. */
|
|
20
|
+
export function revokeNodeTokens(nodeId: string, networkId: string, frozenTokenId: string | null): void {
|
|
21
|
+
let ids: string[];
|
|
22
|
+
if (frozenTokenId) {
|
|
23
|
+
const token = db.get<{ bound_node_id: string | null }>(
|
|
24
|
+
"SELECT bound_node_id FROM api_tokens WHERE token_id=?1 AND network_id=?2 AND scope='network' AND revoked_at IS NULL",
|
|
25
|
+
frozenTokenId, networkId,
|
|
26
|
+
);
|
|
27
|
+
// An immutable binding remains sufficient for revocation even after its node row was removed.
|
|
28
|
+
const caller = token && !token.bound_node_id ? resolveNodeCaller(frozenTokenId) : null;
|
|
29
|
+
ids = token?.bound_node_id === nodeId || (caller?.ok && caller.kind === "node" && caller.nodeId === nodeId && caller.networkId === networkId)
|
|
30
|
+
? [frozenTokenId] : activeNodeTokenIds(nodeId, networkId);
|
|
31
|
+
} else {
|
|
32
|
+
ids = activeNodeTokenIds(nodeId, networkId);
|
|
33
|
+
}
|
|
34
|
+
for (const id of ids) db.run("UPDATE api_tokens SET revoked_at=datetime('now') WHERE token_id=?1 AND network_id=?2 AND revoked_at IS NULL", [id, networkId]);
|
|
35
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { db } from "./db.js";
|
|
2
|
+
|
|
3
|
+
// Call inside the caller's transaction. Serialize registration and issuance for
|
|
4
|
+
// this alias on PG; SQLite already serializes writes on its single connection.
|
|
5
|
+
export function lockNodeAlias(network: string, alias: string, nodeId?: string): void {
|
|
6
|
+
if (db.dialect !== "postgres") return;
|
|
7
|
+
db.get("SELECT pg_advisory_xact_lock(hashtext(?1))", JSON.stringify([network, "alias", alias]));
|
|
8
|
+
if (nodeId) db.get("SELECT pg_advisory_xact_lock(hashtext(?1))", JSON.stringify([network, "id", nodeId]));
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export function legacyNodeHolder(user: string, network: string, alias: string, nodeId: string): boolean {
|
|
12
|
+
return !!db.get(`SELECT token_id FROM api_tokens WHERE user_id=?1 AND network_id=?2
|
|
13
|
+
AND name=?3 AND revoked_at IS NULL AND (expires_at IS NULL OR expires_at > datetime('now'))
|
|
14
|
+
AND (bound_node_id=?4 OR (bound_node_id IS NULL AND node_identity_epoch=0)) LIMIT 1`,
|
|
15
|
+
user, network, `node:${alias}`, nodeId);
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/** Resolve a name-only refresh to the existing identity, never claim its owner. */
|
|
19
|
+
export function checkNodeTokenClaim(user: string, network: string, alias: string, nodeId?: string): string | undefined {
|
|
20
|
+
lockNodeAlias(network, alias, nodeId);
|
|
21
|
+
const rows = db.all<{node_id: string; owner_user_id: string | null}>(
|
|
22
|
+
"SELECT node_id, owner_user_id FROM nodes WHERE network_id=?1 AND alias=?2", network, alias);
|
|
23
|
+
if (rows.length > 1 || rows.some(row => nodeId && row.node_id !== nodeId)) throw Error("node_owner_mismatch");
|
|
24
|
+
const row = rows[0];
|
|
25
|
+
// Explicit-ID ownerless claims retain auth.ts's node_owner_unclaimed error;
|
|
26
|
+
// name-only requests need holder evidence before resolving to that ID.
|
|
27
|
+
if (row && (row.owner_user_id ? row.owner_user_id !== user : !nodeId && !legacyNodeHolder(user, network, alias, row.node_id))) {
|
|
28
|
+
throw Error("node_owner_mismatch");
|
|
29
|
+
}
|
|
30
|
+
// Old clients can register a session without ever creating a nodes row.
|
|
31
|
+
// That name is already in use. Sessions have no owner column, so only
|
|
32
|
+
// an administrator or the unique active node-token holder may refresh it.
|
|
33
|
+
// A general token renamed by a heartbeat is not holder evidence (epoch 1).
|
|
34
|
+
if (!row && db.get("SELECT resume_id FROM sessions WHERE network_id=?1 AND alias=?2 LIMIT 1", network, alias)) {
|
|
35
|
+
const actor = db.get<{ role: string; hub_role: string }>(
|
|
36
|
+
`SELECT nm.role, u.role AS hub_role FROM network_members nm JOIN users u ON u.user_id=nm.user_id
|
|
37
|
+
WHERE nm.network_id=?1 AND nm.user_id=?2`, network, user);
|
|
38
|
+
const admin = actor && (actor.role === "owner" || actor.role === "admin" || actor.hub_role === "admin");
|
|
39
|
+
const holders = db.all<{ user_id: string }>(
|
|
40
|
+
`SELECT DISTINCT user_id FROM api_tokens WHERE network_id=?1 AND name=?2 AND scope='network'
|
|
41
|
+
AND bound_node_id IS NULL AND node_identity_epoch IN (0,2) AND revoked_at IS NULL
|
|
42
|
+
AND (expires_at IS NULL OR expires_at > datetime('now'))`, network, `node:${alias}`);
|
|
43
|
+
if (!admin && (holders.length !== 1 || holders[0].user_id !== user)) throw Error("node_owner_mismatch");
|
|
44
|
+
}
|
|
45
|
+
if (!row && db.get(`SELECT token_id FROM api_tokens WHERE network_id=?1 AND name=?2
|
|
46
|
+
AND user_id<>?3 AND node_identity_epoch=2 AND revoked_at IS NULL
|
|
47
|
+
AND (expires_at IS NULL OR expires_at > datetime('now')) LIMIT 1`, network, `node:${alias}`, user)) {
|
|
48
|
+
throw Error("node_owner_mismatch");
|
|
49
|
+
}
|
|
50
|
+
return nodeId ?? row?.node_id;
|
|
51
|
+
}
|