@f5-sales-demo/xcsh 19.61.1 → 19.61.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "19.61.1",
+	"version": "19.61.3",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -36,7 +36,7 @@
 		"check:types": "bun run generate-build-info && bun run generate-extension-capabilities && bun run generate-api-spec-index && bun run generate-branding-index && bun run generate-terraform-index && tsgo -p tsconfig.json --noEmit",
 		"lint": "biome lint .",
 		"check:bundle": "bun scripts/check-bundle.ts",
-		"test": "bun run generate-build-info && bun run generate-extension-capabilities && bun run generate-api-spec-index && bun run generate-console-catalog && bun run generate-console-field-metadata && bun test --max-concurrency 4",
+		"test": "bun run generate-build-info && bun run generate-extension-capabilities && bun run generate-api-spec-index && bun run generate-console-catalog && bun run generate-console-field-metadata && bun scripts/bun-test-guarded.ts --max-concurrency 4",
 		"fix": "biome check --write --unsafe . && bun run format-prompts && bun run generate-docs-index && bun run generate-api-spec-index && bun run generate-build-info",
 		"fmt": "biome format --write . && bun run format-prompts",
 		"format-prompts": "bun scripts/format-prompts.ts",
@@ -56,13 +56,13 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5-sales-demo/xcsh-stats": "19.61.1",
-		"@f5-sales-demo/pi-agent-core": "19.61.1",
-		"@f5-sales-demo/pi-ai": "19.61.1",
-		"@f5-sales-demo/pi-natives": "19.61.1",
-		"@f5-sales-demo/pi-resource-management": "19.61.1",
-		"@f5-sales-demo/pi-tui": "19.61.1",
-		"@f5-sales-demo/pi-utils": "19.61.1",
+		"@f5-sales-demo/xcsh-stats": "19.61.3",
+		"@f5-sales-demo/pi-agent-core": "19.61.3",
+		"@f5-sales-demo/pi-ai": "19.61.3",
+		"@f5-sales-demo/pi-natives": "19.61.3",
+		"@f5-sales-demo/pi-resource-management": "19.61.3",
+		"@f5-sales-demo/pi-tui": "19.61.3",
+		"@f5-sales-demo/pi-utils": "19.61.3",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",

package/scripts/bun-test-guarded.ts

@@ -0,0 +1,54 @@
+#!/usr/bin/env bun
+/**
+ * Guarded `bun test` runner.
+ *
+ * Runs `bun test <args…>` and enforces one extra invariant: if the run exits 0
+ * it MUST have printed a "Ran N tests" summary. A test module that calls
+ * `process.exit(0)` terminates the whole runner with a success code BEFORE the
+ * summary prints, silently masking every failure that already ran (this made the
+ * required CI `test` job a no-op gate — issue #1903). Exit code alone can't catch
+ * that regression; the missing summary can.
+ *
+ * Behaviour:
+ *  - child exits non-zero  → propagate it (real failures already fail the job).
+ *  - child exits 0 WITH a summary ("Ran N tests" / "No tests found") → pass.
+ *  - child exits 0 WITHOUT a summary → fail (exit 1): a test aborted the runner.
+ *
+ * stderr (where bun writes results) is streamed through unchanged so CI logs are
+ * identical; we only tee it to scan for the summary line.
+ */
+const args = process.argv.slice(2);
+
+// Use the running bun (process.execPath), not a PATH lookup of "bun", so the
+// guard works in any environment the parent runs in.
+const proc = Bun.spawn([process.execPath, "test", ...args], {
+	stdout: "inherit",
+	stderr: "pipe",
+	env: process.env,
+});
+
+const SUMMARY = /Ran \d+ tests?\b|No tests found/;
+const decoder = new TextDecoder();
+// Keep a small rolling tail so a summary line split across two chunks is still
+// matched, without buffering the entire (potentially large) stderr stream.
+let tail = "";
+
+for await (const chunk of proc.stderr as ReadableStream<Uint8Array>) {
+	process.stderr.write(chunk); // stream through unchanged
+	tail = (tail + decoder.decode(chunk, { stream: true })).slice(-4096);
+}
+
+const sawSummary = SUMMARY.test(tail);
+const code = await proc.exited;
+
+if (code !== 0) process.exit(code);
+
+if (!sawSummary) {
+	process.stderr.write(
+		'\n\x1b[31mtest-guard: `bun test` exited 0 but printed no "Ran N tests" summary.\x1b[0m\n' +
+			"A test module likely called process.exit() and aborted the runner, masking failures (see #1903).\n",
+	);
+	process.exit(1);
+}
+
+process.exit(0);

package/src/commands/worker.ts

