@f5-sales-demo/xcsh 19.62.0 → 19.62.2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "19.62.0",
+	"version": "19.62.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -56,13 +56,13 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5-sales-demo/xcsh-stats": "19.62.0",
-		"@f5-sales-demo/pi-agent-core": "19.62.0",
-		"@f5-sales-demo/pi-ai": "19.62.0",
-		"@f5-sales-demo/pi-natives": "19.62.0",
-		"@f5-sales-demo/pi-resource-management": "19.62.0",
-		"@f5-sales-demo/pi-tui": "19.62.0",
-		"@f5-sales-demo/pi-utils": "19.62.0",
+		"@f5-sales-demo/xcsh-stats": "19.62.2",
+		"@f5-sales-demo/pi-agent-core": "19.62.2",
+		"@f5-sales-demo/pi-ai": "19.62.2",
+		"@f5-sales-demo/pi-natives": "19.62.2",
+		"@f5-sales-demo/pi-resource-management": "19.62.2",
+		"@f5-sales-demo/pi-tui": "19.62.2",
+		"@f5-sales-demo/pi-utils": "19.62.2",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",

package/src/commands/manager-core.ts

@@ -131,6 +131,25 @@ export function touchLastSeen(reg: Registry, sessionId: string | undefined, now:
 	return true;
 }
 
+/** True iff this manager should self-recycle because it is running a STALE on-disk
+ * binary. Only for a COMPILED install: after `brew upgrade` + `brew cleanup`, the old
+ * versioned binary the manager was launched from is DELETED, yet the process lingers
+ * on the freed inode — and can no longer spawn workers/spares (spawn ENOENT), which
+ * surfaces as the extension's "xcsh didn't start". Detecting the deleted binary lets
+ * the manager step down so a fresh one (launched from the version-stable PATH wrapper)
+ * takes over. Dev (`bun src/cli.ts`) has a live interpreter execPath → never stale.
+ * Fail-closed: any error from `exists` → NOT stale, so uncertainty never triggers a
+ * recycle loop. Only the unambiguous deleted-binary signal is used (a version/realpath
+ * drift signal was deliberately NOT added — false positives would flap-recycle). */
+export function binaryIsStale(opts: { compiled: boolean; execPath: string; exists: (p: string) => boolean }): boolean {
+	if (!opts.compiled) return false;
+	try {
+		return !opts.exists(opts.execPath);
+	} catch {
+		return false;
+	}
+}
+
 /** The NDJSON keepalive an actively-chatting worker writes to the manager control
  * socket to refresh its `lastSeen` (consumed by `touchLastSeen`). Null for the
  * unbound `spare` sentinel or an empty id — a spare has no session to keep alive. */

package/src/commands/manager.ts

@@ -26,8 +26,11 @@ import { Command } from "@f5-sales-demo/pi-utils/cli";
 // slows the manager's cold start — keep the daemon's module graph minimal).
 import { VERSION } from "@f5-sales-demo/pi-utils/dirs";
 import { portCandidates } from "../browser/extension-bridge";
