@passioncode-ai/fabric-agent-adapter 0.81.0 → 0.83.1

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

@@ -390,12 +390,24 @@ def package_findings(pkg: Dict[str, Any]) -> List[Dict[str, str]]:
 
 # --- the folder check and the verifier ------------------------------------------------------------------
 
+def _json_int(text: str) -> Any:
+    """An integer literal as JSON.parse reads it: one longer than a Python with `int_max_str_digits` reads is a float,
+    as a JavaScript number is (FAA-194 (36))."""
+    return int(text) if len(text) <= 4000 else float(text)
+
+
 def _parsed(data: Optional[bytes]) -> Optional[Dict[str, Any]]:
+    """A plugin or provider manifest as the contract's checkPackageFolder reads it: decoded with replacement characters
+    (`Buffer.toString`, FAA-194 (29)); NaN or Infinity, or nesting past MAX_NESTING (the limit both kits share, FAA-194
+    (27)), is no manifest."""
     if data is None:
         return None
+    text = data.decode("utf-8", "replace")
+    if _nesting(text) > MAX_NESTING:
+        return None
     try:
-        value = json.loads(data.decode("utf-8"), parse_constant=fd._no_constant)
-    except (ValueError, RecursionError):  # invalid UTF-8, NaN or Infinity is no manifest, in both kits
+        value = json.loads(text, parse_constant=fd._no_constant, parse_int=_json_int)
+    except (ValueError, RecursionError):
         return None
     return value if isinstance(value, dict) else None
 
@@ -419,7 +431,7 @@ def check_package_folder(pkg: Dict[str, Any], files: Dict[str, bytes]) -> List[D
             problems.append({"problem": "file-unlisted", "path": path})
     if PLUGIN_MANIFEST in files:
         plugin = _parsed(files.get(PLUGIN_MANIFEST))
-        if not plugin or not _same_member(plugin, "name", pkg.get("id", _UNDEFINED)) or not _same_member(plugin, "version", pkg.get("version", _UNDEFINED)):
+        if plugin is None or not _same_member(plugin, "name", pkg.get("id", _UNDEFINED)) or not _same_member(plugin, "version", pkg.get("version", _UNDEFINED)):
             problems.append({"problem": "plugin-manifest", "path": PLUGIN_MANIFEST})
     provider = pkg.get("provider")
     if isinstance(provider, str) and provider in files:
@@ -615,7 +627,7 @@ def read_folder(folder: Any) -> Dict[str, bytes]:
         if _BY_FOLDER:
             os.close(top)  # type: ignore[arg-type]
     if refused:
-        raise PackageError("Not packed: remove these or pack a clean copy: " + "; ".join(sorted(refused)))
+        raise PackageError("Not packed: pack a clean copy (what Git would commit, references/package.md); delete only litter and credential files in place: " + "; ".join(sorted(refused)))
     return files
 
 

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

@@ -38,23 +38,35 @@ def services_dir() -> Path:
     return Path(base) / "passioncode-fabric/services"
 
 
+def _durable(service_id: str, dirs: Dict[str, Path]) -> Dict[str, Path]:
+    """FABRIC_DATA_HOME (FAA-192): an absolute folder on a durable volume holds the data folder, `<home>/<id>`, on a host
+    whose own disk does not persist; logs and cache stay where the OS puts them. A relative value is refused."""
+    value = os.environ.get("FABRIC_DATA_HOME")
+    if not value:
+        return dirs
+    if not os.path.isabs(value):
+        raise ServiceError("FABRIC_DATA_HOME is an absolute folder on a durable volume.")
+    return dict(dirs, data=Path(value) / service_id)
+
+
 def service_dirs(service_id: str) -> Dict[str, Path]:
-    """State lives outside code: data+config, logs and cache in per-user OS directories."""
+    """State lives outside code: data+config, logs and cache in per-user OS directories (the data folder under
+    FABRIC_DATA_HOME when it is set)."""
     _require_id(service_id)
     home = Path.home()
     if sys.platform == "darwin":
-        return {
+        return _durable(service_id, {
             "data": home / "Library/Application Support" / service_id,
             "logs": home / "Library/Logs" / service_id,
             "cache": home / "Library/Caches" / service_id,
-        }
+        })
     if sys.platform == "win32":
         data = _local_app_data() / service_id
-        return {"data": data, "logs": data / "Logs", "cache": data / "Cache"}
+        return _durable(service_id, {"data": data, "logs": data / "Logs", "cache": data / "Cache"})
     data = Path(os.environ.get("XDG_DATA_HOME") or home / ".local/share") / service_id
     state = Path(os.environ.get("XDG_STATE_HOME") or home / ".local/state") / service_id
     cache = Path(os.environ.get("XDG_CACHE_HOME") or home / ".cache") / service_id
-    return {"data": data, "logs": state / "logs", "cache": cache}
+    return _durable(service_id, {"data": data, "logs": state / "logs", "cache": cache})
 
 
 def instance_dirs(service_id: str, instance: str = "default") -> Dict[str, Path]:
@@ -69,6 +81,9 @@ def instance_dirs(service_id: str, instance: str = "default") -> Dict[str, Path]
     folder, personal = "%s.%s" % (service_id, instance), service_dirs(service_id)
     if sys.platform == "win32":
         data = personal["data"].parent / folder
+        if os.environ.get("FABRIC_DATA_HOME"):  # logs and cache stay on the local disk, beside the default's
+            local = personal["logs"].parent.parent / folder
+            return {"data": data, "logs": local / "Logs", "cache": local / "Cache"}
         return {"data": data, "logs": data / "Logs", "cache": data / "Cache"}
     if sys.platform == "darwin":
         return {key: path.parent / folder for key, path in personal.items()}