thinkwork-cli 0.13.1 → 0.13.2

package/dist/terraform/modules/app/agentcore-harness/main.tf

@@ -1,17 +1,100 @@
 ################################################################################
-# AgentCore Harness — App Module (THINK-311 U4, ship-inert)
+# AgentCore Harness — App Module (THINK-316 managed multiplayer runtime)
 #
-# IAM surface for the AWS Bedrock AgentCore Harness trial: the execution role
-# Harness microVMs assume, plus (via outputs consumed by lambda-api's grouped
-# policies) the invoker grants the shared api Lambda role needs to create and
-# invoke Harness resources. Nothing reads or invokes any of this until the
-# harness-runner handler lands in U5 — this module is pure IAM.
+# Stable execution role plus the optional managed tenant/profile Harness and
+# named immutable-version endpoint.
 #
 # Trust-policy note: sibling agentcore roles (agentcore-pi, agentcore-runtime)
 # trust the bare `bedrock-agentcore.amazonaws.com` service principal with no
 # account/source-arn conditions; this role mirrors that repo pattern.
 ################################################################################
 
+terraform {
+  required_providers {
+    external = {
+      source  = "hashicorp/external"
+      version = ">= 2.3.0"
+    }
+  }
+}
+
+locals {
+  normalized_stage   = replace(var.stage, "-", "_")
+  normalized_tenant  = replace(var.tenant_slug, "-", "_")
+  normalized_profile = replace(var.trust_profile, "-", "_")
+  harness_name       = "Thinkwork_${local.normalized_stage}_${local.normalized_tenant}_${local.normalized_profile}"
+  # InvokeHarness accepts an endpoint name, not an immutable version. Give
+  # every immutable Harness version its own endpoint so the old SSM profile
+  # remains valid until the new endpoint snapshot is durably published.
+  endpoint_prefix = "ThinkworkProofV"
+  gateway_target_tool_names = [
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___owner_probe",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___mixed_disclosure",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___list_connector_tools",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___call_connector_tool",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___execute_code",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___web_search",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___web_extract",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___query_brain",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___list_workspace_skills",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___load_workspace_skill",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___list_message_attachments",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___read_message_attachment",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___ask_user_question",
+    "Thinkwork${replace(title(replace(var.stage, "-", " ")), " ", "")}OwnerProof___send_email",
+  ]
+  tenant_skill_prefix = var.tenant_slug != "" ? (
+    "tenants/${var.tenant_slug}/"
+  ) : "tenants/"
+  # These scripts are the executable Harness contract. Include their content
+  # in the trigger so a normal deploy reconciles prompt, tool, and lifecycle
+  # changes even when no symbolic contract-version string was bumped.
+  reconciler_hash = sha256(join("", [
+    filesha256("${path.module}/scripts/reconcile_harness.sh"),
+    filesha256("${path.module}/scripts/harness-lifecycle.mjs"),
+    filesha256("${path.module}/scripts/harness-tool-contract.mjs"),
+  ]))
+  configuration_hash = nonsensitive(sha256(jsonencode({
+    tenant_slug      = var.tenant_slug
+    profile          = var.trust_profile
+    discovery        = var.discovery_url
+    audience         = var.harness_audience
+    gateway_arn      = var.gateway_arn
+    provider_arn     = var.oauth_credential_provider_arn
+    return_url       = var.oauth_return_url
+    target_tools     = local.gateway_target_tool_names
+    model_id         = var.model_id
+    memory           = "disabled"
+    tool_policy      = "gateway-and-cedar-authoritative"
+    connector_facade = "intent-ranked-direct-v1"
+    sandbox_facade   = "bounded-internal-python-v1"
+    browser          = "agentcore-browser-v3-canonical-name-and-participant-context"
+    invocation_tools = "control-plane-attested-full-override-v1"
+    builtin_web      = "tenant-policy-secret-bound-v1"
+    platform_tools   = "brain-email-workspace-skills-message-attachments-user-questions-v6"
+    artifact_facade  = "caller-fulfilled-emit-document-v1"
+    goal_mode        = "thinkwork-managed-fresh-turn-goal-complete-v1"
+    skill_creator    = "governed-review-draft-v1"
+    reconciler       = local.reconciler_hash
+  })))
+}
+
+check "managed_harness_configuration" {
+  assert {
+    condition = !var.managed_runtime_enabled || (
+      var.enabled &&
+      var.tenant_slug != "" &&
+      can(regex("^https://", var.discovery_url)) &&
+      var.harness_audience != "" &&
+      can(regex("^arn:aws:bedrock-agentcore:", var.gateway_arn)) &&
+      can(regex("^arn:aws:bedrock-agentcore:", var.oauth_credential_provider_arn)) &&
+      can(regex("^arn:aws:secretsmanager:", var.oauth_credential_secret_arn))
+      && can(regex("^https://", var.oauth_return_url))
+    )
+    error_message = "The managed AgentCore Harness requires the base role, tenant, HTTPS discovery, exact audience, Gateway, OAuth provider, and provider secret."
+  }
+}
+
 ################################################################################
 # Harness execution role — assumed by Harness microVMs
 ################################################################################