@@ -228,8 +228,28 @@ export default class Worker extends Command {
 			enableMCP: false,
 			enableLsp: false,
 			disableExtensionDiscovery: true,
+			// TTFT Phase 3: load the hermetic bench stand-in provider when the benchmark
+			// sets XCSH_BENCH_EXTENSION (absolute path). Inert for normal workers.
+			...(process.env.XCSH_BENCH_EXTENSION ? { additionalExtensionPaths: [process.env.XCSH_BENCH_EXTENSION] } : {}),
 		});
 
+		// TTFT Phase 3 hermeticity: the bench-instant stand-in provider is registered while
+		// createAgentSession loads the bench extension (additionalExtensionPaths), which is
+		// AFTER the default-model role is resolved — so the worker would otherwise fall back
+		// to a real provider and the benchmark would measure live network TTFT, not xcsh
+		// overhead. In bench mode, explicitly select bench-instant now that it is registered.
+		// Gated on XCSH_BENCH_EXTENSION → completely inert for a normal `xcsh worker`.
+		if (process.env.XCSH_BENCH_EXTENSION) {
+			const benchModel = session.modelRegistry.find("bench-instant", "bench-instant");
+			if (benchModel) {
+				await session.setModel(benchModel);
+			} else {
+				console.error(
+					"[xcsh worker] BENCH ERROR: bench-instant model not registered — benchmark would measure a real provider",
+				);
+			}
+		}
+
 		const chatHandler = new ChatHandler(bridge, session);
 		chatHandler.attach();
 

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.61.1",
-	"commit": "2060729b09fb7a4ede87e49a0ac0fb76725160ae",
-	"shortCommit": "2060729",
+	"version": "19.61.3",
+	"commit": "1546a875f07608812967e1169ea86c2bd3f837ac",
+	"shortCommit": "1546a87",
 	"branch": "main",
-	"tag": "v19.61.1",
-	"commitDate": "2026-07-07T00:26:41Z",
-	"buildDate": "2026-07-07T01:18:58.960Z",
+	"tag": "v19.61.3",
+	"commitDate": "2026-07-07T11:57:08Z",
+	"buildDate": "2026-07-07T12:21:42.145Z",
 	"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/2060729b09fb7a4ede87e49a0ac0fb76725160ae",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.61.1"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/1546a875f07608812967e1169ea86c2bd3f837ac",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.61.3"
 };

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

@@ -146,6 +146,21 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 				"workload_flavor",
 			],
 		},
+		{
+			name: "DNS",
+			slug: "dns",
+			description: "DNS domains, zones, compliance checks, and DNS proxy configuration",
+			resource_count: 7,
+			resources: [
+				"dns_compliance_checks",
+				"dns_domain",
+				"dns_lb_health_check",
+				"dns_lb_pool",
+				"dns_load_balancer",
+				"dns_proxy",
+				"dns_zone",
+			],
+		},
 		{
 			name: "API Security",
 			slug: "api-security",
@@ -195,19 +210,12 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			resource_count: 3,
 			resources: ["bigip_http_proxy", "data_group", "irule"],
 		},
-		{
-			name: "DNS",
-			slug: "dns",
-			description: "DNS domains, zones, compliance checks, and DNS proxy configuration",
-			resource_count: 3,
-			resources: ["dns_compliance_checks", "dns_domain", "dns_proxy"],
-		},
 		{
 			name: "Cloud Resources",
 			slug: "cloud-resources",
 			description: "Cloud elastic IPs, address allocators, and geo-location resources",
-			resource_count: 2,
-			resources: ["address_allocator", "cloud_elastic_ip"],
+			resource_count: 3,
+			resources: ["address_allocator", "cloud_elastic_ip", "geo_location_set"],
 		},
 		{
 			name: "Organization",
@@ -261,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", "namespace", "address", "protocol", "skip_xff_append"],
+			required: ["name", "address", "protocol", "skip_xff_append"],
 			minimal_config:
-				'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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
@@ -283,9 +291,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		alert_receiver: {
 			category: "monitoring",
 			description: "New Alert Receiver object",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "receiver_choice"],
 			minimal_config:
-				'resource "xcsh_alert_receiver" "example" {\n  name      = "example-alert-receiver"\n  namespace = "staging"\n}',
+				'resource "xcsh_alert_receiver" "example" {\n  name      = "example-alert-receiver"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -294,9 +302,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		api_crawler: {
 			category: "api-security",
 			description: "API Crawler resource",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_api_crawler" "example" {\n  name      = "example-api-crawler"\n  namespace = "staging"\n}',
+				'resource "xcsh_api_crawler" "example" {\n  name      = "example-api-crawler"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -307,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 = "staging"\n}',
+				'resource "xcsh_api_definition" "example" {\n  name      = "example-api-definition"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: ["namespace"],
 			},
