@passioncode-ai/fabric-agent-adapter 0.6.3 → 0.8.1

package/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/sample_service.py

@@ -20,9 +20,7 @@ import json
 import os
 from http.server import BaseHTTPRequestHandler
 from pathlib import Path
-import signal
 import sys
-import threading
 from typing import Any, Dict, Optional
 from urllib.parse import parse_qs, urlparse
 
@@ -66,12 +64,15 @@ class Service:
         self.degraded = [{"source": "demo", "reason": args.degraded}] if args.degraded else []
         self.started_at = fs.now_iso()
         self.build = {"commit": os.environ.get("FABRIC_BUILD_COMMIT", "0000000"), "builtAt": self.started_at}
+        self.drain = fs.Drain()  # LC-01: SIGTERM drains in-flight calls, then the server stops
 
     def start(self) -> None:
         # Rule: the lock comes before ANY side effect, including creating the token.
         self.lock = fs.hold_single_instance(self.data)
         self.token = fs.ensure_token(self.token_file)
         self.log = fs.JsonlEventLog(self.data / "events.jsonl")
+        self.usage = fs.JsonlUsageLedger(self.data / "usage.jsonl")  # DEC-0021
+        self.usage.prune()
         self.codes = fs.LoginCodes(self.data / "auth")
         self.jobs = fi.JobStore(self.data / "jobs")
         self.mcp = fi.McpToolServer(self.id, VERSION, jobs=self.jobs, on_job_started=self.draft_started, on_input=self.draft_answered)
@@ -117,6 +118,8 @@ class Service:
                    "binding": {"id": "urn:fabric:binding:sample.draft", "revision": 1, "contentHash": "sha256:" + "0" * 64}, "writeScopes": []},
             not_verified=[{"claim": "NOTE", "reason": "no checker has read the note"}],
             output={"title": title, "body": body}, usage={"inputTokens": 0, "outputTokens": 0, "wallMs": 1}))
+        # The sample writes from a template: one call that costs a known $0 (DEC-0021 usage report).
+        self.usage.record(fs.make_usage_receipt("local", "sample-template", input_tokens=0, output_tokens=0, cost_usd=0.0, cost_basis="price-list"))
         self.log.append("job.completed", "info", "The note %s is drafted." % title, **fi.trace_ids(ctx.traceparent))
 
     def well_known(self) -> Dict[str, Any]:
@@ -125,7 +128,8 @@ class Service:
             started_at=self.started_at, status="ready", degraded=self.degraded,
             summary=[{"label": "Events", "value": len(self.log.fetch(None, fs.EVENTS_MAX_LIMIT))}],
             surfaces={"dashboard": {"path": "/", "login": True}, "events": {"path": "/fabric/v1/events"},
-                      "mcp": {"path": "/mcp", "transport": "streamable-http", "capabilities": [c["name"] for c in CAPABILITIES]}},
+                      "mcp": {"path": "/mcp", "transport": "streamable-http", "capabilities": [c["name"] for c in CAPABILITIES]},
+                      "usage": {"path": fs.USAGE_PATH}},
         )
 
 
@@ -187,6 +191,10 @@ def make_handler(svc: Service):
                 except fs.ServiceError as exc:
                     return self._send(400, {"error": str(exc)})
                 return self._send(200, page)
+            if url.path == fs.USAGE_PATH:
+                if not self._token_ok():
+                    return
+                return self._send(200, svc.usage.report(service_id=svc.id, instance=svc.instance))
             if url.path == "/mcp":
                 # No server-to-client stream here: Streamable HTTP says 405 for a GET.
                 return self._send(405, {"error": "POST JSON-RPC to /mcp."}, {"Allow": "POST"})
@@ -216,7 +224,14 @@ def make_handler(svc: Service):
                     message = json.loads(self.rfile.read(length) or b"null")
                 except ValueError:
                     return self._send(400, {"jsonrpc": "2.0", "id": None, "error": {"code": -32700, "message": "Parse error."}})
-                response = svc.mcp.handle(message)
+                try:
+                    with svc.drain.work():
+                        response = svc.mcp.handle(message, self.headers)
+                except fs.Stopping as exc:
+                    return self._send(503, {"jsonrpc": "2.0", "id": None, "error": {"code": -32000, "message": str(exc)}},
+                                      {"Retry-After": "5"})
+                if response is not None and (response.get("error") or {}).get("code") == fi.HEADER_MISMATCH:
+                    return self._send(400, response)
                 return self._send(202) if response is None else self._send(200, response)
             if url.path == "/fabric/v1/login-code":
                 if not self._token_ok():
@@ -247,12 +262,10 @@ def serve(args: argparse.Namespace) -> int:
     svc.start()
     server = make_server(svc)
 
-    def stop(signum: int, _frame: Any) -> None:
-        svc.log.append("service.stopping", "info", "%s is stopping." % svc.name)
-        threading.Thread(target=server.shutdown, daemon=True).start()
-
-    signal.signal(signal.SIGTERM, stop)
-    signal.signal(signal.SIGINT, stop)
+    # Stop taking calls, let in-flight ones finish (8 s at most), then end serve_forever; a
+    # hand-over that hangs is cut by the kit's hard exit, inside launchd's ExitTimeOut.
+    svc.drain.install(lambda drained: server.shutdown(),
+                      on_stopping=lambda: svc.log.append("service.stopping", "info", "%s is stopping." % svc.name))
     try:
         server.serve_forever(poll_interval=0.2)
     finally:

package/plugins/fabric-agent-adapter/skills/creating-fabric-agents/SKILL.md

@@ -5,9 +5,9 @@ license: AGPL-3.0-only OR LicenseRef-PassionCode-Commercial
 compatibility: Requires filesystem access and Python 3.9+. Exact schema checks additionally need git, Node.js, pnpm, and the pinned fabric-agent-contract checkout (a public repository). Works without those tools in an explicitly degraded structural-check mode. Ships in one plugin with adapting-projects-to-fabric, whose scripts it reuses.
 metadata:
   author: PassionCode.ai
-  version: "0.6.3"
+  version: "0.8.1"
   contract-version: "0.1.0"
-  contract-commit: "2ce392291c6668598d12cd38327e24696b5ca15c"
+  contract-commit: "623bf61358c339cb10297807b3f024b5d9f1f327"
 ---
 
 # Creating Fabric-compatible agents
@@ -119,12 +119,16 @@ python3 <plugin-dir>/skills/adapting-projects-to-fabric/scripts/adapt_project.py
   --schema-base <immutable-base-uri>
 ```
 
-Pin exactly contract `0.1.0` at commit `2ce392291c6668598d12cd38327e24696b5ca15c` and
+Pin exactly contract `0.1.0` at commit `623bf61358c339cb10297807b3f024b5d9f1f327` and
 read the pinned guide before implementing protocol details. If this skill is installed
 without its sibling, the scaffolder is absent: create the bundle by hand from the pinned
 contract's `docs/guides/connecting-compatible-agents.md` and mark the structural check
 `NOT_RUN` — do not reconstruct normative rules from memory.
 
+This default accepts underscore capability names; a declared communications name does
+not grant COM access or prove runtime admission. Existing bundles retain their explicit
+supported revision and require its exact checkout; never silently migrate their lock.
+
 The generated placeholders are deliberate blockers; a bundle still containing one is not
 ready for admission.