@@ -65,7 +148,7 @@ resource "aws_iam_role_policy" "harness_execution" {
         Sid      = "WorkspaceSkillSourcesRead"
         Effect   = "Allow"
         Action   = ["s3:GetObject"]
-        Resource = "arn:aws:s3:::${var.bucket_name}/tenants/*"
+        Resource = "arn:aws:s3:::${var.bucket_name}/${local.tenant_skill_prefix}*"
       },
       {
         Sid      = "WorkspaceSkillSourcesList"
@@ -74,7 +157,7 @@ resource "aws_iam_role_policy" "harness_execution" {
         Resource = "arn:aws:s3:::${var.bucket_name}"
         Condition = {
           StringLike = {
-            "s3:prefix" = "tenants/*"
+            "s3:prefix" = "${local.tenant_skill_prefix}*"
           }
         }
       },
@@ -96,6 +179,152 @@ resource "aws_iam_role_policy" "harness_execution" {
           "arn:aws:logs:${var.region}:${var.account_id}:log-group:/aws/bedrock-agentcore/*:*",
         ]
       },
+      {
+        Sid      = "SelectedTenantGateway"
+        Effect   = "Allow"
+        Action   = ["bedrock-agentcore:InvokeGateway"]
+        Resource = var.managed_runtime_enabled ? var.gateway_arn : "arn:aws:bedrock-agentcore:${var.region}:${var.account_id}:gateway/disabled"
+      },
+      {
+        Sid    = "ExactUserIdentityExchange"
+        Effect = "Allow"
+        Action = [
+          "bedrock-agentcore:GetResourceOauth2Token",
+          "bedrock-agentcore:GetWorkloadAccessToken",
+          "bedrock-agentcore:GetWorkloadAccessTokenForJWT",
+        ]
+        Resource = var.managed_runtime_enabled ? [
+          "arn:aws:bedrock-agentcore:${var.region}:${var.account_id}:token-vault/default",
+          var.oauth_credential_provider_arn,
+          "arn:aws:bedrock-agentcore:${var.region}:${var.account_id}:workload-identity-directory/default",
+          # AgentCore prefixes the managed runtime workload identity with
+          # `harness_`, then appends its generated runtime id.
+          "arn:aws:bedrock-agentcore:${var.region}:${var.account_id}:workload-identity-directory/default/workload-identity/harness_${local.harness_name}-*",
+        ] : ["arn:aws:bedrock-agentcore:${var.region}:${var.account_id}:workload-identity-directory/default/workload-identity/disabled"]
+      },
+      {
+        Sid      = "ExactOauthProviderSecret"
+        Effect   = "Allow"
+        Action   = ["secretsmanager:GetSecretValue"]
+        Resource = var.managed_runtime_enabled ? var.oauth_credential_secret_arn : "arn:aws:secretsmanager:${var.region}:${var.account_id}:secret:disabled"
+      },
+      {
+        # Native Harness Browser Automation. The Harness tool uses the
+        # service-managed Browser by default and executes under this role.
+        Sid    = "AgentCoreBrowser"
+        Effect = "Allow"
+        Action = [
+          "bedrock-agentcore:StartBrowserSession",
+          "bedrock-agentcore:StopBrowserSession",
+          "bedrock-agentcore:GetBrowserSession",
+          "bedrock-agentcore:ListBrowserSessions",
+          "bedrock-agentcore:InvokeBrowser",
+          "bedrock-agentcore:UpdateBrowserStream",
+        ]
+        Resource = [
+          "arn:aws:bedrock-agentcore:${var.region}:aws:browser/aws.browser.v1",
+          "arn:aws:bedrock-agentcore:${var.region}:${var.account_id}:browser/*",
+        ]
+      },
+      {
+        # The service-managed Harness container resolves its public base image
+        # at startup under the execution role.
+        Sid    = "PublicHarnessImage"
+        Effect = "Allow"
+        Action = [
+          "ecr-public:GetAuthorizationToken",
+          "sts:GetServiceBearerToken",
+        ]
+        Resource = "*"
+      },
+      {
+        Sid    = "HarnessRuntimeTelemetry"
+        Effect = "Allow"
+        Action = [
+          "cloudwatch:PutMetricData",
+          "xray:PutTraceSegments",
+          "xray:PutTelemetryRecords",
+          "xray:GetSamplingRules",
+          "xray:GetSamplingTargets",
+        ]
+        Resource = "*"
+      },
     ]
   })
 }