@@ -316,9 +324,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		api_discovery: {
 			category: "api-security",
 			description: "API discovery creates a new object in the storage backend for metadata.namespace",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "user_defined_api_discovery_policy"],
 			minimal_config:
-				'resource "xcsh_api_discovery" "example" {\n  name      = "example-api-discovery"\n  namespace = "staging"\n}',
+				'resource "xcsh_api_discovery" "example" {\n  name      = "example-api-discovery"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -327,9 +335,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		api_testing: {
 			category: "api-security",
 			description: "API Testing resource",
-			required: ["name", "namespace", "custom_header_value"],
+			required: ["name", "custom_header_value"],
 			minimal_config:
-				'resource "xcsh_api_testing" "example" {\n  name      = "example-api-testing"\n  namespace = "staging"\n\n  custom_header_value = "example-value"\n}',
+				'resource "xcsh_api_testing" "example" {\n  name      = "example-api-testing"\n  namespace = "system"\n\n  custom_header_value = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -348,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_app_api_group" "example" {\n  name      = "example-app-api-group"\n  namespace = "staging"\n}',
+				'resource "xcsh_app_api_group" "example" {\n  name      = "example-app-api-group"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -370,9 +378,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		app_setting: {
 			category: "applications",
 			description: "App setting configuration in namespace metadata.namespace",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_app_setting" "example" {\n  name      = "example-app-setting"\n  namespace = "staging"\n}',
+				'resource "xcsh_app_setting" "example" {\n  name      = "example-app-setting"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -381,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_app_type" "example" {\n  name      = "example-app-type"\n  namespace = "staging"\n}',
+				'resource "xcsh_app_type" "example" {\n  name      = "example-app-type"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -425,9 +433,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		aws_tgw_site: {
 			category: "sites",
 			description: "Deploying F5 sites connected via AWS Transit Gateway",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_aws_tgw_site" "example" {\n  name      = "example-aws-tgw-site"\n  namespace = "staging"\n}',
+				'resource "xcsh_aws_tgw_site" "example" {\n  name      = "example-aws-tgw-site"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -436,9 +444,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		aws_vpc_site: {
 			category: "sites",
 			description: "Deploying F5 sites within AWS VPC environments",
