Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.4.0

- Vendor the SDK 2.2.0 manifest and browser contracts so bundles can declare
app-owned Google Analytics, Search Console, and Google Ads reporting access.
- Validate provider-scoped read capabilities and require SDK 2.2.0 for those
reporting integrations while retaining SDK 2.0.0 and 2.1.0 compatibility.
- Default newly bundled apps to SDK 2.2.0 and preserve reporting declarations
in deterministic archives for development and deployment.

## 3.3.1

- Accept protected schema-2 agent runtime sessions before a new app receives
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,12 @@ offline source bundle, but cannot connect to or deploy through OpenCloud.

## Install a pinned release

OpenCloud application skills pin an exact CLI release. To install `v3.3.1` in
OpenCloud application skills pin an exact CLI release. To install `v3.4.0` in
an isolated task directory:

```bash
OPENCLOUD_CLI_VERSION="v3.3.1"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.3.1.tgz"
OPENCLOUD_CLI_VERSION="v3.4.0"
OPENCLOUD_CLI_PACKAGE="opencloud-cli-3.4.0.tgz"
OPENCLOUD_CLI_DIR="$(mktemp -d)"

curl -fsSLo "$OPENCLOUD_CLI_DIR/$OPENCLOUD_CLI_PACKAGE" \
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/cli",
"version": "3.3.1",
"version": "3.4.0",
"description": "Versioned command-line client for building, deploying, and verifying OpenCloud applications",
"type": "module",
"bin": {
Expand Down
54 changes: 53 additions & 1 deletion src/bundle.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ functions:
expect(first.manifest.migrations[0]?.sha256).toMatch(/^[a-f0-9]{64}$/);
expect(first.manifest.runtime).toEqual({
sdk: {
version: "2.1.0",
version: "2.2.0",
},
});
expect(first.files).toEqual([
Expand DownExpand Up@@ -268,6 +268,58 @@ integrations:
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("validates and archives Google reporting integrations with SDK 2.2", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, "frontend"));
await writeFile(path.join(root, "frontend", "index.html"), "hello");
await writeManifest(
root,
`
frontend:
directory: frontend
runtime:
sdk:
version: 2.2.0
integrations:
analytics:
provider: google-analytics
account: app
capabilities:
- analytics.reports.read
search:
provider: google-search-console
account: app
capabilities:
- search.performance.read
ads:
provider: google-ads
account: app
capabilities:
- ads.reporting.read
`,
);

const bundle = await buildBundle(root);
const archived = await readArchivedManifest(root, bundle.archive);

expect(bundle.manifest.runtime.sdk.version).toBe("2.2.0");
expect(bundle.manifest.integrations).toMatchObject({
analytics: {
provider: "google-analytics",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
capabilities: ["ads.reporting.read"],
},
});
expect(archived.integrations).toEqual(bundle.manifest.integrations);
});

it("never archives local .opencloud development metadata", async () => {
const root = await temporaryDirectory();
await mkdir(path.join(root, ".opencloud"));
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ import {
resolveWorkspaceFile,
} from "./workspace-store.js";

const CLI_VERSION = "3.3.1";
const CLI_VERSION = "3.4.0";

const program = new Command()
.name("opencloud")
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@opencloud/js",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"type": "module"
}
4 changes: 2 additions & 2 deletions vendor/browser-client/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ const runtimeConfig = {
environment: "production",
sdk: {
package: "@opencloud/js",
version: "2.1.0",
version: "2.2.0",
module: "/_opencloud/sdk.js",
types: "/_opencloud/sdk.d.ts",
docs: "https://docs.opencloud.ai/sdk/javascript/",
Expand DownExpand Up@@ -184,7 +184,7 @@ afterEach(() => {

describe("@opencloud/js v2", () => {
it("exports one stable singleton contract without legacy factories or raw namespaces", () => {
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.1.0");
expect(OPEN_CLOUD_SDK_VERSION).toBe("2.2.0");
expect("OPEN_CLOUD_JS_VERSION" in sdk).toBe(false);
expect(opencloud).toMatchObject({
app: { info: expect.any(Function) },
Expand Down
2 changes: 1 addition & 1 deletion vendor/browser-client/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
* HTTP responses deliberately stay behind this module.
*/

export const OPEN_CLOUD_SDK_VERSION = "2.1.0";
export const OPEN_CLOUD_SDK_VERSION = "2.2.0";

export type OpenCloudEnvironment = "dev" | "production";
export type OpenCloudVisibility = "public" | "private";
Expand Down
66 changes: 64 additions & 2 deletions vendor/contracts/src/manifest.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ describe("OpenCloud manifest", () => {
});

it("requires an exact installed deployment-pinned SDK version", () => {
for (const version of ["2.0.0", "2.1.0"]) {
for (const version of ["2.0.0", "2.1.0", "2.2.0"]) {
expect(
parseManifest({
...valid,
Expand All@@ -64,7 +64,7 @@ describe("OpenCloud manifest", () => {
...valid,
runtime: { sdk: { version } },
}),
).toThrow(/installed SDK version: 2\.0\.0or 2\.1\.0/);
).toThrow(/installed SDK version: 2\.0\.0, 2\.1\.0, or 2\.2\.0/);
}
});

Expand DownExpand Up@@ -515,6 +515,68 @@ describe("OpenCloud manifest", () => {
).toThrow(/not supported by google-drive/);
});

it("declares app-owned Google reporting resources", () => {
const integrations = parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
search: {
provider: "google-search-console",
account: "app",
cardinality: "many",
capabilities: ["search.performance.read"],
},
ads: {
provider: "google-ads",
account: "app",
capabilities: ["ads.reporting.read"],
},
},
}).integrations;

expect(integrations).toMatchObject({
analytics: { provider: "google-analytics", cardinality: "one" },
search: { provider: "google-search-console", cardinality: "many" },
ads: { provider: "google-ads", cardinality: "one" },
});
for (const [provider, capability] of [
["google-analytics", "analytics.reports.read"],
["google-search-console", "search.performance.read"],
["google-ads", "ads.reporting.read"],
] as const) {
expect(() =>
parseManifest({
...valid,
runtime: { sdk: { version: "2.2.0" } },
integrations: {
reporting: {
provider,
account: "calling_user",
capabilities: [capability],
},
},
}),
).toThrow(new RegExp(`${provider} integrations must use the app account`));
}
expect(() =>
parseManifest({
...valid,
integrations: {
analytics: {
provider: "google-analytics",
account: "app",
capabilities: ["analytics.reports.read"],
},
},
}),
).toThrow(/google-analytics requires runtime SDK version 2\.2\.0 or later/);
});

it("declares app-owned HubSpot CRM access and bounds associations", () => {
expect(
parseManifest({
Expand Down
45 changes: 40 additions & 5 deletions vendor/contracts/src/manifest.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@ const sameOriginAbsolutePath = z
const digest = z.string().regex(/^[a-f0-9]{64}$/, "expected a SHA-256 digest");

/** Exact immutable SDK artifacts installed by this platform release. */
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0"], {
error: "expected an installed SDK version: 2.0.0or 2.1.0",
export const sdkVersionSchema = z.enum(["2.0.0", "2.1.0", "2.2.0"], {
error: "expected an installed SDK version: 2.0.0, 2.1.0, or 2.2.0",
});

export const migrationSchema = z
Expand DownExpand Up@@ -97,6 +97,9 @@ export const integrationCapabilitySchema = z.enum([
"docs.documents.write",
"slides.presentations.read",
"slides.presentations.write",
"analytics.reports.read",
"search.performance.read",
"ads.reporting.read",
"bank.accounts.read",
"bank.balances.read",
"bank.transactions.read",
Expand DownExpand Up@@ -138,6 +141,9 @@ export const integrationProviderSchema = z.enum([
"google-sheets",
"google-docs",
"google-slides",
"google-analytics",
"google-search-console",
"google-ads",
"gocardless-bank-account-data",
"wise-balance-webhook",
"slack",
Expand All@@ -164,6 +170,9 @@ const capabilitiesForProvider: Record<
"slides.presentations.read",
"slides.presentations.write",
]),
"google-analytics": new Set(["analytics.reports.read"]),
"google-search-console": new Set(["search.performance.read"]),
"google-ads": new Set(["ads.reporting.read"]),
"gocardless-bank-account-data": new Set([
"bank.accounts.read",
"bank.balances.read",
Expand DownExpand Up@@ -258,7 +267,16 @@ export const integrationDefinitionSchema = z
message: "wise-balance-webhook integrations must use the app account",
});
}
if (["slack", "telegram", "hubspot-crm"].includes(definition.provider)) {
if (
[
"slack",
"telegram",
"hubspot-crm",
"google-analytics",
"google-search-console",
"google-ads",
].includes(definition.provider)
) {
if (definition.account !== "app") {
context.addIssue({
code: "custom",
Expand DownExpand Up@@ -553,14 +571,31 @@ export const openCloudManifestSchema = z
.superRefine((manifest, context) => {
if (
manifest.notifications?.webPush &&
manifest.runtime.sdk.version !== "2.1.0"
manifest.runtime.sdk.version === "2.0.0"
) {
context.addIssue({
code: "custom",
path: ["notifications", "webPush"],
message: "Web Push notifications require runtime SDK version 2.1.0",
message: "Web Push notifications require runtime SDK version 2.1.0 or later",
});
}
for (const [name, integration] of Object.entries(manifest.integrations)) {
if (
[
"google-analytics",
"google-search-console",
"google-ads",
].includes(integration.provider) &&
(manifest.runtime.sdk.version === "2.0.0" ||
manifest.runtime.sdk.version === "2.1.0")
) {
context.addIssue({
code: "custom",
path: ["integrations", name, "provider"],
message: `${integration.provider} requires runtime SDK version 2.2.0 or later`,
});
}
}
const assertUnique = (
values: string[],
path:
Expand Down
Loading