+
+################################################################################
+# One stable tenant/profile Harness with immutable-version endpoint names.
+################################################################################
+
+moved {
+  from = terraform_data.managed_multiplayer_harness
+  to   = terraform_data.managed_multiplayer_harness_identity
+}
+
+# Owns deletion of the stable stage/tenant/profile identity. Configuration
+# revisions are reconciled separately so an ordinary prompt/tool/model update
+# creates a new immutable Harness version without replacing the Harness ARN.
+resource "terraform_data" "managed_multiplayer_harness_identity" {
+  count = var.managed_runtime_enabled ? 1 : 0
+
+  input = {
+    region          = var.region
+    harness_name    = local.harness_name
+    endpoint_prefix = local.endpoint_prefix
+  }
+  provisioner "local-exec" {
+    when    = destroy
+    command = "bash ${path.module}/scripts/delete_harness.sh"
+    environment = {
+      AWS_REGION      = self.input.region
+      HARNESS_NAME    = self.input.harness_name
+      ENDPOINT_PREFIX = self.input.endpoint_prefix
+    }
+  }
+
+  depends_on = [aws_iam_role_policy.harness_execution]
+}
+
+resource "terraform_data" "managed_multiplayer_harness_configuration" {
+  count = var.managed_runtime_enabled ? 1 : 0
+
+  input            = local.configuration_hash
+  triggers_replace = [local.configuration_hash]
+
+  provisioner "local-exec" {
+    command = "bash ${path.module}/scripts/reconcile_harness.sh"
+    environment = {
+      AWS_REGION                    = var.region
+      HARNESS_NAME                  = local.harness_name
+      ENDPOINT_PREFIX               = local.endpoint_prefix
+      EXECUTION_ROLE_ARN            = aws_iam_role.harness_execution[0].arn
+      DISCOVERY_URL                 = var.discovery_url
+      HARNESS_AUDIENCE              = var.harness_audience
+      GATEWAY_ARN                   = var.gateway_arn
+      GATEWAY_TARGET_TOOL_NAMES     = join(",", local.gateway_target_tool_names)
+      OAUTH_CREDENTIAL_PROVIDER_ARN = var.oauth_credential_provider_arn
+      OAUTH_RETURN_URL              = var.oauth_return_url
+      MODEL_ID                      = var.model_id
+      TENANT_SLUG                   = var.tenant_slug
+      TRUST_PROFILE                 = var.trust_profile
+      CONFIGURATION_HASH            = local.configuration_hash
+    }
+  }
+
+  depends_on = [terraform_data.managed_multiplayer_harness_identity]
+}
+
+data "external" "harness_state" {
+  count      = var.managed_runtime_enabled ? 1 : 0
+  depends_on = [terraform_data.managed_multiplayer_harness_configuration]
+  program    = ["bash", "${path.module}/scripts/read_harness.sh"]
+
+  query = {
+    region             = var.region
+    harness_name       = local.harness_name
+    endpoint_prefix    = local.endpoint_prefix
+    gateway_arn        = var.gateway_arn
+    oauth_provider_arn = var.oauth_credential_provider_arn
+  }
+}