-			required: ["name", "namespace", "address", "aws_region", "disk_size", "instance_type", "ssh_key"],
+			required: ["name", "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 = "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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
@@ -447,9 +455,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		azure_vnet_site: {
 			category: "sites",
 			description: "Deploying F5 sites within Azure Virtual Network environments",
-			required: ["name", "namespace", "machine_type", "resource_group", "ssh_key"],
+			required: ["name", "machine_type", "resource_group", "ssh_key"],
 			minimal_config:
-				'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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
@@ -459,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", "namespace"],
-			minimal_config: 'resource "xcsh_bgp" "example" {\n  name      = "example-bgp"\n  namespace = "staging"\n}',
+			required: ["name"],
+			minimal_config: 'resource "xcsh_bgp" "example" {\n  name      = "example-bgp"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -469,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_bgp_asn_set" "example" {\n  name      = "example-bgp-asn-set"\n  namespace = "staging"\n\n  as_numbers = [1]\n}',
+				'resource "xcsh_bgp_asn_set" "example" {\n  name      = "example-bgp-asn-set"\n  namespace = "system"\n\n  as_numbers = [1]\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -480,7 +488,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		bgp_routing_policy: {
 			category: "security",
 			description:
-				"Bgp routing policy is a list of rules containing match criteria and action to be applied. these rules help control routes which are imported or exported to bgp peers. configuration",
+				"Bgp routing policy is a list of rules containing match criteria and action to be applied. these rules help contol routes which are imported or exported to bgp peers. configuration",
 			required: ["name", "namespace"],
 			minimal_config:
 				'resource "xcsh_bgp_routing_policy" "example" {\n  name      = "example-bgp-routing-policy"\n  namespace = "staging"\n}',
@@ -547,7 +555,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		certificate: {
 			category: "certificates",
 			description: "Certificate. configuration",
-			required: ["name", "namespace", "certificate_url"],
+			required: ["name", "namespace", "certificate_url", "private_key"],
 			minimal_config:
 				'resource "xcsh_certificate" "example" {\n  name      = "example-certificate"\n  namespace = "staging"\n\n  certificate_url = "example-value"\n}',
 			dependencies: {
@@ -580,9 +588,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		cloud_credentials: {
 			category: "authentication",
 			description: "Api to create cloud_credentials object. configuration",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_cloud_credentials" "example" {\n  name      = "example-cloud-credentials"\n  namespace = "staging"\n}',
+				'resource "xcsh_cloud_credentials" "example" {\n  name      = "example-cloud-credentials"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -591,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", "namespace", "item_count"],
+			required: ["name", "item_count"],
 			minimal_config:
-				'resource "xcsh_cloud_elastic_ip" "example" {\n  name      = "example-cloud-elastic-ip"\n  namespace = "staging"\n\n  item_count = 1\n}',
+				'resource "xcsh_cloud_elastic_ip" "example" {\n  name      = "example-cloud-elastic-ip"\n  namespace = "system"\n\n  item_count = 1\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -643,9 +651,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		code_base_integration: {
 			category: "integrations",
 			description: "Integration details",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_code_base_integration" "example" {\n  name      = "example-code-base-integration"\n  namespace = "staging"\n}',
+				'resource "xcsh_code_base_integration" "example" {\n  name      = "example-code-base-integration"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -698,9 +706,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		dc_cluster_group: {
 			category: "networking",
 			description: "DC Cluster group in given namespace",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_dc_cluster_group" "example" {\n  name      = "example-dc-cluster-group"\n  namespace = "staging"\n}',
+				'resource "xcsh_dc_cluster_group" "example" {\n  name      = "example-dc-cluster-group"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -709,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_discovery" "example" {\n  name      = "example-discovery"\n  namespace = "staging"\n}',
+				'resource "xcsh_discovery" "example" {\n  name      = "example-discovery"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -732,14 +740,47 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		dns_domain: {
 			category: "dns",
 			description: "DNS Domain in a given namespace. If one already exist it will give a error",
-			required: ["name", "namespace", "dnssec_mode"],
+			required: ["name", "dnssec_mode"],
 			minimal_config:
-				'resource "xcsh_dns_domain" "example" {\n  name      = "example-dns-domain"\n  namespace = "staging"\n\n  dnssec_mode = "DNSSEC_DISABLE"\n}',
+				'resource "xcsh_dns_domain" "example" {\n  name      = "example-dns-domain"\n  namespace = "system"\n\n  dnssec_mode = "DNSSEC_DISABLE"\n}',
 			dependencies: {
 				requires: [],
 			},
 			import_syntax: "terraform import xcsh_dns_domain.example namespace/name",
 		},
+		dns_lb_health_check: {
+			category: "dns",
+			description: "DNS Load Balancer Health Check in a given namespace. If one already exist it will give a error",
+			required: ["name"],
+			minimal_config:
+				'resource "xcsh_dns_lb_health_check" "example" {\n  name      = "example-dns-lb-health-check"\n  namespace = "system"\n}',
+			dependencies: {
+				requires: [],
+			},
+			import_syntax: "terraform import xcsh_dns_lb_health_check.example namespace/name",
+		},
+		dns_lb_pool: {
+			category: "dns",
+			description: "DNS Load Balancer Pool in a given namespace. If one already exist it will give a error",
+			required: ["name", "load_balancing_mode"],
+			minimal_config:
+				'resource "xcsh_dns_lb_pool" "example" {\n  name      = "example-dns-lb-pool"\n  namespace = "system"\n\n  load_balancing_mode = "ROUND_ROBIN"\n}',
+			dependencies: {
+				requires: [],
+			},
+			import_syntax: "terraform import xcsh_dns_lb_pool.example namespace/name",
+		},
+		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"],
+			minimal_config:
+				'resource "xcsh_dns_load_balancer" "example" {\n  name      = "example-dns-load-balancer"\n  namespace = "staging"\n}',
+			dependencies: {
+				requires: [],
+			},
+			import_syntax: "terraform import xcsh_dns_load_balancer.example namespace/name",
+		},
 		dns_proxy: {
 			category: "dns",
 			description: "DNS Proxy in a given namespace. If one already exists it will give an error",
@@ -751,12 +792,23 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			},
 			import_syntax: "terraform import xcsh_dns_proxy.example namespace/name",
 		},
+		dns_zone: {
+			category: "dns",
+			description: "DNS Zone in a given namespace. If one already exist it will give a error",
+			required: ["name"],
+			minimal_config:
+				'resource "xcsh_dns_zone" "example" {\n  name      = "example-dns-zone"\n  namespace = "system"\n}',
+			dependencies: {
+				requires: [],
+			},
+			import_syntax: "terraform import xcsh_dns_zone.example namespace/name",
+		},
 		endpoint: {
 			category: "load-balancing",
 			description: "Endpoint will create the object in the storage backend for namespace metadata.namespace",
-			required: ["name", "namespace", "health_check_port", "port", "protocol"],
+			required: ["name", "health_check_port", "port", "protocol"],
 			minimal_config:
-				'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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
@@ -799,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_fast_acl_rule" "example" {\n  name      = "example-fast-acl-rule"\n  namespace = "staging"\n}',
+				'resource "xcsh_fast_acl_rule" "example" {\n  name      = "example-fast-acl-rule"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -823,14 +875,13 @@ 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 = "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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
@@ -861,20 +912,31 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		gcp_vpc_site: {
 			category: "sites",
 			description: "Deploying F5 sites within Google Cloud VPC environments",
-			required: ["name", "namespace", "address", "disk_size", "gcp_region", "instance_type", "ssh_key"],
+			required: ["name", "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 = "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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
 			import_syntax: "terraform import xcsh_gcp_vpc_site.example namespace/name",
 		},
+		geo_location_set: {
+			category: "cloud-resources",
+			description: "Geolocation Set",
+			required: ["name", "namespace"],
+			minimal_config:
+				'resource "xcsh_geo_location_set" "example" {\n  name      = "example-geo-location-set"\n  namespace = "staging"\n}',
+			dependencies: {
+				requires: [],
+			},
+			import_syntax: "terraform import xcsh_geo_location_set.example namespace/name",
+		},
 		global_log_receiver: {
 			category: "monitoring",
 			description: "New Global Log Receiver object",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "log_type", "receiver_choice"],
 			minimal_config:
-				'resource "xcsh_global_log_receiver" "example" {\n  name      = "example-global-log-receiver"\n  namespace = "staging"\n}',
+				'resource "xcsh_global_log_receiver" "example" {\n  name      = "example-global-log-receiver"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -884,8 +946,8 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			category: "load-balancing",
 			description:
 				"Healthcheck object defines method to determine if the given endpoint is healthy. single healthcheck object can be referred to by one or many cluster objects. configuration",
-			required: ["name", "namespace", "healthy_threshold", "interval", "timeout", "unhealthy_threshold"],
-			server_defaults: ["jitter_percent"],
+			required: ["name", "namespace", "interval", "timeout", "healthy_threshold", "unhealthy_threshold"],
+			server_defaults: ["jitter_percent", "use_http2"],
 			minimal_config:
 				'resource "xcsh_healthcheck" "example" {\n  name      = "example-healthcheck"\n  namespace = "staging"\n\n  healthy_threshold   = 1\n  interval            = 1\n  timeout             = 1\n  unhealthy_threshold = 1\n}',
 			dependencies: {
@@ -897,7 +959,8 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		http_loadbalancer: {
 			category: "load-balancing",
 			description: "Load balancing HTTP/HTTPS traffic with advanced routing and security",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "domains"],
+			server_defaults: ["connection_timeout", "http_idle_timeout"],
 			minimal_config:
 				'resource "xcsh_http_loadbalancer" "example" {\n  name      = "example-http-loadbalancer"\n  namespace = "staging"\n\n  domains = ["example-value"]\n}',
 			dependencies: {
@@ -975,7 +1038,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 = "staging"\n}',
+				'resource "xcsh_k8s_cluster" "example" {\n  name      = "example-k8s-cluster"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -984,9 +1047,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		k8s_cluster_role: {
 			category: "kubernetes",
 			description: "K8s_cluster_role will create the object in the storage backend for namespace metadata.namespace",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_k8s_cluster_role" "example" {\n  name      = "example-k8s-cluster-role"\n  namespace = "staging"\n}',
+				'resource "xcsh_k8s_cluster_role" "example" {\n  name      = "example-k8s-cluster-role"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -996,9 +1059,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			category: "kubernetes",
 			description:
 				"K8s_cluster_role_binding will create the object in the storage backend for namespace metadata.namespace",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_k8s_cluster_role_binding" "example" {\n  name      = "example-k8s-cluster-role-binding"\n  namespace = "staging"\n}',
+				'resource "xcsh_k8s_cluster_role_binding" "example" {\n  name      = "example-k8s-cluster-role-binding"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1030,9 +1093,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		log_receiver: {
 			category: "monitoring",
 			description: "New Log Receiver object",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_log_receiver" "example" {\n  name      = "example-log-receiver"\n  namespace = "staging"\n}',
+				'resource "xcsh_log_receiver" "example" {\n  name      = "example-log-receiver"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1076,9 +1139,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		nat_policy: {
 			category: "security",
 			description: "Nat policy create specification configures nat policy with multiple rules,. configuration",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_nat_policy" "example" {\n  name      = "example-nat-policy"\n  namespace = "staging"\n}',
+				'resource "xcsh_nat_policy" "example" {\n  name      = "example-nat-policy"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1087,9 +1150,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		network_connector: {
 			category: "networking",
 			description: "Network connector is created by users in system namespace. configuration",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_network_connector" "example" {\n  name      = "example-network-connector"\n  namespace = "staging"\n}',
+				'resource "xcsh_network_connector" "example" {\n  name      = "example-network-connector"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1100,7 +1163,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			description: "Network firewall is created by users in system namespace. configuration",
 			required: ["name", "namespace"],
 			minimal_config:
-				'resource "xcsh_network_firewall" "example" {\n  name      = "example-network-firewall"\n  namespace = "staging"\n}',
+				'resource "xcsh_network_firewall" "example" {\n  name      = "example-network-firewall"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1110,9 +1173,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_network_interface" "example" {\n  name      = "example-network-interface"\n  namespace = "staging"\n}',
+				'resource "xcsh_network_interface" "example" {\n  name      = "example-network-interface"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1132,9 +1195,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		network_policy_rule: {
 			category: "security",
 			description: "Network policy rule with configured parameters in specified namespace",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_network_policy_rule" "example" {\n  name      = "example-network-policy-rule"\n  namespace = "staging"\n}',
+				'resource "xcsh_network_policy_rule" "example" {\n  name      = "example-network-policy-rule"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1154,9 +1217,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		nfv_service: {
 			category: "networking",
 			description: "New NFV service with configured parameters",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_nfv_service" "example" {\n  name      = "example-nfv-service"\n  namespace = "staging"\n}',
+				'resource "xcsh_nfv_service" "example" {\n  name      = "example-nfv-service"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1166,9 +1229,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_nginx_service_discovery" "example" {\n  name      = "example-nginx-service-discovery"\n  namespace = "staging"\n}',
+				'resource "xcsh_nginx_service_discovery" "example" {\n  name      = "example-nginx-service-discovery"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1177,7 +1240,8 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		origin_pool: {
 			category: "load-balancing",
 			description: "Defining backend server pools for load balancer targets",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "origin_servers", "port"],
+			server_defaults: ["connection_timeout", "http_idle_timeout"],
 			minimal_config:
 				'resource "xcsh_origin_pool" "example" {\n  name      = "example-origin-pool"\n  namespace = "staging"\n}',
 			dependencies: {
@@ -1212,9 +1276,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 			category: "security",
 			description:
 				"Protocol Inspection Specification in a given namespace. If one already exists it will give an error",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "enable_disable_compliance_checks", "enable_disable_signatures"],
 			minimal_config:
-				'resource "xcsh_protocol_inspection" "example" {\n  name      = "example-protocol-inspection"\n  namespace = "staging"\n}',
+				'resource "xcsh_protocol_inspection" "example" {\n  name      = "example-protocol-inspection"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1257,7 +1321,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		rate_limiter_policy: {
 			category: "security",
 			description: "Rate limiter policy create specification. configuration",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "burst_size", "committed_information_rate"],
 			minimal_config:
 				'resource "xcsh_rate_limiter_policy" "example" {\n  name      = "example-rate-limiter-policy"\n  namespace = "staging"\n}',
 			dependencies: {
@@ -1279,9 +1343,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", "namespace", "provider_name"],
+			required: ["name", "provider_name"],
 			minimal_config:
-				'resource "xcsh_secret_management_access" "example" {\n  name      = "example-secret-management-access"\n  namespace = "staging"\n\n  provider_name = "example-value"\n}',
+				'resource "xcsh_secret_management_access" "example" {\n  name      = "example-secret-management-access"\n  namespace = "system"\n\n  provider_name = "example-value"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1290,9 +1354,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		securemesh_site: {
 			category: "sites",
 			description: "Deploying secure mesh edge sites with distributed security capabilities",
-			required: ["name", "namespace", "address", "volterra_certified_hw"],
+			required: ["name", "address", "volterra_certified_hw"],
 			minimal_config:
-				'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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
@@ -1301,9 +1365,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", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_securemesh_site_v2" "example" {\n  name      = "example-securemesh-site-v2"\n  namespace = "staging"\n}',
+				'resource "xcsh_securemesh_site_v2" "example" {\n  name      = "example-securemesh-site-v2"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1356,9 +1420,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		site: {
 			category: "sites",
 			description: "Virtual site object in given namespace",
-			required: ["name", "namespace", "site_type"],
+			required: ["name", "site_type"],
 			minimal_config:
-				'resource "xcsh_site" "example" {\n  name      = "example-site"\n  namespace = "staging"\n\n  site_type = "INVALID"\n}',
+				'resource "xcsh_site" "example" {\n  name      = "example-site"\n  namespace = "system"\n\n  site_type = "INVALID"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1367,9 +1431,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		site_mesh_group: {
 			category: "sites",
 			description: "Site Mesh Group in system namespace of user",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_site_mesh_group" "example" {\n  name      = "example-site-mesh-group"\n  namespace = "staging"\n}',
+				'resource "xcsh_site_mesh_group" "example" {\n  name      = "example-site-mesh-group"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1407,7 +1471,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		tcp_loadbalancer: {
 			category: "load-balancing",
 			description: "Load balancing TCP traffic across origin pools",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "origin_pools"],
 			minimal_config:
 				'resource "xcsh_tcp_loadbalancer" "example" {\n  name      = "example-tcp-loadbalancer"\n  namespace = "staging"\n}',
 			dependencies: {
@@ -1418,9 +1482,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		tenant_configuration: {
 			category: "organization",
 			description: "Tenant configuration specification. configuration",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_tenant_configuration" "example" {\n  name      = "example-tenant-configuration"\n  namespace = "staging"\n}',
+				'resource "xcsh_tenant_configuration" "example" {\n  name      = "example-tenant-configuration"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1462,9 +1526,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		usb_policy: {
 			category: "security",
 			description: "New USB policy object",
-			required: ["name", "namespace"],
+			required: ["name"],
 			minimal_config:
-				'resource "xcsh_usb_policy" "example" {\n  name      = "example-usb-policy"\n  namespace = "staging"\n}',
+				'resource "xcsh_usb_policy" "example" {\n  name      = "example-usb-policy"\n  namespace = "system"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1473,7 +1537,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		user_identification: {
 			category: "security",
 			description: "User_identification creates a new object in the storage backend for metadata.namespace",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "rules"],
 			minimal_config:
 				'resource "xcsh_user_identification" "example" {\n  name      = "example-user-identification"\n  namespace = "staging"\n}',
 			dependencies: {
@@ -1516,9 +1580,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		virtual_network: {
 			category: "networking",
 			description: "Virtual network in given namespace",
-			required: ["name", "namespace", "legacy_type"],
+			required: ["name", "legacy_type"],
 			minimal_config:
-				'resource "xcsh_virtual_network" "example" {\n  name      = "example-virtual-network"\n  namespace = "staging"\n\n  legacy_type = "VIRTUAL_NETWORK_SITE_LOCAL"\n}',
+				'resource "xcsh_virtual_network" "example" {\n  name      = "example-virtual-network"\n  namespace = "system"\n\n  legacy_type = "VIRTUAL_NETWORK_SITE_LOCAL"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1527,9 +1591,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		virtual_site: {
 			category: "sites",
 			description: "Virtual site object in given namespace",
-			required: ["name", "namespace", "site_type"],
+			required: ["name", "namespace", "site_type", "site_selector"],
 			minimal_config:
-				'resource "xcsh_virtual_site" "example" {\n  name      = "example-virtual-site"\n  namespace = "staging"\n\n  site_type = "INVALID"\n}',
+				'resource "xcsh_virtual_site" "example" {\n  name      = "example-virtual-site"\n  namespace = "system"\n\n  site_type = "INVALID"\n}',
 			dependencies: {
 				requires: [],
 			},
@@ -1538,9 +1602,9 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		voltstack_site: {
 			category: "sites",
 			description: "Deploying Volterra stack sites for edge computing",
-			required: ["name", "namespace", "address", "volterra_certified_hw"],
+			required: ["name", "address", "volterra_certified_hw"],
 			minimal_config:
-				'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}',
+				'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}',
 			dependencies: {
 				requires: [],
 			},
@@ -1549,7 +1613,7 @@ export const TERRAFORM_INDEX: TerraformIndex = {
 		waf_exclusion_policy: {
 			category: "security",
 			description: "WAF exclusion policy",
-			required: ["name", "namespace"],
+			required: ["name", "namespace", "waf_exclusion_rules"],
 			minimal_config:
 				'resource "xcsh_waf_exclusion_policy" "example" {\n  name      = "example-waf-exclusion-policy"\n  namespace = "staging"\n}',
 			dependencies: {

package/src/session/agent-session.ts

@@ -2658,8 +2658,12 @@ export class AgentSession {
 				);
 			}
 
-			// Validate API key
-			const apiKey = await this.#modelRegistry.getApiKey(this.model, this.sessionId);
+			// Validate API key. Capture the guard-narrowed model into a local: TS narrowing
+			// of the `this.model` getter does not persist into the ttftAttr closure below.
+			const model = this.model;
+			const apiKey = await logger.ttftAttr("ttft.getapikey", () =>
+				this.#modelRegistry.getApiKey(model, this.sessionId),
+			);
 			if (!apiKey) {
 				throw new Error(
 					`No API key found for ${this.model.provider}.\n\n` +
@@ -2674,20 +2678,23 @@ export class AgentSession {
 			}
 
 			// Build messages array (session context, eager todo prelude, then active prompt message)
-			const messages: AgentMessage[] = [];
-			const planReferenceMessage = await this.#buildPlanReferenceMessage?.();
-			if (planReferenceMessage) {
-				messages.push(planReferenceMessage);
-			}
-			const planModeMessage = await this.#buildPlanModeMessage();
-			if (planModeMessage) {
-				messages.push(planModeMessage);
-			}
-			if (options?.prependMessages) {
-				messages.push(...options.prependMessages);
-			}
+			const messages: AgentMessage[] = await logger.ttftAttr("ttft.build-context", async () => {
+				const built: AgentMessage[] = [];
+				const planReferenceMessage = await this.#buildPlanReferenceMessage?.();
+				if (planReferenceMessage) {
+					built.push(planReferenceMessage);
+				}
+				const planModeMessage = await this.#buildPlanModeMessage();
+				if (planModeMessage) {
+					built.push(planModeMessage);
+				}
+				if (options?.prependMessages) {
+					built.push(...options.prependMessages);
+				}
 
-			messages.push(message);
+				built.push(message);
+				return built;
+			});
 
 			// Early bail-out: if a newer abort/prompt cycle started during setup,
 			// return before mutating shared state (nextTurn messages, system prompt).
@@ -2711,12 +2718,12 @@ export class AgentSession {
 				messages.push(...fileMentionMessages);
 			}
 
-			// Emit before_agent_start extension event
+			// Emit before_agent_start extension event. Capture the narrowed runner into a
+			// local: the `this.#extensionRunner` guard does not narrow inside the closure.
 			if (this.#extensionRunner) {
-				const result = await this.#extensionRunner.emitBeforeAgentStart(
-					expandedText,
-					options?.images,
-					this.#baseSystemPrompt,
+				const runner = this.#extensionRunner;
+				const result = await logger.ttftAttr("ttft.before-agent-start-hook", () =>
+					runner.emitBeforeAgentStart(expandedText, options?.images, this.#baseSystemPrompt),
 				);
 				if (result?.messages) {
 					const promptAttribution: "user" | "agent" | undefined =
@@ -2747,7 +2754,9 @@ export class AgentSession {
 			}
 
 			const agentPromptOptions = options?.toolChoice ? { toolChoice: options.toolChoice } : undefined;
-			await this.#promptAgentWithIdleRetry(messages, agentPromptOptions);
+			await logger.ttftAttr("ttft.agent-loop-total", () =>
+				this.#promptAgentWithIdleRetry(messages, agentPromptOptions),
+			);
 			if (!options?.skipPostPromptRecoveryWait) {
 				await this.#waitForPostPromptRecovery();
 			}

package/src/system-prompt.ts

@@ -327,6 +327,11 @@ export async function resolvePromptInput(input: string | undefined, description:
 export interface LoadContextFilesOptions {
 	/** Working directory to start walking up from. Default: getProjectDir() */
 	cwd?: string;
+	/**
+	 * Explicit disabled extension IDs to apply instead of the global settings default.
+	 * Pass `[]` to force discovery independent of any process-wide settings state.
+	 */
+	disabledExtensions?: string[];
 }
 
 function dedupeExactContextFiles(
@@ -351,7 +356,10 @@ export async function loadProjectContextFiles(
 ): Promise<Array<{ path: string; content: string; depth?: number }>> {
 	const resolvedCwd = options.cwd ?? getProjectDir();
 
-	const result = await loadCapability(contextFileCapability.id, { cwd: resolvedCwd });
+	const result = await loadCapability(contextFileCapability.id, {
+		cwd: resolvedCwd,
+		disabledExtensions: options.disabledExtensions,
+	});
 
 	// Convert ContextFile items and preserve depth info
 	const files = result.items.map(item => {
@@ -436,6 +444,11 @@ export interface BuildSystemPromptOptions {
 	cwd?: string;
 	/** Pre-loaded context files (skips discovery if provided). */
 	contextFiles?: Array<{ path: string; content: string; depth?: number }>;
+	/**
+	 * Explicit disabled extension IDs applied to context-file discovery instead of the
+	 * global settings default. Pass `[]` to discover independent of process-wide settings.
+	 */
+	disabledExtensions?: string[];
 	/** Skills provided directly to system prompt construction. */
 	skills?: Skill[];
 	/** Pre-loaded rulebook rules (descriptions, excluding TTSR and always-apply). */
@@ -519,7 +532,10 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		});
 		const contextFilesPromise = providedContextFiles
 			? Promise.resolve(providedContextFiles)
-			: logger.time("loadProjectContextFiles", loadProjectContextFiles, { cwd: resolvedCwd });
+			: logger.time("loadProjectContextFiles", loadProjectContextFiles, {
+					cwd: resolvedCwd,
+					disabledExtensions: options.disabledExtensions,
+				});
 		const agentsMdSearchPromise = logger.time("buildAgentsMdSearch", buildAgentsMdSearch, resolvedCwd);
 		const mergedSkillsSettings = {
 			...skillsSettings,