Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(gfs): fold rowless inherited contributions in shared policy

M154a59c7b471
diff --git a/packages/gfs-interaction-policy/inheritedAccess.cjs b/packages/gfs-interaction-policy/inheritedAccess.cjs
index c1ccbeb8a..bb740df36 100644
--- a/packages/gfs-interaction-policy/inheritedAccess.cjs
+++ b/packages/gfs-interaction-policy/inheritedAccess.cjs
@@ -120,9 +120,18 @@ function strongestGfsInheritedSource(sources) {
* folder consolidate into one source while their row ids, bits, and scope
* flags (inherit / includeDescendants) stay separately recorded — no OR'd
* coverage is ever written back from this model.
+ *
+ * A contribution whose `rowId` is null/absent is an OBSERVATION without an
+ * editable row handle (the legacy app cores folded such rows): its
+ * permissions still union into the subject's folder source, but no grant id,
+ * grant scope flags, or share ids are created or modified.
*/
function mergeGfsInheritedAccessItem(current, contribution, folder) {
const contributionPermissions = [...(contribution.permissions ?? [])]
+ const hasGrantRow =
+ contribution.rowKind === 'grant' && contribution.rowId != null && contribution.rowId !== ''
+ const hasShareRow =
+ contribution.rowKind === 'share' && contribution.rowId != null && contribution.rowId !== ''
if (current === null) {
return {
subject: contribution.subject,
@@ -133,20 +142,19 @@ function mergeGfsInheritedAccessItem(current, contribution, folder) {
resourceId: folder.resourceId,
name: folder.name,
permissions: [...contributionPermissions],
- grantId: contribution.rowKind === 'grant' ? contribution.rowId : null,
- shareIds: contribution.rowKind === 'share' ? [contribution.rowId] : [],
- grantPermissions: contribution.rowKind === 'grant' ? [...contributionPermissions] : null,
- grantInherit: contribution.rowKind === 'grant' ? Boolean(contribution.inherit) : null,
- shareEntries:
- contribution.rowKind === 'share'
- ? [
- {
- rowId: contribution.rowId,
- permissions: [...contributionPermissions],
- includeDescendants: Boolean(contribution.includeDescendants),
- },
- ]
- : [],
+ grantId: hasGrantRow ? contribution.rowId : null,
+ shareIds: hasShareRow ? [contribution.rowId] : [],
+ grantPermissions: hasGrantRow ? [...contributionPermissions] : null,
+ grantInherit: hasGrantRow ? Boolean(contribution.inherit) : null,
+ shareEntries: hasShareRow
+ ? [
+ {
+ rowId: contribution.rowId,
+ permissions: [...contributionPermissions],
+ includeDescendants: Boolean(contribution.includeDescendants),
+ },
+ ]
+ : [],
},
],
}
@@ -166,11 +174,11 @@ function mergeGfsInheritedAccessItem(current, contribution, folder) {
const sameFolder = next.sources.find(source => source.resourceId === folder.resourceId)
if (sameFolder) {
sameFolder.permissions = [...new Set([...sameFolder.permissions, ...contributionPermissions])]
- if (contribution.rowKind === 'grant') {
+ if (hasGrantRow) {
sameFolder.grantId = sameFolder.grantId ?? contribution.rowId
sameFolder.grantPermissions = [...contributionPermissions]
sameFolder.grantInherit = Boolean(contribution.inherit)
- } else {
+ } else if (hasShareRow) {
sameFolder.shareIds = [...new Set([...sameFolder.shareIds, contribution.rowId])]
sameFolder.shareEntries = [
...sameFolder.shareEntries.filter(entry => entry.rowId !== contribution.rowId),
@@ -181,25 +189,26 @@ function mergeGfsInheritedAccessItem(current, contribution, folder) {
},
]
}
+ // A rowless observation unions permissions only: no row ids or scope
+ // flags are touched.
} else {
next.sources.push({
resourceId: folder.resourceId,
name: folder.name,
permissions: [...contributionPermissions],
- grantId: contribution.rowKind === 'grant' ? contribution.rowId : null,
- shareIds: contribution.rowKind === 'share' ? [contribution.rowId] : [],
- grantPermissions: contribution.rowKind === 'grant' ? [...contributionPermissions] : null,
- grantInherit: contribution.rowKind === 'grant' ? Boolean(contribution.inherit) : null,
- shareEntries:
- contribution.rowKind === 'share'
- ? [
- {
- rowId: contribution.rowId,
- permissions: [...contributionPermissions],
- includeDescendants: Boolean(contribution.includeDescendants),
- },
- ]
- : [],
+ grantId: hasGrantRow ? contribution.rowId : null,
+ shareIds: hasShareRow ? [contribution.rowId] : [],
+ grantPermissions: hasGrantRow ? [...contributionPermissions] : null,
+ grantInherit: hasGrantRow ? Boolean(contribution.inherit) : null,
+ shareEntries: hasShareRow
+ ? [
+ {
+ rowId: contribution.rowId,
+ permissions: [...contributionPermissions],
+ includeDescendants: Boolean(contribution.includeDescendants),
+ },
+ ]
+ : [],
})
}
return next
diff --git a/packages/gfs-interaction-policy/inheritedAccess.d.ts b/packages/gfs-interaction-policy/inheritedAccess.d.ts
index e2dba43a4..a252b3c71 100644
--- a/packages/gfs-interaction-policy/inheritedAccess.d.ts
+++ b/packages/gfs-interaction-policy/inheritedAccess.d.ts
@@ -12,7 +12,12 @@ export interface GfsInheritedContribution {
subject: GfsSubjectRef
permissions: string[]
rowKind: 'grant' | 'share'
- rowId: string
+ /**
+ * Row handle, or null/absent for an OBSERVATION without an editable row:
+ * permissions still fold into the subject's folder source, but no row ids
+ * or scope flags are created or modified (legacy app-core behavior).
+ */
+ rowId?: string | null
inherit?: boolean
includeDescendants?: boolean
}
diff --git a/packages/gfs-interaction-policy/inheritedAccess.test.cjs b/packages/gfs-interaction-policy/inheritedAccess.test.cjs
index 073976c3d..82999eadb 100644
--- a/packages/gfs-interaction-policy/inheritedAccess.test.cjs
+++ b/packages/gfs-interaction-policy/inheritedAccess.test.cjs
@@ -122,6 +122,41 @@ describe('mergeGfsInheritedAccessItem', () => {
assert.deepEqual(item.sources[0].shareEntries, [])
})
+ it('rowless observations fold permissions without touching row ids or flags', () => {
+ let item = mergeGfsInheritedAccessItem(
+ null,
+ grantContribution(userA, ['read'], 'g1', true),
+ folder('f1', 'Projects')
+ )
+ item = mergeGfsInheritedAccessItem(
+ item,
+ { subject: userA, permissions: ['write'], rowKind: 'grant', rowId: null },
+ folder('f1', 'Projects')
+ )
+ item = mergeGfsInheritedAccessItem(
+ item,
+ { subject: userA, permissions: ['share'], rowKind: 'share', rowId: null },
+ folder('f1', 'Projects')
+ )
+ assert.equal(item.sources.length, 1)
+ assert.deepEqual(item.permissions.sort(), ['read', 'share', 'write'])
+ assert.equal(item.sources[0].grantId, 'g1')
+ assert.equal(item.sources[0].grantInherit, true)
+ assert.deepEqual(item.sources[0].grantPermissions, ['read'])
+ assert.deepEqual(item.sources[0].shareIds, [])
+ assert.deepEqual(item.sources[0].shareEntries, [])
+ // A rowless first observation creates the source with no row handles.
+ const bare = mergeGfsInheritedAccessItem(
+ null,
+ { subject: userB, permissions: ['read'], rowKind: 'grant', rowId: null },
+ folder('f1', 'Projects')
+ )
+ assert.equal(bare.subject, userB)
+ assert.equal(bare.sources[0].grantId, null)
+ assert.deepEqual(bare.sources[0].shareIds, [])
+ assert.deepEqual(bare.sources[0].permissions, ['read'])
+ })
+
it('same folder grant + share consolidate, keeping each row separately addressable', () => {
let item = mergeGfsInheritedAccessItem(
null,