From 618d8953ed281f11352fdb2e3add1060da547e33 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 02:36:48 +0100 Subject: [PATCH] T1b verb-timeout-serve: a verb served from a bundle waits the timeout its definition names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tool gains RunWithin and Within; a bundle's tool call waits `within` where the seat verb it serves names a timeout, else CallTimeout. serveSeats takes the bound of a verb's key beside `chunked`. Builds: design 47 H §760, H-A-43 Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy --- node-tools/internal/launch/launch.go | 25 +++++++++++++++-- .../internal/launch/state_failed_test.go | 28 ++++++++++++++++++- node-tools/internal/runtime/runtime.go | 6 ++-- node-tools/internal/runtime/runtime_test.go | 2 +- 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/node-tools/internal/launch/launch.go b/node-tools/internal/launch/launch.go index 203b28e..652c7f2 100644 --- a/node-tools/internal/launch/launch.go +++ b/node-tools/internal/launch/launch.go @@ -46,6 +46,20 @@ type Tool struct { // Run calls the tool for caller: the bus user the call's subject named, or "" when it named none. A // caller is handed to the bundle in the call's `_meta` (MetaCaller), never among its arguments. Run func(caller string, args json.RawMessage) (json.RawMessage, error) + // RunWithin is Run that waits within for the bundle's answer, the `timeout` the verb's seat definition names (design 47 H §760, + // H-A-43); zero waits CallTimeout. A tool the runtime serves itself has none: Run is its call. + RunWithin func(caller string, args json.RawMessage, within time.Duration) (json.RawMessage, error) +} + +// Within is the tool as called for a verb whose definition names a timeout: its Run waits within for the bundle's answer. A zero +// within, and a tool that has no RunWithin, are the tool as it is. +func (t Tool) Within(within time.Duration) Tool { + if within <= 0 || t.RunWithin == nil { + return t + } + run := t.RunWithin + t.Run = func(caller string, args json.RawMessage) (json.RawMessage, error) { return run(caller, args, within) } + return t } // MetaCaller is where in a `tools/call`'s `_meta` the runtime names the caller it took from the subject the @@ -799,13 +813,17 @@ func Start(module, entry string, env []string, mesh Bus, logf func(string, ...an input = json.RawMessage("{}") } tool := Tool{Name: name, Description: t.Description, Input: input, - Run: func(caller string, args json.RawMessage) (json.RawMessage, error) { + Run: nil, RunWithin: func(caller string, args json.RawMessage, within time.Duration) (json.RawMessage, error) { if len(args) == 0 || string(args) == "null" { args = json.RawMessage("{}") } call, end := mesh.Begin(caller) defer end() - res, err := asking("tools/call", callParams(full, caller, call, args), CallTimeout) + bound := CallTimeout + if within > 0 { + bound = within + } + res, err := asking("tools/call", callParams(full, caller, call, args), bound) if err != nil { if errors.Is(err, errNoAnswer) { // Its caller is gone by now and nobody else would hear of it (issue 1966). @@ -841,6 +859,9 @@ func Start(module, entry string, env []string, mesh Bus, logf func(string, ...an b, _ := json.Marshal(text) return b, nil }} + tool.Run = func(caller string, args json.RawMessage) (json.RawMessage, error) { + return tool.RunWithin(caller, args, 0) + } if _, seen := groups[under]; !seen { order = append(order, under) } diff --git a/node-tools/internal/launch/state_failed_test.go b/node-tools/internal/launch/state_failed_test.go index 8742e0b..c002136 100644 --- a/node-tools/internal/launch/state_failed_test.go +++ b/node-tools/internal/launch/state_failed_test.go @@ -82,7 +82,8 @@ while IFS= read -r line; do case "$line" in *'"method":"initialize"'*) echo started >&2; printf '{"jsonrpc":"2.0","id":%s,"result":{}}\n' "$id" ;; *'"method":"tools/list"'*) printf '{"jsonrpc":"2.0","id":%s,"result":{"tools":[{"name":"t","description":"d"}]}}\n' "$id" ;; - *'"method":"tools/call"'*) [ "$MODE" = long ] && printf '%4096s\n' x ;; + *'"method":"tools/call"'*) [ "$MODE" = long ] && printf '%4096s\n' x + [ "$MODE" = late ] && { sleep 0.3; printf '{"jsonrpc":"2.0","id":%s,"result":{"content":[{"type":"text","text":"{}"}]}}\n' "$id"; } ;; esac done ` @@ -150,3 +151,28 @@ func TestAnOverlongLineAndAnUnansweredCallAreSaid(t *testing.T) { }) } } + +// Design 47 H §760: a verb served from a bundle waits the `timeout` its definition names, not the runner's own bound: a bundle +// that answers after CallTimeout is answered through Within and fails through Run. +func TestAToolWithinWaitsTheBoundItsVerbNames(t *testing.T) { + oldCall := CallTimeout + CallTimeout = 100 * time.Millisecond + t.Cleanup(func() { CallTimeout = oldCall }) + dir := t.TempDir() + entry := filepath.Join(dir, "bundle") + if err := os.WriteFile(entry, []byte(callingBundle), 0o755); err != nil { + t.Fatal(err) + } + l, err := Start("caller", entry, append(os.Environ(), "MODE=late"), &refusingState{}, func(string, ...any) {}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(l.Stop) + tool := l.Registrations[0].Tools[0] + if _, err := tool.Run("caller-1", nil); err == nil || !strings.Contains(err.Error(), "did not answer") { + t.Fatalf("a call that waits the runner's own bound of 100ms: %v, want it unanswered", err) + } + if got, err := tool.Within(5*time.Second).Run("caller-1", nil); err != nil || string(got) != "{}" { + t.Fatalf("a call that waits the verb's 5s: %s, %v, want its answer", got, err) + } +} diff --git a/node-tools/internal/runtime/runtime.go b/node-tools/internal/runtime/runtime.go index ef8cad2..a2713ab 100644 --- a/node-tools/internal/runtime/runtime.go +++ b/node-tools/internal/runtime/runtime.go @@ -314,7 +314,7 @@ func Run(conn *bus.Conn, served []Served, envs map[string]map[string]string, log } logf("%s", line) conn.OnMembership(func(bus.Membership) { go func() { r.refreshRepairs(); conn.Flush() }() }) - stopSeats, again := serveSeats(conn, r.modules, r.registrations, r.events.gated, r.events.admitted, r.events.chunked, r.approvalsOf(), + stopSeats, again := serveSeats(conn, r.modules, r.registrations, r.events.gated, r.events.admitted, r.events.chunked, r.events.withinOf, r.approvalsOf(), r.fingerprintOf, logf) r.seatsAgain = again r.stops = append(r.stops, stopSeats) @@ -733,7 +733,7 @@ func subjectsOf(conn *bus.Conn, module, tool string) []string { // whenever a membership changes, and when again is called because a bundle was loaded again. Whether // this machine holds the seat is the bus's to decide. It answers its stop and again. func serveSeats(conn *bus.Conn, modules []string, current func() []registration, gated gatedRun, - admitted func(seat, verb, caller string) error, chunked func(key string) bool, approvals func(caller string) (any, error), + admitted func(seat, verb, caller string) error, chunked func(key string) bool, within func(key string) time.Duration, approvals func(caller string) (any, error), fingerprintOf func(string) string, logf func(string, ...any)) (func(), func()) { var mu sync.Mutex var stops []func() @@ -799,7 +799,7 @@ func serveSeats(conn *bus.Conn, modules []string, current func() []registration, return nil, err } answer, err := gated(approval.Call{Address: v.Seat + "." + v.Verb, Module: module, Seat: v.Seat, Name: v.Verb, - Fingerprint: fingerprintOf(module), Caller: caller, Args: argsOf(body), Description: t.Description}, t, caller) + Fingerprint: fingerprintOf(module), Caller: caller, Args: argsOf(body), Description: t.Description}, t.Within(within("seat:"+v.Seat+"."+v.Verb)), caller) if err != nil || !chunked("seat:"+v.Seat+"."+v.Verb) { return answer, err } diff --git a/node-tools/internal/runtime/runtime_test.go b/node-tools/internal/runtime/runtime_test.go index 1c48105..c97e2e5 100644 --- a/node-tools/internal/runtime/runtime_test.go +++ b/node-tools/internal/runtime/runtime_test.go @@ -329,7 +329,7 @@ func TestANodeScopedSeatVerbIsAlsoAnsweredWithNoMachine(t *testing.T) { } nodeTools.Follow("theta") stop, _ := serveSeats(nodeTools, []string{"theta"}, regs, gated, func(_, _, _ string) error { return nil }, - func(string) bool { return false }, nil, func(string) string { return "" }, (&mt.Logs{}).Logf) + func(string) bool { return false }, func(string) time.Duration { return 0 }, nil, func(string) string { return "" }, (&mt.Logs{}).Logf) defer stop() for _, key := range []string{"seat:node-shelf.list@anchor", "seat:node-shelf.list"} { t.Run(key, func(t *testing.T) {