+// Lean standalone fn (compiled-runtime detection) — no heavy graph, safe for the daemon.
+import { detectCompiledRuntime } from "../internal-urls/build-info-runtime";
 import { removeManagerState, writeManagerState } from "../services/manager-state";
 import {
+	binaryIsStale,
 	needsProvision,
 	parseControlMsg,
 	pickPort,
@@ -209,6 +212,17 @@ export default class Manager extends Command {
 		// (production always reports the real binary VERSION).
 		const selfVersion = process.env.XCSH_MANAGER_VERSION || VERSION;
 
+		// Durable-upgrade self-recycle (#upgrade-recycle): a compiled manager whose
+		// on-disk binary was removed by `brew upgrade`+`brew cleanup` lingers on the
+		// freed inode but can no longer spawn workers (ENOENT) → it must step down so a
+		// fresh manager (from the version-stable PATH wrapper) takes over. Dev is never
+		// compiled → never stale. `XCSH_FORCE_STALE=1` lets the dev-mode integration test
+		// exercise the recycle path (same env-override convention as XCSH_MANAGER_VERSION).
+		const compiled = detectCompiledRuntime(import.meta.url, Bun.env);
+		const isSelfStale = (): boolean =>
+			process.env.XCSH_FORCE_STALE === "1" ||
+			binaryIsStale({ compiled, execPath: process.execPath, exists: fs.existsSync });
+
 		// Lifecycle gate (#1874): once we begin graceful shutdown we stop accepting
 		// provisions (the host retries the successor manager) and never double-run
 		// the teardown.
@@ -430,13 +444,22 @@ export default class Manager extends Command {
 			const msg = parseControlMsg(raw);
 			if (!msg) return; // fail closed on unknown/invalid frames
 			if (msg.type === "provision") {
-				// Draining: refuse new work so the host retries the successor manager.
-				if (!accepting) {
+				// Draining, OR self-stale (our binary was removed by an upgrade): refuse
+				// this provision so the host retries the successor manager — spawning now
+				// would ENOENT on the deleted binary. If stale-but-still-accepting, step
+				// down immediately so the fresh manager takes over in seconds (not on the
+				// ≤60s sweep). Reuses the existing draining reply/contract.
+				const stale = accepting && isSelfStale();
+				if (!accepting || stale) {
 					try {
 						socket.write(`${JSON.stringify({ type: "draining" })}\n`);
 					} catch {
 						/* client hung up */
 					}
+					if (stale) {
+						console.error("[xcsh manager] binary is stale (upgraded/removed) — recycling on provision");
+						gracefulShutdown("updated");
+					}
 					return;
 				}
 				const provisionReceivedAt = Date.now(); // TTFT Phase 2: start of manager_provision
@@ -537,8 +560,15 @@ export default class Manager extends Command {
 		// Pre-warm the spare pool so provisions can adopt instead of cold-spawn.
 		if (poolTarget > 0) maintainPool();
 
-		// Idle sweep: reap workers untouched for longer than the TTL.
+		// Idle sweep: reap workers untouched for longer than the TTL. Also self-recycle
+		// if our own binary went stale (upgrade removed it) — a lingering deleted-binary
+		// manager can't spawn workers, so step down for a fresh one (#upgrade-recycle).
 		setInterval(() => {
+			if (isSelfStale()) {
+				console.error("[xcsh manager] binary is stale (upgraded/removed) — recycling on sweep");
+				gracefulShutdown("updated");
+				return;
+			}
 			for (const key of staleKeys(reg, Date.now(), IDLE_MS)) reap(key);
 		}, SWEEP_MS);
 

package/src/internal-urls/build-info.generated.ts

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.62.0",
-	"commit": "002bc2b7d7e14a95e282f940730cbdc347197635",
-	"shortCommit": "002bc2b",
+	"version": "19.62.2",
+	"commit": "2db94a2fe43570de2c145baf4692241c0154dd3e",
+	"shortCommit": "2db94a2",
 	"branch": "main",
-	"tag": "v19.62.0",
-	"commitDate": "2026-07-08T02:22:10Z",
-	"buildDate": "2026-07-08T02:45:44.169Z",
+	"tag": "v19.62.2",
+	"commitDate": "2026-07-08T20:22:16Z",
+	"buildDate": "2026-07-08T20:48:07.292Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5-sales-demo/xcsh",
 	"repoSlug": "f5-sales-demo/xcsh",
-	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/002bc2b7d7e14a95e282f940730cbdc347197635",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.62.0"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/2db94a2fe43570de2c145baf4692241c0154dd3e",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.62.2"
 };

package/src/internal-urls/terraform-index.generated.ts

@@ -269,9 +269,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			category: "load-balancing",
 			description:
 				"Advertise_policy object controls how and where a service represented by a given virtual_host object is advertised to consumers. configuration",
-			required: ["name", "address", "protocol", "skip_xff_append"],
+			required: ["name", "namespace", "address", "protocol", "skip_xff_append"],
 			minimal_config:
-				'resource "xcsh_advertise_policy" "example" {\n  name      = "example-advertise-policy"\n  namespace = "system"\n\n  address         = "example-value"\n  protocol        = "example-value"\n  skip_xff_append = true\n}',
+				'resource "xcsh_advertise_policy" "example" {\n  name      = "example-advertise-policy"\n  namespace = "staging"\n\n  address         = "example-value"\n  protocol        = "example-value"\n  skip_xff_append = true\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -293,7 +293,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "New Alert Receiver object",
 			required: ["name", "namespace", "receiver_choice"],
 			minimal_config:
-				'resource "xcsh_alert_receiver" "example" {\n  name      = "example-alert-receiver"\n  namespace = "system"\n}',
+				'resource "xcsh_alert_receiver" "example" {\n  name      = "example-alert-receiver"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -302,9 +302,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		api_crawler: {
 			category: "api-security",
 			description: "API Crawler resource",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_api_crawler" "example" {\n  name      = "example-api-crawler"\n  namespace = "system"\n}',
+				'resource "xcsh_api_crawler" "example" {\n  name      = "example-api-crawler"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -315,7 +315,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "API Definition",
 			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_api_definition" "example" {\n  name      = "example-api-definition"\n  namespace = "system"\n}',
+				'resource "xcsh_api_definition" "example" {\n  name      = "example-api-definition"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: ["namespace"],
 			},
@@ -326,7 +326,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "API discovery creates a new object in the storage backend for metadata.namespace",
 			required: ["name", "namespace", "user_defined_api_discovery_policy"],
 			minimal_config:
-				'resource "xcsh_api_discovery" "example" {\n  name      = "example-api-discovery"\n  namespace = "system"\n}',
+				'resource "xcsh_api_discovery" "example" {\n  name      = "example-api-discovery"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -335,9 +335,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		api_testing: {
 			category: "api-security",
 			description: "API Testing resource",
-			required: ["name", "custom_header_value"],
+			required: ["name", "namespace", "custom_header_value"],
 			minimal_config:
-				'resource "xcsh_api_testing" "example" {\n  name      = "example-api-testing"\n  namespace = "system"\n\n  custom_header_value = "example-value"\n}',
+				'resource "xcsh_api_testing" "example" {\n  name      = "example-api-testing"\n  namespace = "staging"\n\n  custom_header_value = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -356,9 +356,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		app_api_group: {
 			category: "api-security",
 			description: "App_api_group creates a new object in the storage backend for metadata.namespace",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_app_api_group" "example" {\n  name      = "example-app-api-group"\n  namespace = "system"\n}',
+				'resource "xcsh_app_api_group" "example" {\n  name      = "example-app-api-group"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -378,9 +378,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		app_setting: {
 			category: "applications",
 			description: "App setting configuration in namespace metadata.namespace",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_app_setting" "example" {\n  name      = "example-app-setting"\n  namespace = "system"\n}',
+				'resource "xcsh_app_setting" "example" {\n  name      = "example-app-setting"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -389,9 +389,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		app_type: {
 			category: "applications",
 			description: "App type will create the configuration in namespace metadata.namespace",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_app_type" "example" {\n  name      = "example-app-type"\n  namespace = "system"\n}',
+				'resource "xcsh_app_type" "example" {\n  name      = "example-app-type"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -433,9 +433,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		aws_tgw_site: {
 			category: "sites",
 			description: "Deploying F5 sites connected via AWS Transit Gateway",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_aws_tgw_site" "example" {\n  name      = "example-aws-tgw-site"\n  namespace = "system"\n}',
+				'resource "xcsh_aws_tgw_site" "example" {\n  name      = "example-aws-tgw-site"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -444,9 +444,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		aws_vpc_site: {
 			category: "sites",
 			description: "Deploying F5 sites within AWS VPC environments",
-			required: ["name", "address", "aws_region", "disk_size", "instance_type", "ssh_key"],
+			required: ["name", "namespace", "address", "aws_region", "disk_size", "instance_type", "ssh_key"],
 			minimal_config:
-				'resource "xcsh_aws_vpc_site" "example" {\n  name      = "example-aws-vpc-site"\n  namespace = "system"\n\n  aws_region    = "example-value"\n  instance_type = "example-value"\n  ssh_key       = "example-value"\n  address       = "example-value"\n  disk_size     = 1\n}',
+				'resource "xcsh_aws_vpc_site" "example" {\n  name      = "example-aws-vpc-site"\n  namespace = "staging"\n\n  aws_region    = "example-value"\n  instance_type = "example-value"\n  ssh_key       = "example-value"\n  address       = "example-value"\n  disk_size     = 1\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -455,9 +455,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		azure_vnet_site: {
 			category: "sites",
 			description: "Deploying F5 sites within Azure Virtual Network environments",
-			required: ["name", "machine_type", "resource_group", "ssh_key"],
+			required: ["name", "namespace", "machine_type", "resource_group", "ssh_key"],
 			minimal_config:
-				'resource "xcsh_azure_vnet_site" "example" {\n  name      = "example-Azure-vnet-site"\n  namespace = "system"\n\n  machine_type   = "example-value"\n  resource_group = "example-value"\n  ssh_key        = "example-value"\n}',
+				'resource "xcsh_azure_vnet_site" "example" {\n  name      = "example-Azure-vnet-site"\n  namespace = "staging"\n\n  machine_type   = "example-value"\n  resource_group = "example-value"\n  ssh_key        = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -467,8 +467,8 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			category: "networking",
 			description:
 				"Bgp object is the configuration for peering with external bgp servers. it is created by users in system namespace. configuration",
-			required: ["name"],
-			minimal_config: 'resource "xcsh_bgp" "example" {\n  name      = "example-bgp"\n  namespace = "system"\n}',
+			required: ["name", "namespace"],
+			minimal_config: 'resource "xcsh_bgp" "example" {\n  name      = "example-bgp"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -477,9 +477,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		bgp_asn_set: {
 			category: "networking",
 			description: "Bgp_asn_set creates a new object in the storage backend for metadata.namespace",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_bgp_asn_set" "example" {\n  name      = "example-bgp-asn-set"\n  namespace = "system"\n\n  as_numbers = [1]\n}',
+				'resource "xcsh_bgp_asn_set" "example" {\n  name      = "example-bgp-asn-set"\n  namespace = "staging"\n\n  as_numbers = [1]\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -588,9 +588,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		cloud_credentials: {
 			category: "authentication",
 			description: "Api to create cloud_credentials object. configuration",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_cloud_credentials" "example" {\n  name      = "example-cloud-credentials"\n  namespace = "system"\n}',
+				'resource "xcsh_cloud_credentials" "example" {\n  name      = "example-cloud-credentials"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -599,9 +599,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		cloud_elastic_ip: {
 			category: "cloud-resources",
 			description: "Cloud Elastic IP creates Cloud Elastic IP object Object is attached to a site",
-			required: ["name", "item_count"],
+			required: ["name", "namespace", "item_count"],
 			minimal_config:
-				'resource "xcsh_cloud_elastic_ip" "example" {\n  name      = "example-cloud-elastic-ip"\n  namespace = "system"\n\n  item_count = 1\n}',
+				'resource "xcsh_cloud_elastic_ip" "example" {\n  name      = "example-cloud-elastic-ip"\n  namespace = "staging"\n\n  item_count = 1\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -651,9 +651,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		code_base_integration: {
 			category: "integrations",
 			description: "Integration details",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_code_base_integration" "example" {\n  name      = "example-code-base-integration"\n  namespace = "system"\n}',
+				'resource "xcsh_code_base_integration" "example" {\n  name      = "example-code-base-integration"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -706,9 +706,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		dc_cluster_group: {
 			category: "networking",
 			description: "DC Cluster group in given namespace",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_dc_cluster_group" "example" {\n  name      = "example-dc-cluster-group"\n  namespace = "system"\n}',
+				'resource "xcsh_dc_cluster_group" "example" {\n  name      = "example-dc-cluster-group"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -717,9 +717,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		discovery: {
 			category: "applications",
 			description: "Api to create discovery object for a site or virtual site in system namespace. configuration",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_discovery" "example" {\n  name      = "example-discovery"\n  namespace = "system"\n}',
+				'resource "xcsh_discovery" "example" {\n  name      = "example-discovery"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -773,9 +773,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		dns_load_balancer: {
 			category: "dns",
 			description: "DNS Load Balancer in a given namespace. If one already exist it will give a error",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_dns_load_balancer" "example" {\n  name      = "example-dns-load-balancer"\n  namespace = "staging"\n}',
+				'resource "xcsh_dns_load_balancer" "example" {\n  name      = "example-dns-load-balancer"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -784,9 +784,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		dns_proxy: {
 			category: "dns",
 			description: "DNS Proxy in a given namespace. If one already exists it will give an error",
-			required: ["name", "namespace", "transport_type"],
+			required: ["name", "transport_type"],
 			minimal_config:
-				'resource "xcsh_dns_proxy" "example" {\n  name      = "example-dns-proxy"\n  namespace = "staging"\n\n  transport_type = "UDP"\n}',
+				'resource "xcsh_dns_proxy" "example" {\n  name      = "example-dns-proxy"\n  namespace = "system"\n\n  transport_type = "UDP"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -806,9 +806,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		endpoint: {
 			category: "load-balancing",
 			description: "Endpoint will create the object in the storage backend for namespace metadata.namespace",
-			required: ["name", "health_check_port", "port", "protocol"],
+			required: ["name", "namespace", "health_check_port", "port", "protocol"],
 			minimal_config:
-				'resource "xcsh_endpoint" "example" {\n  name      = "example-endpoint"\n  namespace = "system"\n\n  health_check_port = 1\n  port              = 1\n  protocol          = "example-value"\n}',
+				'resource "xcsh_endpoint" "example" {\n  name      = "example-endpoint"\n  namespace = "staging"\n\n  health_check_port = 1\n  port              = 1\n  protocol          = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -851,9 +851,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		fast_acl_rule: {
 			category: "security",
 			description: "New Fast ACL rule, has specification to match source IP, source port and action to apply",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_fast_acl_rule" "example" {\n  name      = "example-fast-acl-rule"\n  namespace = "system"\n}',
+				'resource "xcsh_fast_acl_rule" "example" {\n  name      = "example-fast-acl-rule"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -875,13 +875,14 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "Fleet will create a fleet object in 'system' namespace of the user",
 			required: [
 				"name",
+				"namespace",
 				"enable_default_fleet_config_download",
 				"fleet_label",
 				"operating_system_version",
 				"volterra_software_version",
 			],
 			minimal_config:
-				'resource "xcsh_fleet" "example" {\n  name      = "example-fleet"\n  namespace = "system"\n\n  fleet_label                          = "example-value"\n  enable_default_fleet_config_download = true\n  operating_system_version             = "example-value"\n  volterra_software_version            = "example-value"\n}',
+				'resource "xcsh_fleet" "example" {\n  name      = "example-fleet"\n  namespace = "staging"\n\n  fleet_label                          = "example-value"\n  enable_default_fleet_config_download = true\n  operating_system_version             = "example-value"\n  volterra_software_version            = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -912,9 +913,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		gcp_vpc_site: {
 			category: "sites",
 			description: "Deploying F5 sites within Google Cloud VPC environments",
-			required: ["name", "address", "disk_size", "gcp_region", "instance_type", "ssh_key"],
+			required: ["name", "namespace", "address", "disk_size", "gcp_region", "instance_type", "ssh_key"],
 			minimal_config:
-				'resource "xcsh_gcp_vpc_site" "example" {\n  name      = "example-gcp-vpc-site"\n  namespace = "system"\n\n  gcp_region    = "example-value"\n  instance_type = "example-value"\n  ssh_key       = "example-value"\n  address       = "example-value"\n  disk_size     = 1\n}',
+				'resource "xcsh_gcp_vpc_site" "example" {\n  name      = "example-gcp-vpc-site"\n  namespace = "staging"\n\n  gcp_region    = "example-value"\n  instance_type = "example-value"\n  ssh_key       = "example-value"\n  address       = "example-value"\n  disk_size     = 1\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -936,7 +937,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "New Global Log Receiver object",
 			required: ["name", "namespace", "log_type", "receiver_choice"],
 			minimal_config:
-				'resource "xcsh_global_log_receiver" "example" {\n  name      = "example-global-log-receiver"\n  namespace = "system"\n}',
+				'resource "xcsh_global_log_receiver" "example" {\n  name      = "example-global-log-receiver"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1038,7 +1039,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "K8s_cluster will create the object in the storage backend for namespace metadata.namespace",
 			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_k8s_cluster" "example" {\n  name      = "example-k8s-cluster"\n  namespace = "system"\n}',
+				'resource "xcsh_k8s_cluster" "example" {\n  name      = "example-k8s-cluster"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1093,9 +1094,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		log_receiver: {
 			category: "monitoring",
 			description: "New Log Receiver object",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_log_receiver" "example" {\n  name      = "example-log-receiver"\n  namespace = "system"\n}',
+				'resource "xcsh_log_receiver" "example" {\n  name      = "example-log-receiver"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1139,9 +1140,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		nat_policy: {
 			category: "security",
 			description: "Nat policy create specification configures nat policy with multiple rules,. configuration",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_nat_policy" "example" {\n  name      = "example-nat-policy"\n  namespace = "system"\n}',
+				'resource "xcsh_nat_policy" "example" {\n  name      = "example-nat-policy"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1150,9 +1151,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		network_connector: {
 			category: "networking",
 			description: "Network connector is created by users in system namespace. configuration",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_network_connector" "example" {\n  name      = "example-network-connector"\n  namespace = "system"\n}',
+				'resource "xcsh_network_connector" "example" {\n  name      = "example-network-connector"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1173,9 +1174,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			category: "networking",
 			description:
 				"Network interface represents configuration of a network device. it is created by users in system namespace. configuration",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_network_interface" "example" {\n  name      = "example-network-interface"\n  namespace = "system"\n}',
+				'resource "xcsh_network_interface" "example" {\n  name      = "example-network-interface"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1195,9 +1196,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		network_policy_rule: {
 			category: "security",
 			description: "Network policy rule with configured parameters in specified namespace",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_network_policy_rule" "example" {\n  name      = "example-network-policy-rule"\n  namespace = "system"\n}',
+				'resource "xcsh_network_policy_rule" "example" {\n  name      = "example-network-policy-rule"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1217,9 +1218,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		nfv_service: {
 			category: "networking",
 			description: "New NFV service with configured parameters",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_nfv_service" "example" {\n  name      = "example-nfv-service"\n  namespace = "system"\n}',
+				'resource "xcsh_nfv_service" "example" {\n  name      = "example-nfv-service"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1229,9 +1230,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			category: "networking",
 			description:
 				"Api to create nginx service discovery object for a site or virtual site in system namespace. configuration",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_nginx_service_discovery" "example" {\n  name      = "example-nginx-service-discovery"\n  namespace = "system"\n}',
+				'resource "xcsh_nginx_service_discovery" "example" {\n  name      = "example-nginx-service-discovery"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1278,7 +1279,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 				"Protocol Inspection Specification in a given namespace. If one already exists it will give an error",
 			required: ["name", "namespace", "enable_disable_compliance_checks", "enable_disable_signatures"],
 			minimal_config:
-				'resource "xcsh_protocol_inspection" "example" {\n  name      = "example-protocol-inspection"\n  namespace = "system"\n}',
+				'resource "xcsh_protocol_inspection" "example" {\n  name      = "example-protocol-inspection"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1343,9 +1344,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		secret_management_access: {
 			category: "authentication",
 			description: "Secret_management_access creates a new object in storage backend for metadata.namespace",
-			required: ["name", "provider_name"],
+			required: ["name", "namespace", "provider_name"],
 			minimal_config:
-				'resource "xcsh_secret_management_access" "example" {\n  name      = "example-secret-management-access"\n  namespace = "system"\n\n  provider_name = "example-value"\n}',
+				'resource "xcsh_secret_management_access" "example" {\n  name      = "example-secret-management-access"\n  namespace = "staging"\n\n  provider_name = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1354,9 +1355,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		securemesh_site: {
 			category: "sites",
 			description: "Deploying secure mesh edge sites with distributed security capabilities",
-			required: ["name", "address", "volterra_certified_hw"],
+			required: ["name", "namespace", "address", "volterra_certified_hw"],
 			minimal_config:
-				'resource "xcsh_securemesh_site" "example" {\n  name      = "example-securemesh-site"\n  namespace = "system"\n\n  volterra_certified_hw = "example-value"\n  worker_nodes          = ["example-value"]\n  address               = "example-value"\n}',
+				'resource "xcsh_securemesh_site" "example" {\n  name      = "example-securemesh-site"\n  namespace = "staging"\n\n  volterra_certified_hw = "example-value"\n  worker_nodes          = ["example-value"]\n  address               = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1365,9 +1366,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		securemesh_site_v2: {
 			category: "sites",
 			description: "Deploying secure mesh edge sites with enhanced security and networking features",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_securemesh_site_v2" "example" {\n  name      = "example-securemesh-site-v2"\n  namespace = "system"\n}',
+				'resource "xcsh_securemesh_site_v2" "example" {\n  name      = "example-securemesh-site-v2"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1420,9 +1421,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		site: {
 			category: "sites",
 			description: "Virtual site object in given namespace",
-			required: ["name", "site_type"],
+			required: ["name", "namespace", "site_type"],
 			minimal_config:
-				'resource "xcsh_site" "example" {\n  name      = "example-site"\n  namespace = "system"\n\n  site_type = "INVALID"\n}',
+				'resource "xcsh_site" "example" {\n  name      = "example-site"\n  namespace = "staging"\n\n  site_type = "INVALID"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1431,9 +1432,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		site_mesh_group: {
 			category: "sites",
 			description: "Site Mesh Group in system namespace of user",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_site_mesh_group" "example" {\n  name      = "example-site-mesh-group"\n  namespace = "system"\n}',
+				'resource "xcsh_site_mesh_group" "example" {\n  name      = "example-site-mesh-group"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1482,9 +1483,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		tenant_configuration: {
 			category: "organization",
 			description: "Tenant configuration specification. configuration",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_tenant_configuration" "example" {\n  name      = "example-tenant-configuration"\n  namespace = "system"\n}',
+				'resource "xcsh_tenant_configuration" "example" {\n  name      = "example-tenant-configuration"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1526,9 +1527,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		usb_policy: {
 			category: "security",
 			description: "New USB policy object",
-			required: ["name"],
+			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_usb_policy" "example" {\n  name      = "example-usb-policy"\n  namespace = "system"\n}',
+				'resource "xcsh_usb_policy" "example" {\n  name      = "example-usb-policy"\n  namespace = "staging"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1593,7 +1594,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "Virtual site object in given namespace",
 			required: ["name", "namespace", "site_type", "site_selector"],
 			minimal_config:
-				'resource "xcsh_virtual_site" "example" {\n  name      = "example-virtual-site"\n  namespace = "system"\n\n  site_type = "INVALID"\n}',
+				'resource "xcsh_virtual_site" "example" {\n  name      = "example-virtual-site"\n  namespace = "staging"\n\n  site_type = "INVALID"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1602,9 +1603,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		voltstack_site: {
 			category: "sites",
 			description: "Deploying Volterra stack sites for edge computing",
-			required: ["name", "address", "volterra_certified_hw"],
+			required: ["name", "namespace", "address", "volterra_certified_hw"],
 			minimal_config:
-				'resource "xcsh_voltstack_site" "example" {\n  name      = "example-voltstack-site"\n  namespace = "system"\n\n  volterra_certified_hw = "example-value"\n  worker_nodes          = ["example-value"]\n  address               = "example-value"\n}',
+				'resource "xcsh_voltstack_site" "example" {\n  name      = "example-voltstack-site"\n  namespace = "staging"\n\n  volterra_certified_hw = "example-value"\n  worker_nodes          = ["example-value"]\n  address               = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},