package/dist/terraform/modules/app/agentcore-harness/outputs.tf

@@ -7,3 +7,66 @@ output "execution_role_name" {
   description = "Name of the Harness execution role. Empty string when the module is disabled."
   value       = var.enabled ? aws_iam_role.harness_execution[0].name : ""
 }
+
+output "managed_harness_id" {
+  description = "Service-generated managed Harness id. Empty when the managed runtime is disabled."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.harness_id : ""
+}
+
+output "managed_harness_arn" {
+  description = "One tenant/profile Harness ARN. Empty when disabled."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.harness_arn : ""
+}
+
+output "managed_endpoint_name" {
+  description = "Immutable-version Harness endpoint qualifier. Empty when disabled."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.endpoint_name : ""
+}
+
+output "managed_endpoint_arn" {
+  description = "Named Harness endpoint ARN. Empty when disabled."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.endpoint_arn : ""
+}
+
+output "managed_target_version" {
+  description = "Immutable Harness version attested by the named endpoint. Empty when disabled."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.target_version : ""
+}
+
+output "managed_live_version" {
+  description = "Live version returned by the endpoint readback. Must equal managed_target_version for readiness."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.live_version : ""
+}
+
+output "managed_model_id" {
+  description = "Actual Bedrock model configured on the immutable Harness version."
+  value       = var.managed_runtime_enabled ? var.model_id : ""
+}
+
+output "managed_status" {
+  description = "Derived safe readiness state: disabled, provisioning, ready, drifted, or misconfigured."
+  value = !var.managed_runtime_enabled ? "disabled" : (
+    data.external.harness_state[0].result.harness_status != "READY" || data.external.harness_state[0].result.endpoint_status != "READY" ? "provisioning" : (
+      data.external.harness_state[0].result.target_version != data.external.harness_state[0].result.live_version ? "drifted" : "ready"
+    )
+  )
+}
+
+output "managed_configuration_fingerprint" {
+  description = "Non-secret fingerprint binding desired configuration to the immutable endpoint tool snapshot."
+  value = var.managed_runtime_enabled ? sha256(jsonencode({
+    desired_configuration = local.configuration_hash
+    harness_version       = data.external.harness_state[0].result.harness_version
+    invocation_tools      = jsondecode(data.external.harness_state[0].result.invocation_tools_json)
+  })) : ""
+}
+
+output "managed_invocation_tools_json" {
+  description = "Exact non-secret live Harness tool configuration serialized for the managed data-plane profile."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.invocation_tools_json : "[]"
+}
+
+output "managed_invocation_tools_fingerprint" {
+  description = "JavaScript-canonical SHA-256 digest of the immutable endpoint invocation-tool snapshot."
+  value       = var.managed_runtime_enabled ? data.external.harness_state[0].result.invocation_tools_fingerprint : ""
+}

package/dist/terraform/modules/app/agentcore-harness/scripts/delete_harness.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+exec node "$script_dir/harness-lifecycle.mjs" delete